 孙广明
|
33dd17eb8a
|
Merge branch 'sprint/207_mayue_bug#23765' into 'master'
Sprint/207 mayue bug#23765
See merge request easycorp/zentaopms!4094
|
2022-06-23 05:30:16 +00:00 |
|
|
王怡栋
|
77d1ab4daf
|
Merge branch 'master' into 'sprint/206_liumengyi_58288'
# Conflicts:
# db/update17.1.sql
|
2022-06-23 01:46:35 +00:00 |
|
|
liumengyi
|
c26c9dc110
|
* Optimize code for task #58288.
|
2022-06-23 09:39:29 +08:00 |
|
|
王怡栋
|
4dab93ee3b
|
Merge branch 'sprint/master_zhouxudong_57864' into 'master'
* Finish task #57864.
See merge request easycorp/zentaopms!4082
|
2022-06-23 00:40:27 +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
|
2703bc9ba7
|
* Finish task#57875.
|
2022-06-23 08:33:37 +08:00 |
|
|
zhouxudong
|
bc416e40fc
|
* Finish task #57864.
|
2022-06-22 10:11:06 +00:00 |
|
|
mayue
|
6c975adff8
|
* Add some code.
|
2022-06-22 17:21:55 +08:00 |
|
|
王怡栋
|
9ffdc942c2
|
Merge branch 'master' into 'sprint/205'
# Conflicts:
# module/execution/lang/en.php
# module/execution/lang/zh-cn.php
|
2022-06-22 09:21:12 +00:00 |
|
|
liumengyi
|
4c5ff19a61
|
* Finish task #58288.
|
2022-06-22 17:01:39 +08:00 |
|
|
王怡栋
|
3b6ecf50ef
|
Merge branch 'sprint/206_tianshujie_57898' into 'master'
* Fix bug #23930.
See merge request easycorp/zentaopms!4071
|
2022-06-22 08:18:35 +00:00 |
|
|
liumengyi
|
b7a32b354b
|
* Finish task #58288.
|
2022-06-22 16:15:06 +08:00 |
|
|
zenggang
|
ba8f8b2644
|
* Finish task#58291
|
2022-06-22 05:35:32 +00:00 |
|
|
xieqiyu
|
21b0217aa8
|
* Code for task#57850.
|
2022-06-22 13:15:44 +08:00 |
|
|
tianshujie
|
20de2fde71
|
* Fix bug #23930.
|
2022-06-22 11:04:10 +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 |
|
|
朱金勇
|
89357c1100
|
Merge branch 'sprint/wangzemei/bug23265' into 'master'
* Fix bug #23265
See merge request easycorp/zentaopms!4045
|
2022-06-22 00:15:59 +00:00 |
|
|
hufangzhou
|
adad8ea3ae
|
* Finish task #57882, #57874, #57873, #57855.
|
2022-06-21 17:30:36 +08:00 |
|
|
wangzemei
|
0f30bd5fd9
|
* Fix bug #23265
|
2022-06-21 09:11:46 +00:00 |
|
|
孙广明
|
dab3b7eab2
|
Merge branch 'sprint/207_mayue_bug#23765' into 'zentaopms_207'
* Fix bug #23765.
See merge request easycorp/zentaopms!4037
|
2022-06-21 07:24:12 +00:00 |
|
|
王怡栋
|
83ecf656d3
|
Merge branch 'sgm_parentplan' into 'master'
* Code for feedback #397.
See merge request easycorp/zentaopms!4033
(cherry picked from commit beaddb012c)
f0c23584 * Code for feedback #397.
|
2022-06-21 06:28:13 +00:00 |
|
|
王怡栋
|
c30ba304ab
|
Revert "Merge branch 'sgm_parentplan' into 'master'"
This reverts merge request !4033
|
2022-06-21 06:25:45 +00:00 |
|
|
mayue
|
d97b5aeb97
|
* Fix bug #23765.
|
2022-06-21 13:30:00 +08:00 |
|
|
孙广明
|
f0c23584e0
|
* Code for feedback #397.
|
2022-06-21 10:23:58 +08:00 |
|
|
leiyong
|
725f37fcd0
|
* Finish task#57868.
|
2022-06-20 09:55:19 +00:00 |
|
|
孙广明
|
642b518397
|
Merge branch 'codeReview' into 'master'
codeReview
See merge request easycorp/zentaopms!4004
|
2022-06-17 07:11:23 +00:00 |
|
|
sunjun
|
ca2b45736b
|
codeReview
|
2022-06-17 07:04:52 +00:00 |
|
|
tianshujie
|
d95a2fee68
|
* Fix bug #23918.
|
2022-06-17 14:59:22 +08:00 |
|
|
孙广明
|
b52ef1c426
|
Merge branch 'sprint/204_tianshujie_optimize' into 'master'
* Optimize the code.
See merge request easycorp/zentaopms!4005
|
2022-06-17 05:16:52 +00:00 |
|
|
tianshujie
|
33cecbfcd3
|
* Optimize the code.
|
2022-06-17 13:14:55 +08: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 |
|
|
王怡栋
|
3264102179
|
Merge branch 'sprint202_leiyong_fix_bug_23841' into 'master'
* Fix bug#23841.
See merge request easycorp/zentaopms!3997
|
2022-06-17 02:07:06 +00:00 |
|
|
leiyong
|
a87a9bc2fb
|
* Edit comments.
|
2022-06-17 02:06:02 +00:00 |
|
|
xieqiyu
|
d0ac2813ec
|
* Fix bug#23725.
|
2022-06-17 09:55:30 +08:00 |
|
|
leiyong
|
ae55e2c31e
|
* Fix bug#23841.
|
2022-06-17 01:30:09 +00:00 |
|
|
王怡栋
|
85339e8d1e
|
Merge branch 'sprint202_leiyong_fix_bug_23821' into 'master'
* Fix bug#23821.
See merge request easycorp/zentaopms!3995
|
2022-06-17 00:33:53 +00:00 |
|
|
leiyong
|
80c03beea7
|
* Fix bug#23821.
|
2022-06-16 11:16:17 +00:00 |
|
|
孙广明
|
3f83669de2
|
Merge branch 'sprint202_leiyong_fix_bug' into 'master'
* Fix bug#23707.
See merge request easycorp/zentaopms!3992
|
2022-06-16 09:28:33 +00:00 |
|
|
leiyong
|
f4e3a0dc61
|
* Fix bug#23707.
|
2022-06-16 09:14:11 +00:00 |
|
|
王怡栋
|
bd1dc044d1
|
Merge branch 'master_xieqiyu_23829' into 'master'
* Fix bug#23829.
See merge request easycorp/zentaopms!3972
|
2022-06-16 09:03:35 +00:00 |
|
|
王怡栋
|
af2b0ef327
|
Merge branch 'master_xieqiyu_23762' into 'master'
* Fix bug#23762.
See merge request easycorp/zentaopms!3989
|
2022-06-16 09:03:19 +00:00 |
|
|
王怡栋
|
4bf221548e
|
Merge branch 'master_xieqiyu_23797' into 'master'
* Fix bug#23797.
See merge request easycorp/zentaopms!3981
|
2022-06-16 09:02:23 +00:00 |
|
|
xieqiyu
|
e0a9d3b339
|
* Fix bug#23762.
|
2022-06-16 16:56:57 +08:00 |
|
|
sunjun
|
8b4d326b90
|
fixissue_planIcon
|
2022-06-16 07:57:40 +00:00 |
|
|
xieqiyu
|
783d4471b0
|
* Fix bug#23797.
|
2022-06-16 15:50:25 +08:00 |
|
|
liumengyi
|
e4b44a2b05
|
* Fix issue #678.
|
2022-06-16 14:18:29 +08:00 |
|
|
xieqiyu
|
e33c963505
|
* Fix bug#23829.
|
2022-06-16 13:33:23 +08:00 |
|