Commit Graph

186 Commits

Author SHA1 Message Date
zenggang
70d00fad9e * Code for task#50697,50685 2022-03-17 03:07:38 +00:00
zenggang
4464d75123 * Finish task#50685,50680,50672 2022-03-16 05:20:20 +00:00
liyuchun
ab5910454b * Fix bug #20743,#20209. 2022-03-15 08:40:33 +08:00
caoyanyi
c025aab757 * Modify auth check. 2022-03-07 10:11:29 +08:00
孙广明
df55b0af1b Merge branch '185' 2022-02-28 08:58:20 +08:00
caoyanyi
4a718ac2bc * Modify branch encode. 2022-02-24 10:17:55 +08:00
zhujinyong
b17c3c8206 * Move die to return print. 2022-02-22 08:42:32 +08:00
caoyanyi
d551fa882f * Modify form validate. 2022-02-11 01:59:00 +00:00
caoyanyi
b77129e525 * Modify host check. 2022-02-11 01:20:51 +00:00
caoyanyi
7be47b221e * Modify language. 2022-02-10 09:22:20 +00: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
caoyanyi
8b2dfe101b * Modify config data. 2022-02-09 05:26:27 +00:00
caoyanyi
29a08fae7d * Modify version compare. 2022-02-09 03:11:47 +00:00
liyuchun
845b7a6417 * Finish task #48617. 2022-02-09 10:21:05 +08:00
caoyanyi
cd560f74b3 * Finish task #48614. 2022-02-08 05:39:57 +00:00
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