Commit Graph
4320 Commits
Author SHA1 Message Date
tianshujie b1f29eed4e * Fix bug #23815. 2022-06-16 13:30:59 +08:00
tianshujie 65c9254f7c * Resolve issue #677. 2022-06-16 11:22:15 +08:00
zhouxudong 3b01055e5f * Fix bug #23672. 2022-06-15 09:00:16 +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
tianshujie 1eda1081d1 * Fix bug #23663. 2022-06-14 13:49:07 +08:00
tianshujie ed2664f731 * Fix bug #23663. 2022-06-14 13:46:38 +08: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 3d9012cfca * Finish task #57098. 2022-06-14 13:18:52 +08: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
mayue e11b76d819 * Ajust mutual test issue. 2022-06-10 10:23:27 +08:00
孙广明 f3f8e20c9b Merge branch 'sprint/201_zhouxin_my_work' into 'master'
* Finish task #56461,56462,56458,56465.

See merge request easycorp/zentaopms!3819
2022-06-09 05:23:01 +00:00
zhouxin c056b7e567 * Finish task #56461,56462,56458,56465. 2022-06-09 05:18:27 +00:00
王怡栋 fd0cb543ba Merge branch 'master' into 'sprint_200'
# Conflicts:
#   module/execution/lang/en.php
#   module/execution/lang/zh-cn.php
#   module/execution/view/kanban.html.php
#   module/kanban/css/space.css
2022-06-09 03:16:20 +00:00
孙广明 3092800655 Merge branch 'sprint/199_zg_56544' into 'master'
* Finish task#56544

See merge request easycorp/zentaopms!3791
2022-06-09 01:19:51 +00:00
zenggang 14ea5d8273 * Adjust code 2022-06-08 09:20:00 +00:00
zenggang 9549b91f83 * Adjust code 2022-06-08 09:13:48 +00:00
wangyidong 11e6edcd22 Merge branch 'zdoo18' 2022-06-08 17:06:07 +08:00
zenggang 6471116e48 * Finish task#56544 2022-06-08 06:25:13 +00:00
xieqiyu 86561ba4ca * Code for task#56393,#56390,#56389. 2022-06-08 10:15:01 +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 36e609f808 * Fix bug#23116. 2022-06-06 16:52:30 +08:00
xieqiyu e69afb987b * Fix bug#23242. 2022-06-05 20:13:05 +08:00
孙广明 716c7ca6e6 Merge branch 'fixbug_sunjun_23182' into 'master'
fixbug_sunjun_23182

See merge request easycorp/zentaopms!3703
2022-06-02 06:17:56 +00:00
sunjun 5b35fab5f6 fixbug_sunjun_23182 2022-06-02 01:43:24 +00:00
孙广明 2d572a9d14 Merge branch '197' 2022-06-02 08:32:45 +08:00
tianshujie c8a4fdd798 * Fix bug #23117. 2022-06-01 16:11:30 +08:00
wangyidong 2400dfc83a * code for task #55568. 2022-06-01 14:48:35 +08:00
zhouxudong 5c3ac663e6 * Fix bug #23129 #23126 #23108. 2022-06-01 06:30:45 +00:00
王怡栋 f64b61a487 Merge branch 'sprint/196' into 'master'
Sprint/196

See merge request easycorp/zentaopms!3677
2022-06-01 02:28:26 +00:00
唐胡成 0b68898f0a Update model.php 2022-06-01 00:43:27 +00:00
tanghucheng f3a1f7cf2a * Fix bug #23114. 2022-05-31 16:47:13 +08:00
zhouxudong 93e753b39e * Finish task #55619 #55626. 2022-05-31 06:03:37 +00:00
liumengyi ad84595992 * Optimized code for task #55683. 2022-05-31 14:00:13 +08:00
liumengyi 1b89018e2f * Optimized code for task #55684, #55683. 2022-05-31 13:55:59 +08:00
liumengyi e661948d67 * Finish story #32879,#32887,#32935,#32934. 2022-05-31 09:21:05 +08:00