 王怡栋
|
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 |
|
|
tianshujie
|
7372f7f936
|
* Finish story #32623.
|
2022-06-22 08:51:05 +08:00 |
|
|
孙广明
|
34ddc497ba
|
Merge branch 'zentaopms_207'
|
2022-06-22 08:33:17 +08:00 |
|
|
hufangzhou
|
adad8ea3ae
|
* Finish task #57882, #57874, #57873, #57855.
|
2022-06-21 17:30:36 +08:00 |
|
|
孙广明
|
5f26b603e7
|
* Code for bug #24007.
|
2022-06-21 15:22:12 +08:00 |
|
|
孙广明
|
642b518397
|
Merge branch 'codeReview' into 'master'
codeReview
See merge request easycorp/zentaopms!4004
|
2022-06-17 07:11:23 +00:00 |
|
|
sunjun
|
fec9f4f1dd
|
codeReview
|
2022-06-17 05:05:44 +00:00 |
|
|
Hao Sun
|
834689d226
|
* bug #23877, fix user picker not work as expected.
|
2022-06-17 04:04:28 +00:00 |
|
|
tianshujie
|
a974f333d2
|
* Modify Edit logic for switching program.
|
2022-06-17 11:46:43 +08:00 |
|
|
tianshujie
|
a2421b85bb
|
* Modify Edit logic for switching program.
|
2022-06-17 11:37:40 +08:00 |
|
|
xieqiyu
|
d0ac2813ec
|
* Fix bug#23725.
|
2022-06-17 09:55:30 +08:00 |
|
|
王怡栋
|
8eb32c3062
|
Merge branch 'sprint/master_tanghucheng' into 'master'
* Fix bug #23832.
See merge request easycorp/zentaopms!3979
|
2022-06-16 08:59:06 +00:00 |
|
|
孙广明
|
dfb9cddc6a
|
Merge branch 'fixissue_planIcon' into 'master'
fixissue_planIcon
See merge request easycorp/zentaopms!3983
|
2022-06-16 08:06:49 +00:00 |
|
|
sunjun
|
8b4d326b90
|
fixissue_planIcon
|
2022-06-16 07:57:40 +00:00 |
|
|
wangyidong
|
048c5e362e
|
* adjust for project batchedit menu.
|
2022-06-16 15:51:06 +08:00 |
|
|
tanghucheng
|
ab9657abf9
|
* Fix bug #23832.
|
2022-06-16 13:49:10 +08:00 |
|
|
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 |
|