 tianshujie98
|
822bf9ecbd
|
* Add budget comment.
|
2020-08-27 11:27:55 +08:00 |
|
|
tianshujie98
|
6eb4d2b698
|
Merge branch 'master' of github.com:easysoft/zentaopms
|
2020-08-27 11:14:19 +08:00 |
|
|
tianshujie98
|
dd2f82a8de
|
* Add stage comment.
|
2020-08-27 11:12:53 +08:00 |
|
|
Catouse
|
6c9c62f233
|
* improve UI of program list.
|
2020-08-27 11:03:39 +08:00 |
|
|
z
|
e8c9a0ccf5
|
Merge branch 'master' of github.com:easysoft/zentaopms
|
2020-08-27 11:00:14 +08:00 |
|
|
z
|
5674cdbae8
|
* finish task #7708.
|
2020-08-27 10:59:38 +08:00 |
|
|
tianshujie98
|
065928fd20
|
* Fix assignTo.
|
2020-08-27 10:46:18 +08:00 |
|
|
tianshujie98
|
f0758c4634
|
* Fix assignTo.
|
2020-08-27 10:37:43 +08:00 |
|
|
tianshujie98
|
801efb0539
|
Merge branch 'master' of github.com:easysoft/zentaopms
|
2020-08-27 10:29:03 +08:00 |
|
|
tianshujie98
|
7fe0cba0c9
|
* Fix bug.
|
2020-08-27 10:28:20 +08:00 |
|
|
Yagami
|
eb47645a67
|
Merge branch 'master' of https://github.com/easysoft/zentaopms
|
2020-08-27 10:14:12 +08:00 |
|
|
Yagami
|
84cdafa606
|
* Fix block weekly.
|
2020-08-27 10:13:31 +08:00 |
|
|
tianshujie98
|
1d2bdce37e
|
Merge branch 'master' of github.com:easysoft/zentaopms
|
2020-08-27 10:00:34 +08:00 |
|
|
tianshujie98
|
3d363c7f2e
|
* Fix repo/view/revision.html.php bug.
|
2020-08-27 09:58:21 +08:00 |
|
|
Catouse
|
a5f004beab
|
Merge branch '20.x'
# Conflicts:
# module/program/view/create.html.php
|
2020-08-27 09:33:00 +08:00 |
|
|
leiyong
|
df1a9ee5ef
|
* Finish task#7702.
|
2020-08-27 09:23:10 +08:00 |
|
|
leiyong
|
06e5748f12
|
* Adjust lang file.
|
2020-08-27 09:11:23 +08:00 |
|
|
leiyong
|
113dbc40d9
|
Merge branch 'master' of github.com:easysoft/zentaopms
|
2020-08-27 09:10:41 +08:00 |
|
|
Catouse
|
88a70977e6
|
* task #7641, support show projects in nested list.
|
2020-08-27 09:03:43 +08:00 |
|
|
Catouse
|
b10f3686a8
|
* fix cannot submit form without parentprogram data on create one.
|
2020-08-27 09:02:38 +08:00 |
|
|
Catouse
|
3712145ff9
|
* only show programs which status is doing in programteam block.
|
2020-08-27 09:02:38 +08:00 |
|
|
Catouse
|
6040241c94
|
* hide products select control on count less than 2.
|
2020-08-27 09:02:38 +08:00 |
|
|
leiyong
|
be892d8966
|
* Finish task#7703.
|
2020-08-27 08:52:37 +08:00 |
|
|
hufangzhou
|
426ff66d8f
|
Fix a bug
|
2020-08-27 08:52:21 +08:00 |
|
|
hufangzhou
|
ae63696820
|
Merge branch 'master' of https://github.com/easysoft/zentaopms
|
2020-08-27 08:32:51 +08:00 |
|
|
hufangzhou
|
7f89f3426e
|
Finish task#7704. task#7696.
|
2020-08-27 08:32:33 +08:00 |
|
|
tianshujie98
|
61c374c456
|
Merge branch 'master' of github.com:easysoft/zentaopms
|
2020-08-27 08:27:55 +08:00 |
|
|
tianshujie98
|
235979ea72
|
* Add to the design assigned to.
|
2020-08-27 08:26:58 +08:00 |
|
|
leiyong
|
9062b7e438
|
* Adjust issue module code.
|
2020-08-26 18:24:35 +08:00 |
|
|
Yagami
|
fff00c9eb2
|
Merge branch 'master' of https://github.com/easysoft/zentaopms
|
2020-08-26 16:59:10 +08:00 |
|
|
Yagami
|
c44189ae8f
|
* Add comment.
|
2020-08-26 16:58:54 +08:00 |
|
|
leiyong
|
56dd7eca83
|
Merge branch 'master' of github.com:easysoft/zentaopms
|
2020-08-26 16:58:44 +08:00 |
|
|
leiyong
|
744dc06baa
|
* Add scrum roadmap block.
|
2020-08-26 16:56:53 +08:00 |
|
|
holan20180123
|
f13b0b9e1f
|
Merge branch 'master' of https://github.com/easysoft/zentaopms
|
2020-08-26 16:49:57 +08:00 |
|
|
holan20180123
|
4a3e5fcaf1
|
* Finish Task #7694.
|
2020-08-26 16:49:30 +08:00 |
|
|
z
|
89a542e350
|
* finish task #7697.
|
2020-08-26 16:46:12 +08:00 |
|
|
Yagami
|
b909b26194
|
* Fix details.
|
2020-08-26 16:19:28 +08:00 |
|
|
Yagami
|
2d290973e9
|
Merge branch '20.x' of https://github.com/easysoft/zentaopms into 20.x
|
2020-08-26 16:11:48 +08:00 |
|
|
Yagami
|
b72a7dee43
|
Merge branch 'master' into 20.x
|
2020-08-26 16:10:36 +08:00 |
|
|
leiyong
|
0ba1cf2d4c
|
* Adjust code.
|
2020-08-26 14:49:50 +08:00 |
|
|
Yagami
|
0f7a173c85
|
Merge branch '20.x' of https://github.com/easysoft/zentaopms into 20.x
|
2020-08-26 14:48:13 +08:00 |
|
|
Catouse
|
e0cd53d4cf
|
* task #7660, improve UI for cmmigantt block.
|
2020-08-26 13:52:25 +08:00 |
|
|
Catouse
|
6f4f9a061e
|
* task #7660, improve UI for cmmigantt block.
|
2020-08-26 13:52:25 +08:00 |
|
|
Catouse
|
bd49215be5
|
* format code.
|
2020-08-26 13:52:25 +08:00 |
|
|
z
|
6265da18b9
|
Merge branch '20.x' of github.com:easysoft/zentaopms into 20.x
|
2020-08-26 13:10:36 +08:00 |
|
|
Yagami
|
a5e8c67ca7
|
Merge branch '20.x' of https://github.com/easysoft/zentaopms into 20.x
|
2020-08-26 13:10:11 +08:00 |
|
|
z
|
6b93c993aa
|
* set default isCat in edit program.
|
2020-08-26 13:10:05 +08:00 |
|
|
leiyong
|
17744cc4b5
|
* Merger code.
|
2020-08-26 13:09:51 +08:00 |
|
|
Yagami
|
d49a2f43c1
|
Merge branch '20.x' of https://github.com/easysoft/zentaopms into 20.x
|
2020-08-26 13:08:08 +08:00 |
|
|
Yagami
|
8e4e53adfc
|
Merge branch '20.x' of https://github.com/easysoft/zentaopms into 20.x
|
2020-08-26 13:07:41 +08:00 |
|