Commit Graph
962 Commits
Author SHA1 Message Date
tianshujie 9178a6e3b3 * Modify variable name. 2022-03-24 10:27:42 +08:00
tianshujie e9ee8a176d * Fix bug #19072. 2022-03-24 09:35:39 +08:00
zhouxudong 0800d18c92 * Fix bug #16575. 2022-03-22 16:17:00 +08:00
王怡栋 fe91dc8481 Merge branch 'pailei2' 2022-03-22 09:01:03 +08:00
zhouxin 2ab2af045c Fix bug #13855. 2022-03-18 07:17:07 +00:00
王怡栋 c1f3258a74 * adjust for get dynamic. 2022-03-14 16:08:58 +08:00
tanghucheng fb78d74984 * Fix bug. 2022-03-11 15:48:25 +08:00
tanghucheng 15e6262065 * Fix bug #20329,20350,20366. 2022-03-07 16:42:58 +08:00
tianshujie 30600fb7bb * Fix bug #20200. 2022-03-01 20:37:20 +08:00
liumengyi 9bd39c1e98 * Change maxVersion bizVersion proVersion to edition. 2022-02-24 16:44:11 +08:00
liumengyi e0814cd74b * Change maxVersion bizVersion proVersion to edition. 2022-02-24 16:15:08 +08:00
zhujinyong 408f8d4d91 * Move die to return. 2022-02-22 14:15:00 +08:00
zhujinyong 5bd64d9312 Merge branch 'lite' into sprint/185 2022-02-17 08:56:40 +08:00
liyuchun 0d16a79b63 * Fix bug #19323. 2022-02-15 08:22:25 +08:00
liumengyi ecc9e22867 * Finish task 18883,add project team. 2022-01-24 16:54:30 +08:00
王怡栋 f8e0c430cd * adjust for kanban in lite. 2022-01-19 13:41:29 +08:00
王怡栋 03d2e3cb4a Merge branch 'master' into lite 2022-01-19 08:44:43 +08:00
王怡栋 0a619a470e Merge branch 'lite' of https://gitlab.zcorp.cc/easycorp/zentaopms into lite 2022-01-17 17:25:44 +08:00
王怡栋 d8577f7d28 * adjust for project kanban. 2022-01-17 17:25:20 +08:00
liumengyi 00f85a4ee8 * Fix bug #18598, #18592, #18589, #18584, #18569, #18533, #18462. 2022-01-17 16:13:45 +08:00
Wenrui LI eab82f4aaf * filter projects by vision in dropmenus, bug #18498. 2022-01-17 14:45:45 +08:00
朱金勇 dce7ddc20c Merge branch 'autoTest_xieqiyu' into 'master'
Auto test xieqiyu

See merge request easycorp/zentaopms!1426
2022-01-17 02:35:38 +00:00
liumengyi fd20384534 * Fix bug #18470. 2022-01-17 09:21:11 +08:00
liumengyi fc5ad0f893 * FIx bug #18489,#18478,#18466. 2022-01-16 17:11:40 +08:00
xieqiyu d4365afb0b * Add project test case. 2022-01-14 08:32:53 +08:00
liumengyi 8850815c58 * Finish task #47339. 2022-01-13 14:13:03 +08:00
tianshujie e19602194a * Modify the editing project error problem. 2022-01-12 10:30:55 +08:00
孙广明 54fc83b0fc * Add execution kanban list. 2022-01-11 11:17:41 +08:00
tianshujie 85773e58cd * Fix bug #18280. 2022-01-07 11:01:47 +08:00
mayue f151953a49 * Optimize code. 2022-01-06 15:55:49 +08:00
孙广明 c8db935f34 Merge branch '180' 2022-01-04 22:41:23 +08:00
zhujinyong ff9ceaccad * Check auth. 2022-01-05 09:05:32 +08:00
mayue 15d588491f * Revert code. 2022-01-04 17:19:45 +08:00
朱金勇 24ad4bc48c Merge branch 'sprint/180_xieqiyu_46520' into 'sprint/180'
Sprint/180 xieqiyu 46520

See merge request easycorp/zentaopms!1228
2021-12-31 07:53:33 +00:00
xieqiyu 5c4609d302 * Modify review problem. 2021-12-31 15:43:27 +08:00
Hao Sun 1bdc313562 * Task #46524, refactor some pages with user-picker. 2021-12-30 17:35:41 +08:00
Hao Sun dff300cf88 * Task #46524, refactor user selector for page "project/managemembers". 2021-12-30 17:02:32 +08:00
zhouxin 05a75e7039 Finish task #46674. 2021-12-30 05:50:50 +00:00
hufangzhou 1a5adfe15f * Fix bug for compatible php8.0 . 2021-12-28 14:46:10 +08:00
zhouxin 18383e225b Fix bug #17665. 2021-12-22 07:44:26 +00:00
zhujinyong 42fc345e2a Merge branch 'sprint/176_xieqiyu_mergeBranch' 2021-12-21 16:12:48 +08:00
hufangzhou 872a8b2bbd * Finish task #46096. 2021-12-21 14:30:38 +08:00
朱金勇 f1e97497a3 Merge branch 'sprint/176_xieqiyu_45536' into 'master'
Sprint/176 xieqiyu 45536

See merge request easycorp/zentaopms!903
2021-12-13 00:46:27 +00:00
xieqiyu 5472859d6e * Code for task#45536. 2021-12-11 14:28:45 +08:00
朱金勇 161233a64f Merge branch 'sprint/176_xieqiyu_45536' into 'master'
Sprint/176 xieqiyu 45536

See merge request easycorp/zentaopms!884
2021-12-10 06:15:15 +00:00
xieqiyu c33000b578 * Code for task#45536. 2021-12-10 13:11:37 +08:00
xieqiyu ad8ed52f22 * Code for task#45536. 2021-12-10 10:57:56 +08:00
tianshujie a2355212ad * Fix bug #17272. 2021-12-08 17:08:10 +08:00
tianshujie 545652e0e4 * Fix bug #17259. 2021-12-08 16:50:48 +08:00
hufangzhou 145fc2a461 * Fix bug #17074. 2021-12-06 10:27:51 +08:00