Commit Graph
1878 Commits
Author SHA1 Message Date
zhouxudong 7e600bf701 * Fix bug $24398. 2022-06-28 09:26:52 +00:00
hufangzhou 91bc9e3327 * Finish task #58569. 2022-06-28 13:05:48 +08:00
zhouxudong eaa39c7f0f * Finish task #58576 #58577. 2022-06-27 09:14:37 +00:00
zhouxudong 446ec44f29 * Finish task #58576 #58577. 2022-06-27 07:36:13 +00:00
hufangzhou eebcfaad58 * Adjust the spacing of dynamic block and dynamic page. 2022-06-24 13:33:11 +08:00
zhouxudong 7fce4137c5 * Fix bug #24176. 2022-06-23 07:46:34 +00:00
王怡栋 c69384617a Merge branch 'master_xieqiyu_57850' into 'master'
* Code for task#57850.

See merge request easycorp/zentaopms!4083
2022-06-23 00:39:25 +00:00
xieqiyu 21b0217aa8 * Code for task#57850. 2022-06-22 13:15:44 +08:00
hufangzhou ac69cd1afb * Finish task #57883. 2022-06-22 10:39:55 +08:00
sunjun fec9f4f1dd codeReview 2022-06-17 05:05:44 +00:00
sunjun 8b4d326b90 fixissue_planIcon 2022-06-16 07:57:40 +00:00
mayue ee058f67f1 * Finish task #57393. 2022-06-15 15:09:05 +08:00
孙广明 6656dd71a5 Merge branch 'sprint_204_57093' into 'master'
Sprint 204 57093

See merge request easycorp/zentaopms!3919
2022-06-15 03:09:10 +00:00
sunjun a4b45ab9ff sprint_204_57093 2022-06-15 03:03:28 +00:00
sunjun ad72c54ce8 sprint_204_57093 2022-06-15 02:56:33 +00:00
sunjun a3f6e18f93 sprint_204_57093 2022-06-15 01:48:14 +00:00
zhujinyong 87f50aa3be Merge branch 'sprint/sunhao/task56391' 2022-06-14 17:12:21 +08:00
sunjun 0a485ebec9 sprint_204_57093 2022-06-14 08:56:26 +00:00
Hao Sun 86b1c3f82d * support for update picker options in select project member. 2022-06-14 08:33:12 +00:00
王怡栋 71fb547445 Merge branch 'master_xieqiyu_56922' into 'master'
* Finish task#56922.

See merge request easycorp/zentaopms!3910
2022-06-14 07:19:42 +00:00
xieqiyu 38dad8467f * Finish task#56922. 2022-06-14 15:00:08 +08:00
孙广明 dbb1ccc413 Merge branch 'sprint/203_zg_56558' into 'master'
* Finish task#56558

See merge request easycorp/zentaopms!3892
2022-06-14 06:58:39 +00:00
sunjun 74726de8c1 sprint_204_57093 2022-06-14 06:48:24 +00:00
王怡栋 f5788a4535 Merge branch 'sprint/204_tianshujie_57098' into 'master'
Sprint/204 tianshujie 57098

See merge request easycorp/zentaopms!3900
2022-06-14 05:28:03 +00:00
tianshujie a6b47e84a9 * Finish task #57098. 2022-06-14 09:55:56 +08:00
zenggang 8bfc6dec02 * Finish task#56558 2022-06-13 09:46:02 +00:00
zhouxudong d376e41579 * Finish task #56908 #56914 #56921. 2022-06-13 07:35:54 +00:00
tianshujie 5ea628d394 * Fix bug #23368. 2022-06-13 09:45:32 +08:00
孙广明 b896377846 * Change zentao license. 2022-06-08 10:02:29 +08:00
孙广明 b528156589 * Change license. 2022-06-08 09:34:46 +08:00
xieqiyu e69afb987b * Fix bug#23242. 2022-06-05 20:13:05 +08:00
tianshujie c8a4fdd798 * Fix bug #23117. 2022-06-01 16:11:30 +08:00
zhouxudong 93e753b39e * Finish task #55619 #55626. 2022-05-31 06:03:37 +00:00
zhouxudong afa9003035 * Finisha task #55626 #55619. 2022-05-31 05:09:49 +00:00
wangyidong 967d24dd06 Merge branch 'sprint/189_package' 2022-05-24 10:32:09 +08:00
王怡栋 e093aac4ca Merge branch 'sprint/master_zhouxudong_54477' into 'master'
Sprint/master zhouxudong 54477

See merge request easycorp/zentaopms!3541
2022-05-20 06:07:46 +00:00
xieqiyu cd1c1e1b63 * Finish task#54477. 2022-05-20 10:52:30 +08:00
wangyidong f289e08b9d * use buildOperateMenu method for build and projectrelease module. 2022-05-19 13:34:02 +08:00
zhouxin 5ef4782e82 * Finish task #54351. 2022-05-18 07:31:45 +00:00
zhouxudong 50b39ac2d5 * Finish task #54477. 2022-05-18 03:13:21 +00:00
tianshujie 6770b72b11 * Fix bug #22437. 2022-05-13 08:42:26 +08:00
孙华伟 a3ab4a596b *解决功能演示过程中出现的问题。 2022-05-12 15:29:28 +08:00
李玉春 70fcf381cf Merge branch 'sunhuawei_fixbug_22365' into 'master'
Sunhuawei fixbug 22365

See merge request easycorp/zentaopms!3352
2022-05-12 05:33:28 +00:00
孙华伟 6c2b318da4 *Optimize the code. 2022-05-12 13:21:44 +08:00
孙广明 a770924dcf Merge branch 'master' into 'sprint/189_mayue_task#53652'
# Conflicts:
#   module/project/model.php
2022-05-12 05:01:42 +00:00
孙华伟 4f51081da0 *Fix bug#22367. 2022-05-12 11:03:36 +08:00
mayue ac6e3ab491 * Optimize code. 2022-05-12 02:58:23 +00:00
mayue 4460a50980 * Optimize code. 2022-05-12 02:50:13 +00:00
mayue 46c555fb3f * Add max code. 2022-05-12 02:38:33 +00:00
孙广明 f42cdbe8e5 Merge branch 'sunhuawei_task_53659' into 'master'
*Finish task #53659.

See merge request easycorp/zentaopms!3336
2022-05-11 08:53:12 +00:00