Commit Graph

104 Commits

Author SHA1 Message Date
zenggang
70d00fad9e * Code for task#50697,50685 2022-03-17 03:07:38 +00:00
caoyanyi
ccc7f6389a * Fix bug #19436. 2022-02-11 06:36:38 +00:00
caoyanyi
cc693d6c68 * Fix bug #19418. 2022-02-11 02:00:17 +00:00
caoyanyi
ddb9cca1d5 * Modify language. 2022-02-11 01:38:22 +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
liyuchun
a8db9fe1cd * Finish task #48618. 2022-02-08 17:44:02 +08:00
caoyanyi
cd560f74b3 * Finish task #48614. 2022-02-08 05:39:57 +00:00
caoyanyi
a5f4950d37 * Finish task #48615. 2022-02-08 05:20:49 +00:00
caoyanyi
42c0a2f115 * Modify root token check. 2022-01-25 08:23:28 +00:00
caoyanyi
11a30ec207 * Finish task #48100,48102. 2022-01-24 05:40:40 +00:00
caoyanyi
a0209a41da * Modify project access check. 2022-01-21 07:04:33 +00:00
liyuchun
bb7e0b9fc6 * Finish task #48095. 2022-01-21 09:52:27 +08:00
liyuchun
1f4ee55810 * Finish task #46544,46556. 2021-12-30 14:05:57 +08: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
hufangzhou
4b2890c766 * Add the new version. 2021-12-24 15:01:04 +08:00
liyuchun
b94a067297 * Fix bug #17912. 2021-12-24 10:39:18 +08:00
liyuchun
b9a2d19393 * Finish task #46140. 2021-12-21 16:55:55 +08: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
4ecc85aa0e Merge branch 'devops16' 2021-12-13 12:12:37 +08:00
liyuchun
41b90898ee * Fix bug #17298. 2021-12-10 09:59:43 +08:00
liyuchun
0ab14d8df2 * Fix bug #17343, Finish task #45443. 2021-12-10 09:42:21 +08:00
王怡栋
c09fcb0c15 Merge branch 'devops16_caoyanyi_45499' into sprint/devops16 2021-12-09 15:40:44 +08: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
6117354514 * Finish task#45444 2021-12-08 07:52:52 +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
李玉春
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
zenggang
b4685be3de * Finish task#45500 2021-12-07 08:15:04 +00:00
hufangzhou
d876550d96 * Add the traditional Chinese language item. 2021-12-07 09:22:58 +08:00
孙广明
69304124b5 * Change for upgrade. 2021-12-06 10:58:52 +08:00
zenggang
7248447ed7 * Fix bug#16786,16981 2021-12-03 06:59:44 +00:00
zenggang
4b53f349df * Fix bug#16736,17037,16844 2021-12-03 01:59:04 +00:00
liyuchun
da73e10709 * Fix bug #16856. 2021-12-02 15:32:27 +08:00
liyuchun
2899947808 * Fix bug #16725. 2021-12-02 14:18:13 +08:00
liyuchun
696892f246 * Fix bug #16716. 2021-12-02 14:14:29 +08:00
liyuchun
6caf5097ec * Fix error of gitlab. 2021-12-02 13:54:06 +08:00
liyuchun
0e30ba0a3b * Fix bug #16836. 2021-12-02 13:19:50 +08:00
liyuchun
d11f6e9b6f * Fix bug #16901. 2021-12-01 16:29:36 +08:00
liyuchun
1eb3e7ec98 * Fix bug #16903. 2021-12-01 15:50:30 +08:00
liyuchun
b91bd45f85 * Fix bug #16903. 2021-12-01 13:46:48 +08:00
liyuchun
0a29344b53 * Fix bug #16898. 2021-12-01 10:54:13 +08:00