Commit Graph
32600 Commits
Author SHA1 Message Date
zenggang 27b848d6f8 * unit test 2022-01-17 09:12:17 +00:00
李玉春 9bf831ee67 Merge branch 'devops_caoyanyi_testcase' into 'devops19'
cyy:Modify common function.

See merge request easycorp/zentaopms!1440
2022-01-17 07:00:16 +00:00
李玉春 48b004b503 Merge branch 'devops19_zenggang' into 'devops19'
zg:修复bug

See merge request easycorp/zentaopms!1439
2022-01-17 06:58:11 +00:00
caoyanyi f82a59604b * Modify common function. 2022-01-17 06:53:53 +00:00
zenggang 4b0d2e842a * Fix bug#18456,18393,18392 2022-01-17 06:49:36 +00:00
王怡栋 be580b4e29 Merge branch 'devops19_liyuchun' into 'devops19'
Fix bug #18435,#18437.

See merge request easycorp/zentaopms!1435
2022-01-17 06:29:47 +00:00
liyuchun 5724bd4fc5 * Fix bug #18435,#18437. 2022-01-17 13:37:11 +08:00
李玉春 03683c4119 Merge branch 'devops19_zenggang' into 'devops19'
zg:单元测试

See merge request easycorp/zentaopms!1419
2022-01-17 02:01:09 +00:00
liyuchun dcd292115b Merge branch 'devops_caoyanyi_bug' into devops19 2022-01-17 10:00:18 +08:00
李玉春 959560f680 Merge branch 'devops19' into 'devops_caoyanyi_bug'
# Conflicts:
#   module/job/control.php
2022-01-17 01:59:45 +00:00
caoyanyi 46fda60647 * Modify return value. 2022-01-17 01:57:23 +00:00
caoyanyi 07ba811bc2 * Modify trash data tips. 2022-01-17 01:22:51 +00:00
zenggang 3630c5f718 * Unit test 2022-01-14 09:09:25 +00:00
caoyanyi 20f291b9b2 * Fix bug #18448. 2022-01-14 06:52:35 +00:00
王怡栋 7c981830b6 Merge branch 'devops19_liyuchun' into 'devops19'
* Fix bug #18450,18447.

See merge request easycorp/zentaopms!1405
2022-01-14 03:28:21 +00:00
liyuchun 19905f7eda * Fix bug #18450,18447. 2022-01-14 11:26:28 +08:00
caoyanyi 0be41abb83 * Fix bug #18442. 2022-01-14 03:22:47 +00:00
caoyanyi 41b7d853d3 * Fix bug #18454. 2022-01-14 03:16:55 +00:00
王怡栋 7318cf470c Merge branch 'devops_liyuchun_47233' into devops19 2022-01-14 10:58:25 +08:00
王怡栋 b60de3ae39 Merge branch 'devops19' into 'devops_liyuchun_47233'
# Conflicts:
#   module/sonarqube/control.php
2022-01-14 02:57:36 +00:00
liyuchun 48bdba2a96 * Fix error. 2022-01-14 10:47:41 +08:00
李玉春 e515ed44a0 Merge branch 'devops19_zenggang' into 'devops19'
去掉创建sonarqube项目和修复bugs

See merge request easycorp/zentaopms!1399
2022-01-14 02:09:00 +00:00
zenggang f8ef544d94 * Adjust code and fix bugs 2022-01-14 01:54:48 +00:00
王怡栋 644c0afe08 Merge branch 'devops_liyuchun_47233' into 'devops19'
lyc完成任务:在禅道SonarQube项目列表页面中添加执行SonarQube按钮

See merge request easycorp/zentaopms!1397
2022-01-14 01:37:33 +00:00
李玉春 afd1662c19 Merge branch 'devops_caoyanyi_bug' into 'devops19'
cyy:Fix bug.

See merge request easycorp/zentaopms!1396
2022-01-14 01:23:34 +00:00
liyuchun f8f71f59af * Finish task #47233. 2022-01-14 09:21:04 +08:00
caoyanyi 770bba7719 * Modify trash locate. 2022-01-14 01:19:40 +00: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