tianshujie
|
af76befb02
|
* Resolve issue #756.
|
2023-02-22 15:15:34 +08:00 |
|
tianshujie
|
deae64dcd1
|
* Add a prompt for the execution type.
|
2023-02-22 10:38:25 +08:00 |
|
tianshujie
|
1c1fd123da
|
* Code for finish task #85415.
|
2023-02-22 10:21:56 +08:00 |
|
tianshujie
|
49e0ae82c6
|
* Code for finish task #85415.
|
2023-02-22 09:54:38 +08:00 |
|
孙广明
|
6c1ed365ab
|
Merge branch 'sprint/292_liumengyi_85038' into 'master'
* Finish task #85038, #85039, #85040.
See merge request easycorp/zentaopms!7010
|
2023-02-21 05:50:04 +00:00 |
|
zhujinyong
|
5551177931
|
+ Add error of different type.
|
2023-02-21 10:24:00 +08:00 |
|
liumengyi
|
95e3978fb0
|
* Finish task #85038, #85039.
|
2023-02-21 01:05:24 +00:00 |
|
Yagami
|
dc9eb5a1a4
|
* Finish task #85048.
|
2023-02-21 08:59:26 +08:00 |
|
王怡栋
|
c004967af9
|
Merge branch 'sprint/290_liumengyi_32244' into 'master'
* Fix bug #32244, #32245, #32249, #32251, #32255, #32179, @32167.
See merge request easycorp/zentaopms!6989
|
2023-02-20 01:16:52 +00:00 |
|
王怡栋
|
bc4efa791c
|
Merge branch 'sprint/290_liumengyi_84586' into 'master'
* Finish task #84586.
See merge request easycorp/zentaopms!6987
|
2023-02-20 01:15:52 +00:00 |
|
hufangzhou
|
aaeeb9372d
|
* Code for task #84583.
|
2023-02-19 09:17:49 +00:00 |
|
hufangzhou
|
75b5b2562c
|
* Finish task #84583.
|
2023-02-18 16:04:53 +00:00 |
|
liumengyi
|
0ad1aba2ee
|
* Fix bug #32255.
|
2023-02-18 08:38:13 +00:00 |
|
liumengyi
|
02adc7454f
|
* Fix bug #32251.
|
2023-02-18 07:27:40 +00:00 |
|
liumengyi
|
b1f57ce0da
|
* Fix bug #32244, #32245.
|
2023-02-17 07:50:45 +00:00 |
|
liumengyi
|
2ebf416299
|
* Fix bug of task #84584.
|
2023-02-17 00:52:54 +00:00 |
|
tianshujie
|
5e2ac749af
|
* Fix bug #32233.
|
2023-02-16 16:17:48 +08:00 |
|
liumengyi
|
93a890663c
|
* Fix bug of task #84584.
|
2023-02-16 07:01:13 +00:00 |
|
tianshujie
|
a2435c006a
|
* Code for finish task #84575.
|
2023-02-16 14:58:36 +08:00 |
|
liumengyi
|
7501362a58
|
* Finish task #84591.
|
2023-02-16 06:34:10 +00:00 |
|
liumengyi
|
9be6fa2fd2
|
* Finish task #84584.
|
2023-02-16 05:28:39 +00:00 |
|
tianshujie
|
484f34396c
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_284
|
2023-02-16 08:59:00 +08:00 |
|
hufangzhou
|
f3cd2e7d4d
|
* Change the Easy Soft to ZenTao Software.
|
2023-02-15 17:01:22 +08:00 |
|
liumengyi
|
af5fbbab18
|
* Fix bug of task #84584.
|
2023-02-15 08:17:12 +00:00 |
|
孙广明
|
b6f4477420
|
Merge branch 'tsj_sortable' into 'zentaopms_284'
Tsj sortable
See merge request easycorp/zentaopms!6945
|
2023-02-15 00:21:22 +00:00 |
|
hufangzhou
|
0b89cd77d5
|
* Fix bug of task #83954.
|
2023-02-14 08:49:53 +00:00 |
|
tianshujie
|
1e0346d696
|
Merge branch 'zentaopms_284' of https://gitlab.zcorp.cc/easycorp/zentaopms into tsj_sortable
|
2023-02-14 13:32:06 +08:00 |
|
tianshujie
|
836ce16b03
|
* Code for finish task #84575.
|
2023-02-14 13:29:36 +08:00 |
|
liumengyi
|
00d8f85005
|
* Finish task #84584.
|
2023-02-14 13:21:33 +08:00 |
|
liumengyi
|
7ea51e54b5
|
* Finish task #84584.
|
2023-02-14 13:13:46 +08:00 |
|
hufangzhou
|
56c2cdcb21
|
* Finish task #83954.
|
2023-02-14 02:46:34 +00:00 |
|
liumengyi
|
005c91c8a4
|
* Finish task #84599.
|
2023-02-13 16:51:25 +08:00 |
|
liumengyi
|
1aaefb79d3
|
* Fix bug of merge code.
|
2023-02-13 16:43:02 +08:00 |
|
liumengyi
|
f9daa6072b
|
* Fix bug of merge code.
|
2023-02-13 16:35:51 +08:00 |
|
tianshujie
|
a097e0ca52
|
* Merge master.
|
2023-02-13 14:33:35 +08:00 |
|
tianshujie
|
4f2ca7d709
|
* Merge master.
|
2023-02-13 14:27:49 +08:00 |
|
tianshujie
|
ec0078c708
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_284
|
2023-02-13 14:03:58 +08:00 |
|
hufangzhou
|
aa48048939
|
* Modify the default value of acl when create sub-stage.
|
2023-02-10 08:16:45 +00:00 |
|
hufangzhou
|
17bbda6505
|
* Format the code.
|
2023-02-10 06:09:44 +00:00 |
|
hufangzhou
|
35bd85a243
|
* Modifying the access control of the parent phase does not synchronize the child phase's.
|
2023-02-10 05:41:06 +00:00 |
|
hufangzhou
|
6f10625f57
|
* Fix bug.
|
2023-02-09 15:15:44 +08:00 |
|
zhujinyong
|
c3822c43c3
|
* Finish task #83943.
|
2023-02-09 12:22:54 +08:00 |
|
zhujinyong
|
8c0f3cce83
|
* Show all children of program plans.
|
2023-02-09 11:24:11 +08:00 |
|
daitingting
|
1a8d5a70e7
|
* Fix bug #30843.
|
2023-02-09 01:35:19 +00:00 |
|
hufangzhou
|
b0d4622093
|
* If parent stage's attribute is mix, sub-stage's attribute doesn't need to sync parent's.
|
2023-02-08 16:35:05 +08:00 |
|
王怡栋
|
9331b9856a
|
Merge branch 'master' into 'zentaopms_wangyuting'
# Conflicts:
# module/programplan/view/gantt.html.php
|
2023-02-08 08:30:14 +00:00 |
|
wangyuting2
|
ab16894c06
|
* Optimize page css.
|
2023-02-08 16:17:16 +08:00 |
|
xieqiyu
|
e00862dd0c
|
* Code for bug#29159.
|
2023-02-08 16:16:33 +08:00 |
|
wangyuting2
|
afaa89f8fd
|
* Fix bug #27242.
|
2023-02-08 16:03:35 +08:00 |
|
hufangzhou
|
8c9ce0238f
|
* Filter out itself and it's children.
|
2023-02-08 15:43:25 +08:00 |
|