Commit Graph
5171 Commits
Author SHA1 Message Date
Yagami 434aed0830 Merge branch '18.4' into zentaoipd 2023-05-19 14:47:42 +08:00
Yagami 2de2c80664 * Fix bug #35362. 2023-05-19 09:30:47 +08:00
songchenxuan b0f2917d6e * Fix bug #34964. 2023-05-17 16:35:13 +08:00
Yagami 06e5387792 * Fix bug #35165. 2023-05-17 11:30:23 +08:00
Yagami a4a0d519b0 * Fix bug #35101. 2023-05-16 08:56:26 +08:00
tanghucheng 3b32ddb33f * Finish task #92318. 2023-05-15 16:08:03 +00:00
tanghucheng 090852083e * Add showStage for stage list. 2023-05-15 14:53:04 +00:00
Yagami 585d8e044a * Fix bug #35101. 2023-05-14 11:32:20 +08:00
Yagami fd24f63d11 * Fix bug #35120. 2023-05-14 11:19:10 +08:00
Yagami 21d0654e5c * Fix bug #35134. 2023-05-14 11:12:23 +08:00
Yagami 89072f7a62 * In ipd project, change create stage btn link. 2023-05-12 15:20:02 +08:00
zhujinyong d5560c2d35 + Add consumed and teamCount of projects for performance optimization. 2023-05-12 09:31:20 +08:00
qixinzhi 94b818161c * Fix ambiguous field. 2023-05-10 08:14:40 +00:00
Yagami 8ee31b76c5 * Fix ipd project module-menu bug. 2023-05-09 15:04:04 +08:00
tanghucheng b24ce954fd * Code for task #92310. 2023-05-08 19:23:21 +08:00
Yagami cb87cf5429 * Code for ipd menu. 2023-05-06 16:44:59 +08:00
Yagami b94a69a0b8 * Finish task #92304. 2023-05-06 16:21:28 +08:00
zhujinyong 866ead6a51 + Add stats fields for performance optimization. 2023-05-06 15:58:39 +08:00
Yagami 8650f89921 * Finish task #92295. 2023-05-06 10:55:04 +08:00
Yagami b17ff3a752 * Code for ipd project menu. 2023-05-05 13:37:39 +08:00
Yagami be645834d3 * Finish task #92292. 2023-05-05 09:53:24 +08:00
Yagami 5935f603f4 * Change judgment condition. 2023-05-04 18:57:45 +08:00
Yagami c4c20cae54 * Change judgment condition. 2023-05-04 18:04:34 +08:00
wangyidong b2b588adb4 * fix bug #34689. 2023-04-25 08:41:02 +08:00
wangyidong e7aa31d68e Merge branch '18.4' of https://git.zcorp.cc/easycorp/zentaopms into 18.4 2023-04-24 21:01:04 +08:00
tianshujie da3ce6e392 * Fix bug #34762. 2023-04-24 20:05:06 +08:00
wangyidong 2cd5d74fec * fix bug #34689. 2023-04-24 19:30:09 +08:00
wangyidong 901fc68f3c * adjust for change bizVersion to edition. 2023-04-24 17:00:52 +08:00
caoyanyi e266ad301a * Fix bug #34473. 2023-04-21 11:29:00 +08:00
hufangzhou 438c55d059 * Merge code. 2023-04-19 16:18:56 +08:00
wangyidong d9e21d706a * fix bug #34362,34365,34361. 2023-04-19 14:50:43 +08:00
liumengyi 7fe3662ea7 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_304 2023-04-19 14:09:20 +08:00
tianshujie 1fe920f873 * Compatible with Quick Edition project dropdown issues. 2023-04-18 15:04:09 +08:00
liumengyi b8e8c3d788 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_304 2023-04-18 13:16:42 +08:00
wangyidong 0d31625643 * code for task #91388. 2023-04-18 13:05:14 +08:00
liumengyi 98e1cf39f0 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_304 2023-04-17 13:21:13 +08:00
朱金勇 a35c6f8dd8 * Fix bug#34268. 2023-04-17 04:52:55 +00:00
liumengyi 648dc288ca Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_304 2023-04-14 15:15:03 +08:00
liumengyi 15459e3651 * Rename the privilege of project-moduleOpen. 2023-04-14 08:44:11 +08:00
liumengyi b07328ac44 * Rename the privilege of project-unlinkMember. 2023-04-14 08:39:39 +08:00
liumengyi 1ed01d0169 * Rename the privilege of project-group. 2023-04-13 17:30:59 +08:00
liumengyi 514dce3314 * Rename the privilege of project-kanban. 2023-04-13 17:29:31 +08:00
王怡栋 e6be417612 Merge branch 'master' into 'tsj_task'
# Conflicts:
#   module/doc/view/lefttree.html.php
2023-04-13 09:03:14 +00:00
hufangzhou 1f9432a395 - Delete the privilege of stakeholder-viewExpect. 2023-04-13 16:14:22 +08:00
hufangzhou e5bd957cd0 - Delete the privilege of stakeholder-editExpect. 2023-04-13 15:54:42 +08:00
tianshujie 0c935c7eea * Modify jump link. 2023-04-13 15:45:51 +08:00
hufangzhou 82ead79df0 - Delete the privilege of stakeholder-createExpect. 2023-04-13 15:45:33 +08:00
hufangzhou 4017c453dc - Delete the privilege of stakeholder-deleteExpect. 2023-04-13 15:37:17 +08:00
hufangzhou fd9f7336a9 Merge branch 'zentaopms_304' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_304 2023-04-13 14:59:57 +08:00
hufangzhou ccdb3b23da - Delete the privilege of stakeholder-expectation. 2023-04-13 14:59:51 +08:00