 孙广明
|
7e6920ccd4
|
Merge branch 'master_xieqiyu_56936' into 'master'
* Fix bug#56936.
See merge request easycorp/zentaopms!3965
|
2022-06-16 03:15:51 +00:00 |
|
|
xieqiyu
|
e2361820ba
|
* Fix bug#56936.
|
2022-06-16 11:13:17 +08:00 |
|
|
李玉春
|
a3440508a4
|
Merge branch 'sprint/wangzemei/23705' into 'master'
* fix bug 23705
See merge request easycorp/zentaopms!3940
|
2022-06-16 03:04:15 +00:00 |
|
|
孙广明
|
1315cf7ea8
|
Merge branch 'sgm_details' into 'master'
Sgm details
See merge request easycorp/zentaopms!3963
|
2022-06-16 02:48:43 +00:00 |
|
|
孙广明
|
3ead38f9f2
|
* Fix traincourse bug.
|
2022-06-16 10:48:09 +08:00 |
|
|
王怡栋
|
e92b1f1f4c
|
Merge branch 'sprint/201_tianshujie_57095' into 'master'
* Finish task #57095.
See merge request easycorp/zentaopms!3961
|
2022-06-16 01:04:21 +00:00 |
|
|
王怡栋
|
504319fcef
|
Merge branch 'leiyong_fix_bug_23735' into 'master'
* Fix bug#23793.
See merge request easycorp/zentaopms!3953
|
2022-06-16 01:03:22 +00:00 |
|
|
wangzemei
|
ea0aeec4e8
|
* delete space
|
2022-06-16 00:57:37 +00:00 |
|
|
tianshujie
|
061e25fd51
|
* Finish task #57095.
|
2022-06-16 08:53:15 +08:00 |
|
|
wangzemei
|
1ccd06777c
|
* delete extra code about 23705
|
2022-06-16 00:46:27 +00:00 |
|
|
王怡栋
|
bd1c3b58aa
|
Merge branch 'sprint/master_zhouxudong_fixbug' into 'master'
* Fix contacts style for different theme.
See merge request easycorp/zentaopms!3960
|
2022-06-16 00:37:54 +00: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 |
|
|
王怡栋
|
50b9d3013a
|
Merge branch 'master_xieqiyu_23724' into 'master'
* Fix bug#23724.
See merge request easycorp/zentaopms!3956
|
2022-06-16 00:35:46 +00:00 |
|
|
王怡栋
|
e041a8576c
|
Merge branch 'master_xieqiyu_23669' into 'master'
* Fix bug#23669.
See merge request easycorp/zentaopms!3955
|
2022-06-16 00:33:57 +00:00 |
|
|
zhouxudong
|
d31dbf6002
|
* Fix contacts style for different theme.
|
2022-06-16 00:33:27 +00:00 |
|
|
王怡栋
|
06a6d3f112
|
Merge branch 'sprint/master_zhouxudong_23687' into 'master'
* Fix bug #23687.
See merge request easycorp/zentaopms!3950
|
2022-06-16 00:31:01 +00:00 |
|
|
zhujinyong
|
a0d1f7cd4b
|
Merge branch 'sprint/sunhao/task56927'
|
2022-06-16 08:30:31 +08:00 |
|
|
王怡栋
|
513b348c7b
|
Merge branch 'sprint/201_tianshujie_57095' into 'master'
* Finish task #57095.
See merge request easycorp/zentaopms!3959
|
2022-06-16 00:28:58 +00:00 |
|
|
孙广明
|
8db0b61c87
|
Merge branch 'sprint_204_57091' into 'master'
Sprint 204 57091
See merge request easycorp/zentaopms!3948
|
2022-06-16 00:28:26 +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 |
|
|
sunjun
|
d0dfc61e48
|
sprint_57091
|
2022-06-15 14:25:01 +00:00 |
|
|
leiyong
|
fcd6f4c333
|
* Finish task#56932.
|
2022-06-15 10:57:05 +00:00 |
|
|
xieqiyu
|
16f8efac4e
|
* Fix bug#23724.
|
2022-06-15 18:38:01 +08:00 |
|
|
xieqiyu
|
16bb61a2ec
|
* Fix bug#23669.
|
2022-06-15 18:17:18 +08:00 |
|
|
Hao Sun
|
56c5f05071
|
* optimize mini burn chart, support empty data.
|
2022-06-15 10:05:36 +00:00 |
|
|
leiyong
|
32642d45ae
|
* Fix bug#23793.
|
2022-06-15 10:00:58 +00:00 |
|
|
zhujinyong
|
b2bf48c7d3
|
Merge branch 'sprint/sunhao/task56942'
|
2022-06-15 17:58:22 +08:00 |
|
|
朱金勇
|
1a5b537ec7
|
Merge branch 'cyy_zcli' into 'master'
* Add api for jobs and repos.
See merge request easycorp/zentaopms!3941
|
2022-06-15 09:54:22 +00:00 |
|
|
zhujinyong
|
b8189edbf7
|
Merge branch 'sprint/sunhao/picker'
|
2022-06-15 17:53:37 +08:00 |
|
|
Hao Sun
|
60f23970ba
|
* task #56942, optimize UI for task create form.
|
2022-06-15 09:53:25 +00:00 |
|
|
zhujinyong
|
dfcada81f1
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2022-06-15 17:52:37 +08:00 |
|
|
zhujinyong
|
b2169d334a
|
Merge branch 'sprint/sunhao/task56394'
|
2022-06-15 17:47:15 +08: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 |
|
|
王怡栋
|
d5c3e6a452
|
Merge branch 'sprint/master_zhouxudong_23672' into 'master'
* Fix bug #23672.
See merge request easycorp/zentaopms!3947
|
2022-06-15 09:29:16 +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 |
|
|
王怡栋
|
62d83018f0
|
Merge branch 'sprint/master_tanghucheng' into 'master'
* Fix bug #23775.
See merge request easycorp/zentaopms!3944
|
2022-06-15 09:23:55 +00:00 |
|
|
zhouxudong
|
6059c89194
|
* Fix bug #23687.
|
2022-06-15 09:13:37 +00:00 |
|
|
xieqiyu
|
f460aa58fd
|
* Fix bug#23662.
|
2022-06-15 17:07:18 +08:00 |
|
|
sunjun
|
b039a66450
|
57091
|
2022-06-15 09:06:55 +00:00 |
|
|
sunjun
|
9d2b2a530e
|
sprint_204_57091
|
2022-06-15 09:04:38 +00:00 |
|
|
孙广明
|
f8e003c80b
|
Merge branch 'sprint/204_tianshujie_57095'
|
2022-06-15 17:04:10 +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 |
|
|
zhouxudong
|
3b01055e5f
|
* Fix bug #23672.
|
2022-06-15 09:00:16 +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 |
|