 孙广明
|
bf20ea3577
|
Merge branch 'master_xieqiyu_75379' into 'master'
* Finish task#75379,#75324.
See merge request easycorp/zentaopms!6083
|
2022-11-09 02:55:57 +00:00 |
|
|
孙广明
|
860001dc88
|
Merge branch 'mayue_fix_bug#27342' into 'master'
* Fix bug #27342.
See merge request easycorp/zentaopms!6081
|
2022-11-09 02:54:43 +00:00 |
|
|
王怡栋
|
16b20c170c
|
Merge branch 'zentaopms258_wyd' into 'master'
* code for task #75236.
See merge request easycorp/zentaopms!6084
|
2022-11-09 02:31:53 +00:00 |
|
|
wangyidong
|
b32f2af9b7
|
* code for task #75236.
|
2022-11-09 10:30:30 +08:00 |
|
|
xieqiyu
|
af5b858388
|
* Finish task#75379,#75324.
|
2022-11-09 02:26:35 +00:00 |
|
|
mayue
|
404f47a361
|
* Fix bug #27342.
|
2022-11-09 09:37:05 +08:00 |
|
|
wangyidong
|
42f69a3457
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2022-11-09 09:21:14 +08:00 |
|
|
wangyidong
|
d08753fce4
|
* fix bug #28929.
|
2022-11-09 09:20:31 +08:00 |
|
|
Yagami
|
2133db01bf
|
* Code for release-build bug.
|
2022-11-08 16:15:01 +08:00 |
|
|
朱金勇
|
fc4302e603
|
Merge branch 'sprint/sunhao/optimize_page_loading' into 'master'
* optimize UI for page loading, remove indicator as soon as possible
See merge request easycorp/zentaopms!6077
|
2022-11-08 05:59:21 +00:00 |
|
|
王怡栋
|
cb0d235852
|
Merge branch 'bug_29383' into 'master'
* Fix bug#29383
See merge request easycorp/zentaopms!6076
|
2022-11-08 05:03:48 +00:00 |
|
|
曾刚
|
4fbadc7da8
|
* Fix bug#29383
|
2022-11-08 05:03:48 +00:00 |
|
|
王怡栋
|
1d7c9ce36e
|
Merge branch 'bug_#29381' into 'master'
* Fix bug #29381.
See merge request easycorp/zentaopms!6074
|
2022-11-08 05:01:31 +00:00 |
|
|
王怡栋
|
27d66c7d13
|
Merge branch 'sprint/konglinmao_feedback_1355' into 'master'
* Resolved feedback #1355.
See merge request easycorp/zentaopms!6073
|
2022-11-08 05:01:04 +00:00 |
|
|
孙广明
|
78b1d5b847
|
Merge branch 'cyy_bug' into 'master'
* Modify secondary menu error.
See merge request easycorp/zentaopms!6078
|
2022-11-08 04:26:00 +00:00 |
|
|
caoyanyi
|
8570e9a061
|
* Modify secondary menu error.
|
2022-11-08 11:47:57 +08:00 |
|
|
Hao Sun
|
686a81b0b1
|
* optimize UI for page loading, remove indicator as soon as possible
|
2022-11-08 03:29:19 +00:00 |
|
|
孙广明
|
e9b3e073e7
|
Merge branch 'cyy_bug' into 'master'
* Code for bug #29366.
See merge request easycorp/zentaopms!6072
|
2022-11-08 03:05:06 +00:00 |
|
|
daitingting
|
ea917ac153
|
* Scrum details are in max edition.
|
2022-11-08 02:52:43 +00:00 |
|
|
daitingting
|
0578e78e51
|
* Fix bug #29381.
|
2022-11-08 01:42:27 +00:00 |
|
|
wangyidong
|
d7eee8faf8
|
* rename update18.0.sql to update17.8.sql.
|
2022-11-08 09:24:25 +08:00 |
|
|
wangyidong
|
8ee88df5de
|
Merge branch 'zentaopms_252'
|
2022-11-08 09:23:23 +08:00 |
|
|
caoyanyi
|
828aa2ae64
|
* Adjust code.
|
2022-11-08 08:54:55 +08:00 |
|
|
wangyidong
|
bd18396178
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2022-11-08 08:41:50 +08:00 |
|
|
wangyidong
|
9761648d59
|
Merge branch 'zentaopms_239'
|
2022-11-08 08:41:28 +08:00 |
|
|
李玉春
|
2de5c636ed
|
Merge branch 'sprint/tianshujie_fixbug' into 'master'
Sprint/tianshujie fixbug
See merge request easycorp/zentaopms!6071
|
2022-11-08 00:33:03 +00:00 |
|
|
王怡栋
|
1ef9917477
|
Merge branch 'zentaopms_239_task_#74859' into 'zentaopms_239'
* Fix bug for task #74859.
See merge request easycorp/zentaopms!6070
|
2022-11-08 00:30:14 +00:00 |
|
|
caoyanyi
|
2bd70bc4f3
|
* Code for bug #29366.
|
2022-11-07 17:22:03 +08:00 |
|
|
tianshujie
|
e1ca6e57aa
|
* Fix bug #29361.
|
2022-11-07 17:21:08 +08:00 |
|
|
朱金勇
|
39bee976e5
|
Merge branch 'sprint/fix-api' into 'master'
* Fix missing requireFields error.
See merge request easycorp/zentaopms!6066
|
2022-11-07 09:14:13 +00:00 |
|
|
鲁飞
|
b8619da3a6
|
* Fix missing requireFields error.
|
2022-11-07 09:14:12 +00:00 |
|
|
朱金勇
|
b3917c280d
|
Merge branch 'sprint/add-taskrestart' into 'master'
* Support task restart api.
See merge request easycorp/zentaopms!6067
zentaopms_17.8
|
2022-11-07 08:59:03 +00:00 |
|
|
daitingting
|
03ff1ab5b0
|
* Fix bug for task #74859.
|
2022-11-07 08:54:16 +00:00 |
|
|
孙广明
|
3dc995919d
|
Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* fix bug #29363
See merge request easycorp/zentaopms!6069
|
2022-11-07 08:52:12 +00:00 |
|
|
lanzongjun
|
1e16357fe3
|
* fix bug #29363
|
2022-11-07 16:50:51 +08:00 |
|
|
Yagami
|
6413f85918
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2022-11-07 16:37:35 +08:00 |
|
|
Yagami
|
7f1ac56f29
|
* Fix bug #29369.
|
2022-11-07 16:36:58 +08:00 |
|
|
tianshujie
|
c05b94e3b0
|
* Fix bug #29377.
|
2022-11-07 16:00:47 +08:00 |
|
|
Lufei
|
3e69145e58
|
* Support task restart api.
|
2022-11-07 15:31:18 +08:00 |
|
|
孙广明
|
0d9ca308b0
|
Merge branch 'lyk_feedback_1380' into 'master'
* Resolve feedback #1380.
See merge request easycorp/zentaopms!6065
|
2022-11-07 07:21:41 +00:00 |
|
|
wangyidong
|
d354c68adf
|
* adjust for task #74928.
|
2022-11-07 15:19:58 +08:00 |
|
|
李玉春
|
62349c46b3
|
Merge branch 'sprint/tianshujie_fixbug' into 'master'
* Fix bug #29376.
See merge request easycorp/zentaopms!6064
|
2022-11-07 07:18:18 +00:00 |
|
|
李玉春
|
624bfcbeed
|
Merge branch 'sprint/tianshujie_css' into 'master'
Sprint/tianshujie css
See merge request easycorp/zentaopms!6061
|
2022-11-07 07:17:15 +00:00 |
|
|
liuyongkai
|
50e118bea4
|
* Resolve feedback #1380.
|
2022-11-07 07:16:14 +00:00 |
|
|
tianshujie
|
f6d526d916
|
* Fix bug #29376.
|
2022-11-07 15:12:30 +08:00 |
|
|
孙广明
|
15f7a8c486
|
Merge branch 'master_xieqiyu_fixbug' into 'master'
* Fix bug#29356.
See merge request easycorp/zentaopms!6063
|
2022-11-07 06:57:52 +00:00 |
|
|
xieqiyu
|
e5accc3154
|
* Fix bug#29356.
|
2022-11-07 06:54:28 +00:00 |
|
|
孔令茂
|
45fd5e6a53
|
* Resolved feedback #1355.
|
2022-11-07 06:45:21 +00:00 |
|
|
孙广明
|
8e4fe47631
|
Merge branch 'master_xieqiyu_fixbug' into 'master'
* Fix bug#29356,#29168.
See merge request easycorp/zentaopms!6062
|
2022-11-07 06:41:47 +00:00 |
|
|
caoyanyi
|
4e7bee9d32
|
Merge branch 'master' into sprint/tianshujie_css
|
2022-11-07 14:36:24 +08:00 |
|