 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 |
|
|
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 |
|
|
孙广明
|
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 |
|
|
李玉春
|
9030b0e194
|
Merge branch 'cyy_bug' into 'master'
* Fix bug #29355.
See merge request easycorp/zentaopms!6059
|
2022-11-07 06:35:30 +00:00 |
|
|
xieqiyu
|
3056c3d98b
|
* Fix bug#29356,#29168.
|
2022-11-07 06:35:17 +00:00 |
|
|
李玉春
|
04794398fa
|
Merge branch 'sprint/wangzemei/29345' into 'master'
* fix bug 29345
See merge request easycorp/zentaopms!6060
|
2022-11-07 06:32:47 +00:00 |
|
|
tianshujie
|
941a2e5a59
|
* Fix bug #29347.
|
2022-11-07 14:31:29 +08:00 |
|
|
wangzemei
|
261eb124ae
|
* fix bug 29345
|
2022-11-07 13:51:53 +08:00 |
|
|
caoyanyi
|
dcdc7bd58a
|
* Adjust code.
|
2022-11-07 13:49:12 +08:00 |
|
|
caoyanyi
|
e6cbdb8182
|
* Fix bug #28992.
|
2022-11-07 13:44:11 +08:00 |
|
|
tianshujie
|
32c5c0550b
|
* Adjust the page of the multiplayer task.
|
2022-11-07 13:30:17 +08:00 |
|
|
wangzemei
|
8e5e468431
|
* Optimizing theme styles
|
2022-11-07 13:26:53 +08:00 |
|
|
caoyanyi
|
43ca7832f9
|
* Fix bug #29355.
|
2022-11-07 13:16:57 +08:00 |
|
|
孙广明
|
0b501483ef
|
Merge branch 'sprint/tianshujie_css' into 'master'
Sprint/tianshujie css
See merge request easycorp/zentaopms!6058
|
2022-11-07 03:14:03 +00:00 |
|
|
tianshujie
|
8e67ec5de9
|
* Optimize the form for recording work hours for multi-person tasks.
|
2022-11-07 11:04:45 +08:00 |
|
|
王怡栋
|
36fa636926
|
Merge branch 'fixbug' into 'master'
* Set memory_limit and max_execution_time for import.
See merge request easycorp/zentaopms!6055
|
2022-11-07 02:55:19 +00:00 |
|
|
Yagami
|
b631288454
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2022-11-07 10:54:28 +08:00 |
|
|
Yagami
|
d35791bde0
|
* Fix keep login bug.
|
2022-11-07 10:54:15 +08:00 |
|
|
孙广明
|
e22839b687
|
Merge branch 'feedback_zhouxin_1277' into 'master'
* Resolve feedback #1277.
See merge request easycorp/zentaopms!6057
|
2022-11-07 02:54:01 +00:00 |
|
|
王怡栋
|
0d32989630
|
Merge branch 'sprint/ZUI_guofeilong_updateIcon_ticket_and_gantt1' into 'master'
+ ZUI add icon ticket and gantt1
See merge request easycorp/zentaopms!6053
|
2022-11-07 02:52:54 +00:00 |
|
|
孙广明
|
af5c2c5845
|
Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* fix bug ticket count show
See merge request easycorp/zentaopms!6056
|
2022-11-07 02:52:21 +00:00 |
|
|
lanzongjun
|
30bae3ed2d
|
* fix bug ticket count show
|
2022-11-07 10:51:18 +08:00 |
|
|
tianshujie
|
4ee897dc0d
|
* Fix bug #27494.
|
2022-11-07 10:50:32 +08:00 |
|
|
zhouxin
|
d6a2fcd325
|
* Resolve feedback #1277.
|
2022-11-07 10:44:27 +08:00 |
|
|
tanghucheng
|
76f830aad6
|
* Set memory_limit and max_execution_time for import.
|
2022-11-07 10:12:28 +08:00 |
|
|
李玉春
|
e8b42deef3
|
Merge branch 'sprint/tianshujie_fixbug' into 'master'
Sprint/tianshujie fixbug
See merge request easycorp/zentaopms!6054
|
2022-11-07 02:06:22 +00:00 |
|
|
李玉春
|
9a5c92a275
|
Merge branch 'cyy_bug' into 'master'
* Fix bug #27589.
See merge request easycorp/zentaopms!6052
|
2022-11-07 02:05:01 +00:00 |
|
|
tianshujie
|
280a37559e
|
* Fix bug #29293.
|
2022-11-07 10:03:47 +08:00 |
|