Commit Graph
171 Commits
Author SHA1 Message Date
caoyanyi efbb0fa13e * Modify gitlab group access. 2022-01-26 00:46:20 +00:00
liyuchun 555fbaddef Merge branch 'devops20' 2022-01-25 16:55:51 +08:00
caoyanyi 42c0a2f115 * Modify root token check. 2022-01-25 08:23:28 +00:00
caoyanyi 642145cc16 * Modify die to return print. 2022-01-25 01:44:02 +00:00
caoyanyi 7eb79b6256 * Fix bug #18932. 2022-01-25 01:38:24 +00:00
caoyanyi da20e9dfa8 * Fix bug #18920,18919,18918. 2022-01-24 08:36:47 +00:00
李玉春 480e08f2d0 Merge branch 'devops_caoyanyi' into 'devops20'
Devops caoyanyi

See merge request easycorp/zentaopms!1566
2022-01-24 08:03:00 +00:00
caoyanyi 6e567482e2 * Modify group access. 2022-01-24 07:46:08 +00:00
liyuchun f0907d2f11 * Fix error. 2022-01-24 14:32:31 +08:00
李玉春 033763cceb Merge branch 'devops20_caoyanyi' into 'devops20'
Devops20 caoyanyi

See merge request easycorp/zentaopms!1563
2022-01-24 06:31:27 +00:00
caoyanyi 9f23e540d9 * Modify config data. 2022-01-24 06:26:54 +00:00
caoyanyi 49f393a684 * Remove unused param. 2022-01-24 06:23:17 +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 e673ccf33f * Finish task #48099,48097. 2022-01-24 05:53:16 +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
liyuchun 58a692337a * Check user access. 2022-01-24 10:59:21 +08:00
caoyanyi a0209a41da * Modify project access check. 2022-01-21 07:04:33 +00:00
李玉春 0f4d22a7a5 Merge branch 'devops_caoyanyi' into 'devops20'
* Finish task #48109.

See merge request easycorp/zentaopms!1534
2022-01-21 03:07:40 +00:00
liyuchun 13a49268e7 * Adjust check is bind user. 2022-01-21 11:06:58 +08:00
liyuchun bb7e0b9fc6 * Finish task #48095. 2022-01-21 09:52:27 +08:00
caoyanyi 220e149107 * Finish task #48109. 2022-01-20 07:40:33 +00:00
caoyanyi f87294adf7 * Modify page error. 2022-01-20 05:37:33 +00:00
zhujinyong ff9ceaccad * Check auth. 2022-01-05 09:05:32 +08:00
liyuchun adc4c9ad98 * Fix bug #18088. 2021-12-31 10:23:49 +08:00
liyuchun c26309ad13 * Fix bug #18087,18092. 2021-12-30 17:49:04 +08:00
liyuchun 930538179b * Fix eroor with special symbols. 2021-12-30 15:18:27 +08: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
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
zenggang 64646f028d * Adjust code 2021-12-20 09:48:58 +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 586fbf06fc * Adjust code 2021-12-20 07:30:21 +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
王怡栋 73d308b0e2 * code for task #45436. 2021-12-09 17:58:18 +08:00
王怡栋 43555ed066 * code for task #45436. 2021-12-09 16:31:51 +08:00
王怡栋 c09fcb0c15 Merge branch 'devops16_caoyanyi_45499' into sprint/devops16 2021-12-09 15:40:44 +08:00
caoyanyi ca73678ccd * Modify comment. 2021-12-09 07:15:45 +00:00
caoyanyi c2513ccc92 * Adjust codes. 2021-12-09 07:12:35 +00:00
caoyanyi f7e55495be * Optimize page style. 2021-12-09 06:04:33 +00:00
caoyanyi a8abcb6c9f * Add create and edit auth. 2021-12-09 02:14:37 +00:00
caoyanyi 8249473e63 * Finish task #45499. 2021-12-09 01:25:55 +00:00
zenggang 131a9ef165 * Code for task#45500 2021-12-08 02:39:08 +00:00
liyuchun d40736d387 * Finish task #45491. 2021-12-08 08:56:39 +08:00
李玉春 bb44039a30 Merge branch 'sprint/devops16' into 'sprint/devops16_45500'
# Conflicts:
#   module/gitlab/control.php
2021-12-07 08:54:25 +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