Commit Graph

464 Commits

Author SHA1 Message Date
liyuchun
92294da65b * Finish task #49226. 2022-02-21 15:27:51 +08: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
liyuchun
a0669db9be * Fix error when pre merge. 2022-01-11 15:55:32 +08:00
zenggang
fce6751316 * Fix bug#18046 and adjust code 2021-12-30 07:06:37 +00: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
hufangzhou
4b2890c766 * Add the new version. 2021-12-24 15:01:04 +08:00
liyuchun
178a45b6b5 Merge branch 'devops17' 2021-12-23 15:15:21 +08:00
王怡栋
9874145789 * fix error for get repo by url. 2021-12-23 14:55:19 +08: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
liyuchun
4508fec3a3 * Adjust annotation. 2021-12-21 15:26:31 +08:00
王怡栋
29852dd3ea * adjust for getRepoByUrl. 2021-12-20 16:46:16 +08:00
liyuchun
4f896cf87e * Code for task #46001. 2021-12-20 15:35:31 +08:00
王怡栋
e66ab3ccbd * adjust for API. 2021-12-20 15:04:53 +08:00
王怡栋
e18576efe7 * adjust for resource. 2021-12-20 14:24:47 +08:00
孙广明
84fae4bc7d Merge branch 'kanban' 2021-12-20 10:59:07 +08:00
王怡栋
b96a5b286d * adjust for task #46002. 2021-12-17 13:03:56 +08:00
王怡栋
1a66159617 * code for task #46002. 2021-12-17 08:47:23 +08:00
liyuchun
4ecc85aa0e Merge branch 'devops16' 2021-12-13 12:12:37 +08:00
李玉春
0ebff09658 Merge branch 'sprint/devops16_wangyidong_45504' into 'sprint/devops16'
Sprint/devops16 wangyidong 45504

See merge request easycorp/zentaopms!857
2021-12-09 07:56:27 +00:00
王怡栋
dc7416ebb4 * adjust code for mr. 2021-12-09 15:54:41 +08:00
孙广明
b7480bb257 Merge branch 'sprint/30_zhouxin_45792' into 'kanban'
Finish task #45792.

See merge request easycorp/zentaopms!844
2021-12-09 06:19:40 +00:00
zhujinyong
e0217a1569 * Fix bugs of repo api. 2021-12-09 13:39:37 +08:00
王怡栋
f1689b4dea * code for task #45504. 2021-12-09 11:24:14 +08:00
xieqiyu
47c2000914 * Fix bug#17193. 2021-12-09 10:34:47 +08:00
李玉春
30aa071426 Revert "Merge branch 'sprint/devops16_liyuchun_45491' into 'master'"
This reverts merge request !803
2021-12-09 10:34:47 +08:00
liyuchun
76748224eb * Finish task #45491. 2021-12-09 10:34:47 +08:00
zhouxin
e392b3f183 Finish task #45792. 2021-12-08 08:48:54 +00:00
liyuchun
b13f4e6cfc * Finish task #45441. 2021-12-08 16:27:47 +08:00
liyuchun
8b0da7b97c * Finish task #45491. 2021-12-08 09:53:08 +08:00
xieqiyu
b41aa8a4ef * Fix bug#17193. 2021-12-07 17:18:40 +08:00
李玉春
3f2793e5bd Revert "Merge branch 'sprint/devops16_liyuchun_45491' into 'master'"
This reverts merge request !803
2021-12-07 08:50:57 +00:00
王怡栋
cf280763b2 Merge branch 'sprint/devops16_liyuchun_45491' into 'master'
* Finish task #45491.

See merge request easycorp/zentaopms!803

(cherry picked from commit ff06288dc8)

b11dd3af  * Finish task #45491.
2021-12-07 08:49:16 +00:00
王怡栋
ff06288dc8 Merge branch 'sprint/devops16_liyuchun_45491' into 'master'
* Finish task #45491.

See merge request easycorp/zentaopms!803
2021-12-07 08:21:33 +00:00
liyuchun
b11dd3af4e * Finish task #45491. 2021-12-07 16:15:21 +08:00
hufangzhou
d876550d96 * Add the traditional Chinese language item. 2021-12-07 09:22:58 +08:00
王怡栋
2837dc322c * adjust for classic mode and fix bug. 2021-12-03 09:25:44 +08:00
liyuchun
0e30ba0a3b * Fix bug #16836. 2021-12-02 13:19:50 +08:00
孙广明
93547bf85b Merge branch 'sprint/devops_liyuchun_16893' into 'master'
Fix bug #16997, #16893.

See merge request easycorp/zentaopms!722
2021-12-02 02:39:31 +00:00