 孙广明
|
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 |
|
|
tianshujie
|
d351c15090
|
* Fix bug #23828.
|
2022-06-16 13:23:57 +08:00 |
|
|
王怡栋
|
ae6f603d1e
|
Merge branch 'sprint/master_zhouxudong_fixbug' into 'master'
* Fix bug about kanban's setLane.
See merge request easycorp/zentaopms!3969
|
2022-06-16 05:02:33 +00:00 |
|
|
zhouxudong
|
85fc6dec5d
|
* Fix bug about kanban's setLane.
|
2022-06-16 04:05:54 +00:00 |
|
|
caoyanyi
|
8d16be79c4
|
* Modify page locate.
|
2022-06-16 12:04:06 +08:00 |
|
|
王怡栋
|
9f7840a2d7
|
Merge branch 'sprint/204_liumengyi_677' into 'master'
* Fix issue #677.
See merge request easycorp/zentaopms!3966
|
2022-06-16 03:28:18 +00:00 |
|
|
liumengyi
|
d369332447
|
* Fix issue #677.
|
2022-06-16 11:25:41 +08:00 |
|
|
tianshujie
|
6848485eb4
|
* Finish task #57095.
|
2022-06-16 11:05:01 +08:00 |
|
|
tianshujie
|
b3e240eda5
|
* Finish task #57095.
|
2022-06-16 10:29:31 +08:00 |
|
|
tianshujie
|
da9801d9eb
|
* Finish task #57095.
|
2022-06-16 09:08:05 +08:00 |
|
|
tianshujie
|
061e25fd51
|
* Finish task #57095.
|
2022-06-16 08:53:15 +08:00 |
|
|
王怡栋
|
26ab6bfb4c
|
Merge branch 'leiyong_fix_bug_23432' into 'master'
* Finish task#56932.
See merge request easycorp/zentaopms!3958
|
2022-06-16 00:37:19 +00:00 |
|
|
王怡栋
|
a79c6bab16
|
Merge branch 'master_xieqiyu_23657' into 'master'
* Fix bug#23657.
See merge request easycorp/zentaopms!3957
|
2022-06-16 00:36:14 +00:00 |
|
|
tianshujie
|
cdc590c16b
|
* Finish task #57095.
|
2022-06-16 08:27:34 +08:00 |
|
|
xieqiyu
|
16ea32d744
|
* Fix bug#23657.
|
2022-06-16 08:18:00 +08:00 |
|
|
leiyong
|
fcd6f4c333
|
* Finish task#56932.
|
2022-06-15 10:57:05 +00:00 |
|
|
王怡栋
|
95df7b5e3c
|
Merge branch 'master_xieqiyu_23662' into 'master'
* Fix bug#23662.
See merge request easycorp/zentaopms!3949
|
2022-06-15 09:32:05 +00:00 |
|
|
王怡栋
|
f064336c1f
|
Merge branch 'sprint/tianshujie_57095' into 'master'
* Finish task #57095.
See merge request easycorp/zentaopms!3951
|
2022-06-15 09:28:49 +00:00 |
|
|
王怡栋
|
4985d76009
|
Merge branch 'sprint/hufangzhou_56361' into 'master'
* Finish task #56361.
See merge request easycorp/zentaopms!3945
|
2022-06-15 09:28:14 +00:00 |
|
|
tianshujie
|
4fcf0b7dc3
|
* Finish task #57095.
|
2022-06-15 17:26:39 +08:00 |
|
|
xieqiyu
|
f460aa58fd
|
* Fix bug#23662.
|
2022-06-15 17:07:18 +08:00 |
|
|
孙广明
|
1f13b14799
|
Merge branch 'master' into 'sprint/204_tianshujie_57095'
# Conflicts:
# module/execution/css/all.css
|
2022-06-15 09:03:47 +00:00 |
|
|
tianshujie
|
b6a1b3eb79
|
* Finish task #57095.
|
2022-06-15 16:55:28 +08:00 |
|
|
tianshujie
|
1f0f1ff36e
|
* Finish task #57095.
|
2022-06-15 16:52:26 +08:00 |
|
|
tianshujie
|
7f000fd968
|
* Finish task #57095.
|
2022-06-15 16:41:12 +08:00 |
|
|
王怡栋
|
a6b264d1a7
|
Merge branch 'sprint202_leiyong_task_56926' into 'master'
Sprint202 leiyong task 56926
See merge request easycorp/zentaopms!3942
|
2022-06-15 08:20:11 +00:00 |
|
|
tianshujie
|
520ab92338
|
* Finish task #57095.
|
2022-06-15 16:17:16 +08:00 |
|
|
hufangzhou
|
d83ce3c27c
|
* Can't post the disabled value to rear end.
|
2022-06-15 16:06:39 +08:00 |
|