Commit Graph
27817 Commits
Author SHA1 Message Date
zenggang 0fc8a059b8 * Adjust code 2022-01-13 09:32:02 +00: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 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
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
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
李玉春 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
李玉春 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
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
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
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
liyuchun a0669db9be * Fix error when pre merge. 2022-01-11 15:55:32 +08: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
孙广明 1cae18380b Revert "Merge branch 'sprint/182_hufangzhou_47330' into 'master'"
This reverts merge request !1324
2022-01-11 00:39:37 +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
孙广明 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
hufangzhou 0b9e2c0fa3 * Finish task #47331. 2022-01-10 17:18:18 +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
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