Commit Graph

51 Commits

Author SHA1 Message Date
liyuchun
7d40bdf1d3 * Finish task #50709. 2022-03-14 15:53:33 +08:00
zhujinyong
408f8d4d91 * Move die to return. 2022-02-22 14:15:00 +08:00
zenggang
afd2b95e74 * Fix bug#19440,19441,19442 2022-02-11 09:38:34 +00:00
孙广明
12847ab38e Merge branch 'devops21_liyuchun' into 'devops21'
* Finish task #48611.

See merge request easycorp/zentaopms!1764
2022-02-11 05:57:45 +00:00
李玉春
d1ceb31512 Merge branch 'devops21_zenggang' into 'devops21'
zg:修复bug19411

See merge request easycorp/zentaopms!1755
2022-02-11 05:19:09 +00:00
liyuchun
df99853767 * Finish task #48611. 2022-02-11 11:23:03 +08:00
caoyanyi
44ab426a16 * Modify onlybody param. 2022-02-11 02:56:24 +00:00
zenggang
ee681782d9 * Fix bug#19411 2022-02-11 01:16:22 +00:00
王怡栋
ec856c73bc Merge branch 'devops21_liyuchun_48612' into 'devops21'
* Finish task #48612.

See merge request easycorp/zentaopms!1756
2022-02-11 01:13:51 +00:00
liyuchun
e556307ba4 * Finish task #48612. 2022-02-11 08:13:20 +08:00
zenggang
e2407022e3 * Adjust code 2022-02-10 09:30:41 +00:00
caoyanyi
f93ac616e2 * Modify onlybody param. 2022-02-10 08:31:54 +00:00
zenggang
03ba748afd * Adjust code 2022-02-10 02:38:00 +00:00
zenggang
5927cd62ad * Finish task#48603,48609,48610 2022-02-10 02:20:02 +00:00
zenggang
1c667f6e63 * Finish task#48605 2022-02-08 07:44:24 +00:00
李玉春
11f82e3db8 Merge branch 'devops_caoyanyi_48607' into 'devops21'
* Finish task #48607.

See merge request easycorp/zentaopms!1723
2022-02-08 06:56:31 +00:00
caoyanyi
0043fe9a8f * Add param to url. 2022-02-08 06:22:20 +00:00
caoyanyi
aaf21f178d * Finish task #48607. 2022-02-08 01:32:33 +00:00
caoyanyi
eb93210a0a * Finish task #48606. 2022-02-07 09:09:42 +00:00
liyuchun
2b71ad28de * Finish task #48094. 2022-01-25 14:19:24 +08:00
caoyanyi
f82a59604b * Modify common function. 2022-01-17 06:53:53 +00:00
caoyanyi
20f291b9b2 * Fix bug #18448. 2022-01-14 06:52:35 +00: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
zenggang
f8ef544d94 * Adjust code and fix bugs 2022-01-14 01:54:48 +00:00
liyuchun
f8f71f59af * Finish task #47233. 2022-01-14 09:21:04 +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
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
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
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
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
李玉春
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
c5aaae3eb8 * Finish task #47233. 2022-01-12 14:16:34 +08: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
322dcddfab * Finish task#47226 2022-01-11 09:44:13 +00:00