Commit Graph

148 Commits

Author SHA1 Message Date
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
zenggang
b4685be3de * Finish task#45500 2021-12-07 08:15:04 +00:00
孙广明
1c86d07967 Merge branch 'sprint/devops_liyuchun_bug' into 'master'
Sprint/devops liyuchun bug

See merge request easycorp/zentaopms!738
2021-12-02 06:16:37 +00:00
liyuchun
b75c77b3e7 * Fix bug #17000. 2021-12-02 14:07:06 +08:00
liyuchun
61045c90e6 * Fix gitlab error. 2021-12-02 11:04:54 +08:00
liyuchun
e0b03a60a7 * Fix bug #16999. 2021-12-02 09:54:03 +08:00
zenggang
ce93ea9cf0 * Fix bug#16741 2021-12-01 01:05:20 +00:00
liyuchun
4a6faf94ee Merge branch 'sugon' of https://gitlab.zcorp.cc/easycorp/zentaopms into sugon 2021-11-30 16:11:27 +08:00
liyuchun
053f78ba97 * Fix bug #16893. 2021-11-30 16:11:08 +08:00
zenggang
5088748be4 * Fix bug#16861 2021-11-30 07:04:46 +00:00
liyuchun
6200b6dc58 * Fix bug #16719. 2021-11-29 16:57:21 +08:00
zenggang
9fee3403fe * Fix bug#16890,16888 2021-11-29 07:08:48 +00:00
zenggang
7a53ada4b3 * Fix bug#16734 2021-11-26 03:00:16 +00:00
zenggang
59605b34a6 * Finish task#44806 2021-11-25 07:52:32 +00:00
liyuchun
ef9ad2c0d7 * Finish task #44802. 2021-11-25 13:49:04 +08:00
zenggang
9a614a1827 * Finish task#44797 2021-11-24 09:25:20 +00:00
xiawenlong
d0e8e7c34f Merge branch 'sugon' of https://gitlab.zcorp.cc/easycorp/zentaopms into sugon 2021-11-19 09:34:16 +08:00
xiawenlong
1a5809ae20 * Revert gitlab model. 2021-11-19 09:33:51 +08:00
zenggang
95e04b9bf0 * Finish task#44397 2021-11-18 10:27:39 +00:00
xiawenlong
8fc6867523 * Add gitlab projects orderby 2021-11-18 17:07:09 +08:00
xiawenlong
4431f52f1e * Add gitlab browse title 2021-11-18 16:25:17 +08:00
xiawenlong
c7081db530 * Finish task 29162,29163 2021-11-18 15:31:26 +08:00
zenggang
86431ddb80 * Adjust code style 2021-11-16 05:34:41 +00:00
zenggang
4579fc81ad * Adjust code style 2021-11-16 02:43:08 +00:00