Commit Graph

181 Commits

Author SHA1 Message Date
liyuchun
15e03af077 * Fix bug #20833. 2022-03-16 13:36:28 +08:00
caoyanyi
8ad5a1236f * Modify hidden param. 2022-02-24 10:34:41 +08:00
caoyanyi
4a718ac2bc * Modify branch encode. 2022-02-24 10:17:55 +08:00
李玉春
ab5ddcf710 Merge branch 'devops_caoyanyi_gitlab' into 'devops21'
Devops caoyanyi gitlab

See merge request easycorp/zentaopms!1736
2022-02-09 07:07:20 +00:00
王怡栋
ea2d66f7de Merge branch 'devops21_liyuchun' into 'devops21'
Finish task #48616,#48617.

See merge request easycorp/zentaopms!1735
2022-02-09 05:04:48 +00:00
liyuchun
04edbef345 * Finish task #48616. 2022-02-09 10:31:02 +08:00
liyuchun
845b7a6417 * Finish task #48617. 2022-02-09 10:21:05 +08:00
liyuchun
23cb9b41ef * Finish task #48618. 2022-02-09 09:38:47 +08:00
liyuchun
a8db9fe1cd * Finish task #48618. 2022-02-08 17:44:02 +08:00
caoyanyi
372ca9b390 * Finish task #48619. 2022-02-08 05:21:35 +00:00
liyuchun
9ac6ee3697 * Adjsut style. 2022-02-07 10:38:38 +08:00
caoyanyi
0cebd0982e * Modify user bind style. 2022-01-26 02:05:33 +00:00
caoyanyi
efbb0fa13e * Modify gitlab group access. 2022-01-26 00:46:20 +00:00
孙广明
461940c671 Merge branch 'devops20_liyuchun' into 'devops20'
* Finish task #48096.

See merge request easycorp/zentaopms!1567
2022-01-24 09:23:16 +00:00
liyuchun
acbb957484 * Finish task #48096. 2022-01-24 15:54:27 +08:00
caoyanyi
6e567482e2 * Modify group access. 2022-01-24 07:46:08 +00:00
李玉春
ddc2cee664 Merge branch 'devops20_caoyanyi' into 'devops20'
Devops20 caoyanyi

See merge request easycorp/zentaopms!1560
2022-01-24 06:07:03 +00:00
caoyanyi
11a30ec207 * Finish task #48100,48102. 2022-01-24 05:40:40 +00:00
liyuchun
a567a2e6ea * Finish task #48098. 2022-01-24 13:37:46 +08:00
caoyanyi
a0209a41da * Modify project access check. 2022-01-21 07:04:33 +00:00
caoyanyi
220e149107 * Finish task #48109. 2022-01-20 07:40:33 +00:00
liyuchun
b9c90fcd25 * Adjust bind user. 2022-01-20 13:27:31 +08:00
liyuchun
c561a9b666 * Add sudo in gitlab api url. 2022-01-20 13:11:40 +08:00
caoyanyi
e2d8d506b3 * Fix bug #18370,18371,18372,18379. 2022-01-13 05:08:08 +00:00
liyuchun
5ef3cb51a8 * Fix bug #17952. 2022-01-05 13:45:14 +08:00
王怡栋
f1d22a9e0e Merge branch 'devops18_liyuchun' into 'devops18'
* Fix bug #18088.

See merge request easycorp/zentaopms!1224
2021-12-31 02:27:01 +00:00
liyuchun
adc4c9ad98 * Fix bug #18088. 2021-12-31 10:23:49 +08:00
李玉春
1c88e99c78 Merge branch 'devops18_18046' into 'devops18'
* Fix bug#18046 and adjust code

See merge request easycorp/zentaopms!1199
2021-12-30 07:31:37 +00:00
liyuchun
c35185b5bf * Adjust base64. 2021-12-30 15:23:29 +08:00
liyuchun
930538179b * Fix eroor with special symbols. 2021-12-30 15:18:27 +08:00
zenggang
fce6751316 * Fix bug#18046 and adjust code 2021-12-30 07:06:37 +00:00
liyuchun
adac3aefdf * Finish task #46544. 2021-12-30 14:19:28 +08:00
liyuchun
1f4ee55810 * Finish task #46544,46556. 2021-12-30 14:05:57 +08:00
zenggang
3bfc8e04c1 * Adjust code 2021-12-30 05:24:37 +00:00
zenggang
bfde525f13 * Finish task#46555 2021-12-30 03:08:42 +00:00
zenggang
7713ab8f29 * Finish task#46554 2021-12-28 07:00:36 +00:00
liyuchun
b94a067297 * Fix bug #17912. 2021-12-24 10:39:18 +08:00
liyuchun
51d75e0802 * Fix bug #17841,17830. 2021-12-23 09:20:40 +08:00
liyuchun
b9a2d19393 * Finish task #46140. 2021-12-21 16:55:55 +08:00
caoyanyi
dd807b4192 * Modify placeholder. 2021-12-21 06:11:10 +00:00
caoyanyi
76453ea1ba * Modify page style and back url. 2021-12-21 03:16:45 +00:00
李玉春
c623ca78ac Merge branch 'devops17' into 'devops17_46138'
# Conflicts:
#   module/gitlab/lang/en.php
#   module/gitlab/lang/zh-cn.php
#   module/group/lang/resource.php
2021-12-20 07:34:35 +00:00
zenggang
54b9265be1 * Finish task#46138 2021-12-17 05:58:48 +00:00
caoyanyi
d9a5f136b1 * Add gitlab tag create function and page. 2021-12-16 05:13:43 +00:00
liyuchun
acc03bdcfe * Fix bug #17439. 2021-12-13 14:40:43 +08:00
liyuchun
56d849cf0a * Fix bug #17439. 2021-12-13 14:28:19 +08:00
caoyanyi
447e1a3e07 * Fix bug #17426. 2021-12-13 02:17:56 +00:00
王怡栋
2d60441372 Merge branch 'sprint/devops16' into 'devops16_caoyanyi_45677'
# Conflicts:
#   module/gitlab/view/browseproject.html.php
2021-12-10 07:40:46 +00:00
李玉春
fec4ab4604 Merge branch 'sprint/devops16_wangyidong_test' into 'sprint/devops16'
Sprint/devops16 wangyidong test

See merge request easycorp/zentaopms!888
2021-12-10 07:06:16 +00:00
王怡栋
36be7f468c * code for task #17340. 2021-12-10 14:14:25 +08:00