Commit Graph
213 Commits
Author SHA1 Message Date
孙广明 5391d4a163 Merge branch 'liyuchun_fixbug_26301' into 'zenops_41'
* Fix bug #26301.

See merge request easycorp/zentaopms!4966
2022-08-15 07:02:26 +00:00
liyuchun 6ffac378bf * Fix bug #26301. 2022-08-15 09:33:00 +08:00
caoyanyi 6afa13390f * Add tips when gitlab has not pipelines. 2022-08-15 09:14:50 +08:00
caoyanyi af0c0d4eae * Modify job exec check. 2022-08-09 14:19:32 +08:00
caoyanyi 1ffa75a0af * Fix bug #25818. 2022-07-28 13:34:37 +08:00
caoyanyi abc3542cf3 * Modify repo list. 2022-07-28 13:01:32 +08:00
caoyanyi d9b1d038eb * Modify page style and some bug. 2022-07-28 11:31:24 +08:00
caoyanyi 87badf85e5 * Optimize pages. 2022-07-27 13:57:27 +08:00
caoyanyi 94a3dea3f7 * Optimize pages. 2022-07-22 13:35:54 +08:00
caoyanyi a146a7633a * Modify data display. 2022-07-20 16:49:01 +08:00
caoyanyi a637e8af2a * Modify url param. 2022-07-20 16:35:21 +08:00
caoyanyi e8951a847a Merge branch 'master' into zenops_38 2022-07-18 10:11:16 +08:00
liyuchun 9b26371429 * Fix bug #25247. 2022-07-15 00:59:08 +00:00
liyuchun 6102e2df6a * Modify gitlab to git service in repo module. 2022-07-14 00:53:13 +00:00
liyuchun 0951f5b56d * Fix bug #24840,24821. 2022-07-08 01:45:48 +00:00
liyuchun 0044a55b76 * Finish task #59439. 2022-07-05 05:48:02 +00:00
tianshujie 7372f7f936 * Finish story #32623. 2022-06-22 08:51:05 +08:00
caoyanyi 0486181ed7 * Add api for jobs and repos. 2022-06-15 15:51:37 +08:00
孙广明 b896377846 * Change zentao license. 2022-06-08 10:02:29 +08:00
孙广明 b528156589 * Change license. 2022-06-08 09:34:46 +08:00
liyuchun bc11d6a8a0 * Add unit test. 2022-05-07 01:22:13 +00:00
zenggang f81b53bc38 * Fix bug#2942,15431,21981 2022-04-27 07:23:08 +00:00
liyuchun 006dfea82e * Fix error. 2022-04-20 11:41:11 +08:00
liumengyi 74585f71d0 * Finish bug #19955. 2022-02-24 14:40:17 +08:00
zhujinyong 002e215a3d * Move die to return. 2022-02-22 09:02:00 +08:00
caoyanyi 03563c3887 * Modify page error. 2022-01-26 02:11:24 +00:00
liyuchun 555fbaddef Merge branch 'devops20' 2022-01-25 16:55:51 +08:00
caoyanyi 7ad4810e93 * Modify job edit. 2022-01-25 02:06:43 +00:00
李玉春 39e8a3fae7 Revert "Merge branch 'devops_caoyanyi' into 'master'"
This reverts merge request !1515
2022-01-20 05:42:05 +00:00
caoyanyi f87294adf7 * Modify page error. 2022-01-20 05:37:33 +00:00
caoyanyi 1f9d135210 * Modify tips label style. 2022-01-18 05:39:54 +00:00
caoyanyi f82a59604b * Modify common function. 2022-01-17 06:53:53 +00:00
李玉春 959560f680 Merge branch 'devops19' into 'devops_caoyanyi_bug'
# Conflicts:
#   module/job/control.php
2022-01-17 01:59:45 +00:00
caoyanyi 07ba811bc2 * Modify trash data tips. 2022-01-17 01:22:51 +00:00
caoyanyi 20f291b9b2 * Fix bug #18448. 2022-01-14 06:52:35 +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
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 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
caoyanyi 384a29b657 * Modify submit error when sonarqube project is empty. 2022-01-13 05:38:19 +00:00
caoyanyi d0b3979347 * Modify sonarqube frame for job create. 2022-01-13 01:58:15 +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 b9e46558c5 * Code for task#46005 2021-12-23 09:21:51 +00:00
liyuchun 4508fec3a3 * Adjust annotation. 2021-12-21 15:26:31 +08:00
liyuchun 4f896cf87e * Code for task #46001. 2021-12-20 15:35:31 +08:00