Commit Graph
639 Commits
Author SHA1 Message Date
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
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
liumengyi 84970085ec * Finish task #83942. 2023-02-08 14:14:08 +08:00
hufangzhou a5a0316602 * Don't change attribute when parent stage's attribute change to mix. 2023-02-08 14:07:32 +08:00
hufangzhou 9916a95dc2 * Code for task #83956. 2023-02-08 03:31:42 +00:00
zhujinyong d23966be45 * Format milestones. 2023-02-08 09:26:24 +08:00
xieqiyu 975b755c54 * Code for bug#31949. 2023-02-08 08:48:09 +08:00
xieqiyu bfe1a0ef5e * Code for bug#31949. 2023-02-08 08:37:38 +08:00
hufangzhou f96ff40f65 * Finish task #83945. 2023-02-07 08:38:42 +00:00
liumengyi ed7d5cc4dd * Finish task #83942. 2023-02-07 10:17:09 +08:00
hufangzhou 42144fb719 * Fix bug for task #83945, #83955. 2023-02-07 02:07:56 +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
liumengyi 742e7c28f5 * Finish task #83944. 2023-02-06 15:25:40 +08:00
wangyuting2 f77ad21c48 * Fix bug #25538. 2023-02-03 13:59:59 +08:00
hufangzhou 3d4ae057f3 * Fix bug for bug #30770. 2023-02-02 01:08:42 +00:00
hufangzhou 0e00ce3a8f * Fix bug #30770. 2023-02-01 08:50:39 +00:00
wangyuting2 809ba4b43e * Adjust modal width. 2023-02-01 08:26:08 +08:00
xieqiyu a9c225c532 * Fix bug#30697. 2023-01-19 09:44:56 +08:00
liuhong b56ec5f7f5 * Finish story #41436. 2023-01-09 01:44:17 +00:00
孙广明 137953e0ae Merge branch 'zentaopms_277' 2022-12-30 08:45:34 +08:00
tanghucheng ad83873794 * Fix issue for gantt icon. 2022-12-29 14:22:59 +08:00
xieqiyu cb75585308 * Fix bug#30697. 2022-12-29 10:24:04 +08:00
xieqiyu 4f56a74c60 * Code for task#81190. 2022-12-28 15:07:40 +08:00
xieqiyu 2664a0c85e * Finish task#81190. 2022-12-27 13:49:08 +08:00
chaideqing c3bd48c366 * Fix feedback1821. 2022-12-23 16:00:54 +08:00
朱金勇 9f741a612a Merge branch 'sprint/sunhao/fix_gantt_export' into 'master'
* fix gantt export not work as expected, not include all rows

See merge request easycorp/zentaopms!6458
2022-12-11 13:58:26 +00:00
wangyidong 595ec286b6 * adjust for show build path. 2022-12-07 10:34:10 +08:00
Hao Sun c5275fa460 * fix gantt export not work as expected, not include all rows 2022-12-02 08:35:54 +00:00
lanzongjun 1d4a337af8 * Fix Task #77262 2022-11-22 16:49:32 +08:00
lanzongjun 57bd3ad304 * Fix Task #76458 2022-11-22 13:35:54 +08:00
tianshujie 37c83b3d36 * Fix bug #29714. 2022-11-18 14:58:10 +08:00
xieqiyu 67017be897 * Fix bug#29883. 2022-11-17 15:41:39 +08: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
曾刚 4fbadc7da8 * Fix bug#29383 2022-11-08 05:03:48 +00:00
wangyidong 8ee88df5de Merge branch 'zentaopms_252' 2022-11-08 09:23:23 +08:00
wangyidong 9761648d59 Merge branch 'zentaopms_239' 2022-11-08 08:41:28 +08:00