Commit Graph

556 Commits

Author SHA1 Message Date
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
李玉春
4270c776f1 Merge branch 'devops18_wangyidong_46552' into 'devops18'
Devops18 wangyidong 46552

See merge request easycorp/zentaopms!1173
2021-12-29 01:51:53 +00:00
王怡栋
2e7530441b * adjust for task #46552. 2021-12-29 09:49:43 +08: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
51d75e0802 * Fix bug #17841,17830. 2021-12-23 09:20:40 +08:00
zenggang
b921ba7679 * Fix bug#17751 2021-12-22 02:05:14 +00:00
zenggang
f66c50d9db * Fix bug#17751 2021-12-22 02:03:35 +00: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
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
3dc85ea330 * Delete tag file 2021-12-17 06:06:10 +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
liyuchun
4ecc85aa0e Merge branch 'devops16' 2021-12-13 12:12:37 +08:00
李玉春
de158ea32d Merge branch 'sprint/devops16_17301' into 'sprint/devops16'
* Fix bug#17301

See merge request easycorp/zentaopms!894
2021-12-13 03:27:31 +00: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
caoyanyi
35e55cc75e * Modify data type. 2021-12-10 07:33:24 +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
zenggang
203f41745f * Fix bug#17301 2021-12-10 06:44:35 +00:00
王怡栋
36be7f468c * code for task #17340. 2021-12-10 14:14:25 +08:00
王怡栋
bfcb3deb8e * code for task #45676. 2021-12-10 13:30:07 +08:00
caoyanyi
e10c798888 * Add test case for checkAccessLevel. 2021-12-10 02:51:00 +00:00
caoyanyi
435f972c8c * Add test case for apiDeleteBranchPriv. 2021-12-10 02:18:44 +00:00
caoyanyi
ddae5d5c76 * Add test case for apiGetSingleBranchPriv. 2021-12-10 02:07:03 +00: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
李玉春
5338fcd4db Merge branch 'sprint/devops16' into 'sprint/devops16_wangyidong_45438'
# Conflicts:
#   module/gitlab/js/managegroupmembers.js
2021-12-10 00:24:19 +00:00
王怡栋
73d308b0e2 * code for task #45436. 2021-12-09 17:58:18 +08:00
王怡栋
068eeee4e8 * code for task #45435. 2021-12-09 17:14:36 +08:00
caoyanyi
6bdd9038cf * Add error return. 2021-12-09 09:10:18 +00:00
caoyanyi
c6c8f8de15 * Modify icon. 2021-12-09 08:50:30 +00:00
王怡栋
43555ed066 * code for task #45436. 2021-12-09 16:31:51 +08:00
王怡栋
91faac255a * code for task #45438,45437. 2021-12-09 16:10:17 +08:00
zenggang
fe5571a0ed * Fix bug#17141 2021-12-09 07:46:07 +00: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
8cb4c2a94c * Add comment. 2021-12-09 07:14:02 +00:00
caoyanyi
c2513ccc92 * Adjust codes. 2021-12-09 07:12:35 +00:00
caoyanyi
60e6727f35 * Add mouseover title. 2021-12-09 06:48:32 +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