Commit Graph
5143 Commits
Author SHA1 Message Date
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
liumengyi bd6ada9429 - Delete the privilege of project-manageRepo. 2023-04-13 14:47:06 +08:00
liumengyi 090456cf53 - Delete the privilege of project-qa. 2023-04-13 14:35:46 +08:00
liumengyi 07430ea118 - Delete the privilege of project-qa. 2023-04-13 14:32:38 +08:00
朱金勇 c12196da3a Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2023-04-13 05:10:29 +00:00
朱金勇 bb531cfd2c * Fix bugs in dmdb. 2023-04-13 05:10:17 +00:00
wangyidong 548a0c453c * fix bug #33700. 2023-04-13 13:03:42 +08:00
liumengyi ebbb87d900 * Fix bug of task #91011, and modify projectbuild to projectplan. 2023-04-12 17:15:02 +08:00
liumengyi ca9c565982 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_304 2023-04-12 16:39:44 +08:00
tianshujie 324dfe4650 * Code for task #90780. 2023-04-12 09:08:51 +08:00
liumengyi 2397c644f5 * Finish task #91011. 2023-04-11 15:30:05 +08:00
朱金勇 58f458f6d0 * Fix bugs of program action. 2023-04-11 05:28:42 +00:00
朱金勇 d20df48faf * Fix primary key of dmdb. 2023-04-11 03:05:50 +00:00
王怡栋 f1bc3b73cc Merge branch 'tsj_doc' into 'master'
* Code for task #90792.

See merge request easycorp/zentaopms!7343
2023-04-11 00:35:16 +00:00
wangyidong 1a32c02940 * fix bug #33914. 2023-04-10 17:36:53 +08:00
朱金勇 0dde8ad3ed Fix default value of db. 2023-04-10 09:19:01 +00:00
tianshujie c99fed9fe9 * Code for task #90792. 2023-04-10 14:31:21 +08:00
朱金勇 75a3485f47 * Fix order in dmdb. 2023-04-10 03:13:24 +00:00
caoyanyi e90e7b9160 * Mofify api struct page locate. 2023-04-07 16:07:28 +08:00
tianshujie e6591f64d8 * Fix bug #33759. 2023-04-06 08:57:42 +08:00
朱金勇 22f9f1d087 Merge branch 'db' 2023-04-05 14:30:11 +00:00
朱金勇 7f9d638d28 * Fix sql for dmdb. 2023-04-05 14:18:24 +00:00
wangyidong e24a70f5b7 * code for task #89150. 2023-03-31 10:46:52 +08:00
tianshujie 5e1c7bee70 * Fix bug #33539. 2023-03-30 13:27:44 +08:00
liumengyi b873f07eb0 * Main lib's acl is default. 2023-03-29 14:39:38 +08:00
liumengyi 00f30608bc * Fix bug #33102. 2023-03-20 08:29:19 +00:00
wangxuepeng bd0979b334 * Fix bug 33045. 2023-03-17 07:17:07 +00:00
caoyanyi 1bc1e3fc0f * Adjust code. 2023-03-16 15:53:11 +08:00
caoyanyi a99ed812d3 * Code for bug #33010. 2023-03-16 15:37:12 +08:00