Commit Graph
32575 Commits
Author SHA1 Message Date
liyuchun 48bdba2a96 * Fix error. 2022-01-14 10:47:41 +08:00
liyuchun f8f71f59af * Finish task #47233. 2022-01-14 09:21:04 +08:00
王怡栋 f7ce008031 Merge branch 'devops19_liyuchun_47232' into devops19 2022-01-14 08:50:25 +08:00
王怡栋 f991a29236 Merge branch 'devops19' into 'devops19_liyuchun_47232'
# Conflicts:
#   module/sonarqube/lang/en.php
#   module/sonarqube/lang/zh-cn.php
#   module/sonarqube/view/browseproject.html.php
2022-01-14 00:48:58 +00:00
李玉春 d174b7889b Merge branch 'devops19_zenggang' into 'devops19'
调整删除sonarqube项目按钮代码

See merge request easycorp/zentaopms!1391
2022-01-14 00:21:53 +00:00
zenggang 0fc8a059b8 * Adjust code 2022-01-13 09:32:02 +00:00
liyuchun e0b65585d7 * Finish task #47232. 2022-01-13 17:22:05 +08:00
李玉春 dc42b886bc Merge branch 'devops19_47222' into 'devops19'
任务47222

See merge request easycorp/zentaopms!1383
2022-01-13 09:09:12 +00:00
zenggang 2263ecf9a4 * Adjust code 2022-01-13 09:02:59 +00:00
liyuchun 23b367ceb3 Merge branch 'devops_caoyanyi_47221' into devops19 2022-01-13 16:55:36 +08:00
liyuchun 3fcc07af28 * Adjsut code. 2022-01-13 16:55:22 +08:00
李玉春 10f7747925 Merge branch 'devops19' into 'devops_caoyanyi_47221'
# Conflicts:
#   module/sonarqube/model.php
2022-01-13 08:53:45 +00:00
liyuchun 4bf49c5da7 * Finish task #47232. 2022-01-13 16:25:56 +08:00
caoyanyi c2d30bc92f * Modify project param. 2022-01-13 07:43:16 +00:00
zenggang 49ead95535 * Finish task#47222 2022-01-13 06:17:17 +00:00
caoyanyi d5a6841365 * Midify construct function. 2022-01-13 05:58:51 +00:00
caoyanyi 384a29b657 * Modify submit error when sonarqube project is empty. 2022-01-13 05:38:19 +00:00
李玉春 73db658809 Merge branch 'devops_caoyanyi_bug' into 'devops19'
cyy:Fix bug.

See merge request easycorp/zentaopms!1379
2022-01-13 05:24:19 +00:00
caoyanyi 5d2892e415 * Modify actionID return. 2022-01-13 05:22:04 +00:00
caoyanyi e2d8d506b3 * Fix bug #18370,18371,18372,18379. 2022-01-13 05:08:08 +00:00
caoyanyi d0b3979347 * Modify sonarqube frame for job create. 2022-01-13 01:58:15 +00:00
liyuchun 5ed3a7cede Merge branch 'devops19_47229' into devops19 2022-01-13 08:51:52 +08:00
李玉春 bfea1ccb16 Merge branch 'devops19' into 'devops19_47229'
# Conflicts:
#   module/sonarqube/control.php
#   module/sonarqube/model.php
2022-01-13 00:51:36 +00:00
zenggang 7679a54e9e * Adjust code 2022-01-12 09:22:12 +00:00
李玉春 3a156ec3a5 Merge branch 'devops_caoyanyi_47227' into 'devops19'
cyy:Finish task 47227.

See merge request easycorp/zentaopms!1368
2022-01-12 09:20:18 +00:00
李玉春 e0fa6d7017 Update model.php 2022-01-12 09:19:54 +00:00
zenggang ff23d0118b * Adjust code 2022-01-12 09:18:50 +00:00
zenggang eb500460e5 * Finish task#47229,47231 2022-01-12 09:04:38 +00:00
caoyanyi 8d303e4db1 * Finish task #47227. 2022-01-12 07:44:16 +00:00
liyuchun 176053fca2 * Fix error. 2022-01-12 15:26:20 +08:00
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