Commit Graph

169 Commits

Author SHA1 Message Date
liumengyi
295c53d6ee * Finish task #89851. 2023-04-03 09:22:02 +08:00
liumengyi
226f798470 * Finish task #85631. 2023-02-27 08:08:07 +00:00
liumengyi
137dcf1e9a * * Optimize code for create waterfallplus execution. 2023-02-24 05:06:14 +00:00
liumengyi
eef6386ad9 * Optimize code for radio button. 2023-02-24 04:28:51 +00:00
liumengyi
b9e400b4a0 * Change the drop-down box to a radio button. 2023-02-24 04:25:44 +00:00
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
49e0ae82c6 * Code for finish task #85415. 2023-02-22 09:54:38 +08:00
liumengyi
2ebf416299 * Fix bug of task #84584. 2023-02-17 00:52:54 +00:00
tianshujie
a2435c006a * Code for finish task #84575. 2023-02-16 14:58:36 +08: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
7ea51e54b5 * Finish task #84584. 2023-02-14 13:13:46 +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
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
王怡栋
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
Yagami
c2724b9f57 Merge branch 'zentaopms_281' 2023-02-08 15:31:13 +08:00
hufangzhou
3986779df3 * Finish task #83956. 2023-02-08 15:04:18 +08:00
hufangzhou
f96ff40f65 * Finish task #83945. 2023-02-07 08:38:42 +00:00
hufangzhou
9137ed1b83 * Add the ajax request when change parent stage for task #83955. 2023-02-07 01:08:03 +00:00
hufangzhou
652595112f * Finish task #83955. 2023-02-06 08:59:34 +00:00
wangyuting2
f77ad21c48 * Fix bug #25538. 2023-02-03 13:59:59 +08:00
wangyuting2
809ba4b43e * Adjust modal width. 2023-02-01 08:26:08 +08:00
liuhong
b56ec5f7f5 * Finish story #41436. 2023-01-09 01:44:17 +00:00
tanghucheng
ad83873794 * Fix issue for gantt icon. 2022-12-29 14:22:59 +08:00
xieqiyu
4f56a74c60 * Code for task#81190. 2022-12-28 15:07:40 +08:00
Hao Sun
c5275fa460 * fix gantt export not work as expected, not include all rows 2022-12-02 08:35:54 +00:00
王怡栋
3c83b8dbcb Merge branch 'fixbug' into 'master'
* Add gantt icon.

See merge request easycorp/zentaopms!6109
2022-11-11 01:57:19 +00:00
tanghucheng
f017fddb67 * Add gantt icon. 2022-11-10 15:37:08 +08:00
mayue
fc2ebb5b61 * Fix bug #29466. 2022-11-10 13:53:32 +08:00
wangyidong
8ee88df5de Merge branch 'zentaopms_252' 2022-11-08 09:23:23 +08:00
孙广明
3dc995919d Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* fix bug #29363

See merge request easycorp/zentaopms!6069
2022-11-07 08:52:12 +00:00
lanzongjun
1e16357fe3 * fix bug #29363 2022-11-07 16:50:51 +08:00
Yagami
6413f85918 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-11-07 16:37:35 +08:00
Yagami
7f1ac56f29 * Fix bug #29369. 2022-11-07 16:36:58 +08:00
liuyongkai
50e118bea4 * Resolve feedback #1380. 2022-11-07 07:16:14 +00:00
tanghucheng
d7e722f914 * Fix bug #29078. 2022-10-28 10:48:29 +08:00
tanghucheng
e9d18a77fb * Fix gantt style. 2022-10-27 16:27:30 +08:00