 wangyidong
|
d60d0cbb6d
|
Merge branch 'zentaopms_258_task_#75241'
|
2022-11-09 16:21:08 +08:00 |
|
|
代婷婷
|
f20193b36c
|
Merge branch 'master' into 'zentaopms_258_task_#75241'
# Conflicts:
# module/release/control.php
|
2022-11-09 08:07:44 +00:00 |
|
|
王怡栋
|
a902aad93e
|
Merge branch 'zentaopms_258_task#74157' into 'master'
* Finish task #74157.
See merge request easycorp/zentaopms!6088
|
2022-11-09 08:03:49 +00:00 |
|
|
王怡栋
|
bc5762d8a7
|
Merge branch 'zentaopms_258_task_#75240' into 'master'
* Finish task #75240.
See merge request easycorp/zentaopms!6087
|
2022-11-09 08:02:53 +00:00 |
|
|
王怡栋
|
cc1f2d36d1
|
Merge branch 'transfer' into 'master'
* Change port to transfer.
See merge request easycorp/zentaopms!6091
|
2022-11-09 08:01:00 +00:00 |
|
|
王怡栋
|
d8b1b0ba39
|
Merge branch 'zentaopms_258_task#75248' into 'master'
* Finish task #75248.
See merge request easycorp/zentaopms!6082
|
2022-11-09 08:00:04 +00:00 |
|
|
daitingting
|
4632027f9c
|
* Finish task #75241.
|
2022-11-09 07:58:34 +00:00 |
|
|
liugang
|
ce1458946e
|
* Fix bug of generate the view link of user story in search-index page.
|
2022-11-09 15:49:01 +08:00 |
|
|
tanghucheng
|
e09a070318
|
* Merge branch 'master' into transfer.
|
2022-11-09 15:44:42 +08:00 |
|
|
孙广明
|
253f9bb83a
|
Merge branch 'sprint/scx_deptapi' into 'master'
*Fix api cannot use bug.
See merge request easycorp/zentaopms!6079
|
2022-11-09 07:39:55 +00:00 |
|
|
孙广明
|
13e66e8175
|
Merge branch 'sprint/scx_testresutapi' into 'master'
Sprint/scx testresutapi
See merge request easycorp/zentaopms!6089
|
2022-11-09 07:32:27 +00:00 |
|
|
孙广明
|
c49e9f3017
|
Merge branch 'master_xieqiyu_75321' into 'master'
* Finish task#75321.
See merge request easycorp/zentaopms!6086
|
2022-11-09 07:32:07 +00:00 |
|
|
宋辰轩
|
1e4e66b590
|
* Modify function name.
|
2022-11-09 14:23:49 +08:00 |
|
|
宋辰轩
|
9d25f1af1c
|
* Modify return .
|
2022-11-09 14:21:15 +08:00 |
|
|
宋辰轩
|
25fec30f8b
|
* Fix bug for testresult api.
|
2022-11-09 14:19:37 +08:00 |
|
|
daitingting
|
8125b5bf8b
|
* Finish task #75240.
|
2022-11-09 06:13:07 +00:00 |
|
|
wangyuting
|
2c336ec7dd
|
* Finish task #74157.
|
2022-11-09 06:02:58 +00:00 |
|
|
孙广明
|
78a793670b
|
Merge branch 'mayue_fix_bug#29454' into 'master'
* Fix bug #29454.
See merge request easycorp/zentaopms!6085
|
2022-11-09 05:59:59 +00:00 |
|
|
xieqiyu
|
f4b99792dd
|
* Finish task#75317.
|
2022-11-09 03:19:33 +00:00 |
|
|
Yagami
|
4610d9ac66
|
* Fix bug #75360.
|
2022-11-09 11:11:18 +08:00 |
|
|
xieqiyu
|
abe047ee58
|
* Finish task#75321.
|
2022-11-09 03:07:57 +00:00 |
|
|
孙广明
|
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 |
|
|
mayue
|
9bbfe8a130
|
* Fix bug #29454.
|
2022-11-09 10:51:06 +08: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 |
|
|
wangyuting
|
aed53849d1
|
* Finish task #75248.
|
2022-11-09 02:10:29 +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 |
|
|
宋辰轩
|
8883698534
|
* Delete unsed code.
|
2022-11-08 16:09:30 +08:00 |
|
|
宋辰轩
|
33c4c5278e
|
*Fix api cannot use bug.
|
2022-11-08 16:07:09 +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 |
|