Commit Graph
222 Commits
Author SHA1 Message Date
caoyanyi 53b52b7101 * Fix bug #22698. 2022-05-20 09:04:53 +08:00
zenggang ba542db897 * Finish task#54208 2022-05-18 02:25:43 +00:00
mayue 156ebf701f * Optimize code. 2022-05-13 06:22:39 +00:00
mayue 3581e32357 * Fix bug #22412. 2022-05-13 06:14:05 +00:00
wangyidong a7bc51b608 * code bug #18835. 2022-04-24 16:08:28 +08:00
liyuchun 2d3195b0e6 * Fix bug #20178. 2022-04-19 11:16:53 +08:00
caoyanyi 51fd81a02e * Fix bug #11026. 2022-04-11 13:03:28 +08:00
caoyanyi 020834ec7a * Fix bug #11026. 2022-04-07 16:50:28 +08:00
王怡栋 fe91dc8481 Merge branch 'pailei2' 2022-03-22 09:01:03 +08:00
sunjun c67dba8d47 fixbug #16662 2022-03-21 08:54:02 +08:00
zenggang 414ec1b308 * Finish task#50667,50675 2022-03-17 09:05:02 +00:00
caoyanyi 4c0d583520 * Fix bug #20626. 2022-03-16 14:15:34 +08:00
孙广明 57651b969a Merge branch 'devops24_liyuchun_50709' into 'devops24'
完成任务#50709

See merge request easycorp/zentaopms!2236
2022-03-14 08:44:38 +00:00
caoyanyi d1d63da7cb * Adjust code. 2022-03-14 16:35:03 +08:00
caoyanyi 5777e30c74 * Adjust code. 2022-03-14 16:34:12 +08:00
caoyanyi 6f718185db * Adjust code. 2022-03-14 16:32:56 +08:00
caoyanyi 0a2a96915b * Modify default value. 2022-03-14 15:59:27 +08:00
liyuchun 7d40bdf1d3 * Finish task #50709. 2022-03-14 15:53:33 +08:00
孙广明 df55b0af1b Merge branch '185' 2022-02-28 08:58:20 +08:00
李玉春 705799c039 Merge branch 'master' into 'devops_bug'
# Conflicts:
#   module/repo/control.php
2022-02-24 00:39:43 +00:00
zenggang 82b8f0afe1 * Fix bug#19866 2022-02-23 09:17:01 +00:00
caoyanyi a8a8c65e63 * Modify code error. 2022-02-23 17:12:48 +08:00
liyuchun 6be9750881 * Delete duplicate codes. 2022-02-23 15:52:03 +08:00
李玉春 2690900408 Merge branch 'devops22_zenggang' into 'master'
修复bug 19866,优化合并请求列表页面加载速度

See merge request easycorp/zentaopms!1915
2022-02-23 07:51:04 +00:00
zenggang 574b5400d1 * Fix bug#19866 2022-02-23 07:14:06 +00:00
caoyanyi 61b82356ae * Modify post param. 2022-02-23 13:09:40 +08:00
孙广明 6d0529f2ad Merge branch 'devops22_liyuchun' into 'master'
* Fix bug #19866.

See merge request easycorp/zentaopms!1902
2022-02-23 02:49:57 +00:00
liyuchun 0e4d44edf7 * Fix bug #19866. 2022-02-23 09:57:23 +08:00
liyuchun 89c52df9b7 * Fix bug #19869,19876. 2022-02-22 17:21:35 +08:00
孙广明 928e2aa3ed Merge branch 'devops22_liyuchun' into 'master'
* Fix bug #19853.

See merge request easycorp/zentaopms!1885
2022-02-22 07:54:03 +00:00
liyuchun 0947d84471 * Fix bug #19853. 2022-02-22 15:49:56 +08:00
zhujinyong 408f8d4d91 * Move die to return. 2022-02-22 14:15:00 +08:00
caoyanyi e7ec73e841 * Modify diff version. 2022-02-22 10:57:01 +08:00
zenggang 1c503bcf58 * Finish task#49221 2022-02-21 08:33:58 +00:00
caoyanyi e4429fbadb * Modify api get group param. 2022-02-14 11:02:07 +08:00
liyuchun 3fee6f256d Merge branch 'devops20' of https://gitlab.zcorp.cc/easycorp/zentaopms into devops20 2022-01-25 14:23:15 +08:00
liyuchun 2b71ad28de * Finish task #48094. 2022-01-25 14:19:24 +08:00
zenggang 5183b24bd0 * Adjust code 2022-01-25 02:37:51 +00:00
zenggang 216be433d4 * Adjust code 2022-01-25 01:28:07 +00:00
zenggang 4ab46cb2ea *Finish task#48107,48106,48105,48103 and adjust code 2022-01-25 01:13:49 +00:00
zenggang c886988d62 * Fix bug#18327 2022-01-18 03:20:14 +00:00
liyuchun 176053fca2 * Fix error. 2022-01-12 15:26:20 +08: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
李玉春 08f5b605b6 Merge branch 'devops18_liwenrui_repo_rules' into 'devops18'
* tweak repos rules api, send raw rules only.

See merge request easycorp/zentaopms!1169
2021-12-29 00:57:57 +00:00
Wenrui LI 293c00235e * tweak repos rules api, send raw rules only. 2021-12-28 16:22:16 +08:00
zenggang 601e4498b0 * Finish task#46547 2021-12-28 08:10:12 +00:00
王怡栋 2eac7ba0d1 * adjust for get repo rules api. 2021-12-21 17:42:38 +08:00
王怡栋 b7ce8814fb Merge branch 'sprint/devops17_liyuchun' into 'devops17'
* Code for task #46001.

See merge request easycorp/zentaopms!1035
2021-12-21 07:27:35 +00:00
王怡栋 29852dd3ea * adjust for getRepoByUrl. 2021-12-20 16:46:16 +08:00