 liyuchun
|
edfa7ea248
|
Merge branch 'devops19_caoyanyi_47221' into devops19
|
2022-01-12 15:03:05 +08:00 |
|
|
李玉春
|
e50bb1f221
|
Merge branch 'devops19' into 'devops19_caoyanyi_47221'
# Conflicts:
# module/sonarqube/control.php
# module/sonarqube/model.php
|
2022-01-12 07:02:42 +00:00 |
|
|
caoyanyi
|
0046f0289e
|
* Adjust codes.
|
2022-01-12 07:00:14 +00:00 |
|
|
caoyanyi
|
9da6e4b9c0
|
* Finish task #47221.
|
2022-01-12 06:44:54 +00:00 |
|
|
王怡栋
|
3260e91a12
|
Merge branch 'devops_liyuchun_47233' into 'devops19'
* Finish task #47233.
See merge request easycorp/zentaopms!1361
|
2022-01-12 06:40:36 +00:00 |
|
|
liyuchun
|
b3ff9202a2
|
* Finish task #47233.
|
2022-01-12 14:38:06 +08:00 |
|
|
liyuchun
|
c5aaae3eb8
|
* Finish task #47233.
|
2022-01-12 14:16:34 +08:00 |
|
|
李玉春
|
5de5226e39
|
Merge branch 'devops19_47228' into 'devops19'
任务47228
See merge request easycorp/zentaopms!1355
|
2022-01-12 03:18:42 +00:00 |
|
|
zenggang
|
5359525b4c
|
* Adjust code
|
2022-01-12 03:12:38 +00:00 |
|
|
zenggang
|
b805395595
|
* Adjust code
|
2022-01-12 03:11:22 +00:00 |
|
|
zenggang
|
8f5032d898
|
* Finish task#47228
|
2022-01-12 02:41:27 +00:00 |
|
|
李玉春
|
2bc152e80c
|
Merge branch 'devops19_47226' into 'devops19'
* Finish task#47226
See merge request easycorp/zentaopms!1351
|
2022-01-12 01:59:26 +00:00 |
|
|
zenggang
|
e69be078a3
|
* Adjust code
|
2022-01-12 01:46:35 +00:00 |
|
|
zenggang
|
8285477ef1
|
* Adjust language
|
2022-01-12 01:11:35 +00:00 |
|
|
zenggang
|
ca95618c5c
|
* Adjust code
|
2022-01-11 10:10:52 +00:00 |
|
|
zenggang
|
e2988a1212
|
* Adjust code
|
2022-01-11 09:48:18 +00:00 |
|
|
zenggang
|
322dcddfab
|
* Finish task#47226
|
2022-01-11 09:44:13 +00:00 |
|
|
王怡栋
|
9fcf956b5a
|
Merge branch 'devops19_liyuchun' into 'devops19'
修复Z工具预合并失败问题
See merge request easycorp/zentaopms!1346
|
2022-01-11 08:00:15 +00:00 |
|
|
liyuchun
|
a0669db9be
|
* Fix error when pre merge.
|
2022-01-11 15:55:32 +08:00 |
|
|
李玉春
|
6cadd42eec
|
Merge branch 'devops_caoyanyi_47224' into 'devops19'
新增SonarQube入口及列表
See merge request easycorp/zentaopms!1341
|
2022-01-11 06:16:12 +00:00 |
|
|
caoyanyi
|
1e80904680
|
* Modify page btn.
|
2022-01-11 05:20:18 +00:00 |
|
|
caoyanyi
|
8dff489e72
|
* Finish task #47224.
|
2022-01-11 02:50:35 +00:00 |
|
|
王怡栋
|
9f778e38b5
|
Merge branch 'revert-3e9bcdb8' into 'master'
Revert "Merge branch 'sprint/182_hufangzhou_47331' into 'master'"
See merge request easycorp/zentaopms!1328
|
2022-01-11 00:43:35 +00:00 |
|
|
王怡栋
|
19fc483611
|
Merge branch 'revert-b904bc3c' into 'master'
Revert "Merge branch 'sgm_182db' into 'master'"
See merge request easycorp/zentaopms!1329
|
2022-01-11 00:41:01 +00:00 |
|
|
王怡栋
|
1e50b1b3e4
|
Merge branch 'revert-db968165' into 'master'
Revert "Merge branch 'sprint/182_hufangzhou_47330' into 'master'"
See merge request easycorp/zentaopms!1331
|
2022-01-11 00:40:34 +00:00 |
|
|
孙广明
|
1cae18380b
|
Revert "Merge branch 'sprint/182_hufangzhou_47330' into 'master'"
This reverts merge request !1324
|
2022-01-11 00:39:37 +00:00 |
|
|
孙广明
|
9a744f651a
|
Revert "Merge branch 'sgm_182db' into 'master'"
This reverts merge request !1325
|
2022-01-11 00:38:36 +00:00 |
|
|
孙广明
|
3ab13aa61e
|
Merge branch 'sprint/182_songchenxuan_action_lang' into 'master'
*Case action lang.
See merge request easycorp/zentaopms!1322
|
2022-01-11 00:36:32 +00:00 |
|
|
孙广明
|
b57562e99e
|
Revert "Merge branch 'sprint/182_hufangzhou_47331' into 'master'"
This reverts merge request !1326
|
2022-01-11 00:35:04 +00:00 |
|
|
songchenxuan
|
bb13431274
|
*Fix bug 18074.
|
2022-01-11 08:34:55 +08:00 |
|
|
李玉春
|
b904bc3c58
|
Merge branch 'sgm_182db' into 'master'
* Add upgrade.sql.
See merge request easycorp/zentaopms!1325
|
2022-01-11 00:11:48 +00:00 |
|
|
zhujinyong
|
80765f894d
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2022-01-10 21:13:52 +08:00 |
|
|
zhujinyong
|
f3e681c99f
|
* Add testTask table for update0.sql.
|
2022-01-10 21:12:04 +08:00 |
|
|
孙广明
|
714471e03b
|
Merge branch 'sprint/182_liumengyi_47483' into 'master'
* Finish task #47483.
See merge request easycorp/zentaopms!1327
|
2022-01-10 09:40:44 +00:00 |
|
|
liumengyi
|
cc3c90291d
|
* Finish task #47483.
|
2022-01-10 17:32:31 +08:00 |
|
|
孙广明
|
3e9bcdb892
|
Merge branch 'sprint/182_hufangzhou_47331' into 'master'
* Finish task #47331.
See merge request easycorp/zentaopms!1326
|
2022-01-10 09:21:23 +00:00 |
|
|
hufangzhou
|
0b9e2c0fa3
|
* Finish task #47331.
|
2022-01-10 17:18:18 +08:00 |
|
|
孙广明
|
ff6b122f3a
|
* Add upgrade.sql.
|
2022-01-10 16:46:02 +08:00 |
|
|
孙广明
|
db9681654b
|
Merge branch 'sprint/182_hufangzhou_47330' into 'master'
* Finish task #47330.
See merge request easycorp/zentaopms!1324
|
2022-01-10 08:36:39 +00:00 |
|
|
hufangzhou
|
075ac6efc5
|
* Adjust the lang item order.
|
2022-01-10 15:58:01 +08:00 |
|
|
hufangzhou
|
63226a2e84
|
* Finish task #47330.
|
2022-01-10 15:45:24 +08:00 |
|
|
孙广明
|
489c06ddb3
|
Merge branch 'sprint/182_tianshujie_18289' into 'master'
* Fix bug #18289.
See merge request easycorp/zentaopms!1323
|
2022-01-10 07:43:45 +00:00 |
|
|
tianshujie
|
0601474a78
|
* Fix bug #18289.
|
2022-01-10 15:41:24 +08:00 |
|
|
songchenxuan
|
721cdba3d3
|
*Case action lang.
|
2022-01-10 14:11:28 +08:00 |
|
|
孙广明
|
3c2fe9e87f
|
Merge branch 'tianshujie_fixBug' into 'master'
* Fix bug #18287.
See merge request easycorp/zentaopms!1321
|
2022-01-10 05:35:22 +00:00 |
|
|
tianshujie
|
1ee5fb522f
|
* Fix bug #18287.
|
2022-01-10 12:15:19 +08:00 |
|
|
李玉春
|
f08514b544
|
Merge branch 'devops18_18277' into 'master'
* Fix bug#18277
See merge request easycorp/zentaopms!1316
zentaopms_16.1_20220110
|
2022-01-10 00:46:09 +00:00 |
|
|
孙广明
|
6ef3c5018e
|
Merge branch 'sprint/liyuchun_devops18' into 'master'
* Fix bug #18264.
See merge request easycorp/zentaopms!1319
|
2022-01-10 00:44:48 +00:00 |
|
|
liyuchun
|
ab097f3a61
|
* Fix bug #18264.
|
2022-01-10 08:39:41 +08:00 |
|
|
孙广明
|
07014ed347
|
Merge branch 'sprint/180_hufangzhou_18281' into 'master'
# Fix bug #18281.
See merge request easycorp/zentaopms!1317
|
2022-01-07 03:20:46 +00:00 |
|