Commit Graph
679 Commits
Author SHA1 Message Date
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
caoyanyi 8249473e63 * Finish task #45499. 2021-12-09 01:25:55 +00:00
caoyanyi 32b81b45fa * Modify icon. 2021-12-08 08:51:44 +00:00
zenggang 6117354514 * Finish task#45444 2021-12-08 07:52:52 +00:00
李玉春 ed5a494bf8 Merge branch 'sprint/devops16_4550' into 'sprint/devops16'
* Code for task#45500

See merge request easycorp/zentaopms!820
2021-12-08 05:11:57 +00:00
liyuchun c1db0bcb01 * Finish task #45442. 2021-12-08 13:04:29 +08:00
孙广明 13f162edd2 * Merge 169 untrack file to master. 2021-12-08 11:07:06 +08: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
李玉春 7ad1c3e550 Merge branch 'sprint/devops16_task45434' into 'sprint/devops16'
* Finish task#45434

See merge request easycorp/zentaopms!814
2021-12-08 00:30:23 +00:00
zenggang 5e006ac204 * Finish task#45434 2021-12-07 09:40:28 +00:00
zenggang 4b83b4bee6 * Adjust code 2021-12-07 09:13:17 +00:00
zenggang e79f4b28ea * Adjust code 2021-12-07 09:08:56 +00:00
zenggang 58320d3756 Merge branch 'sprint/devops16_45500' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/devops16_45500 2021-12-07 09:05:28 +00:00
zenggang 1246c4f15d * Adjust code 2021-12-07 09:04:49 +00: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 2b50a60ddc * Adjust code style 2021-12-03 09:36:33 +00:00
zenggang 303ecdf5c8 * Adjust code stye 2021-12-03 07:40:08 +00:00
zenggang 7248447ed7 * Fix bug#16786,16981 2021-12-03 06:59:44 +00:00
李玉春 0f2ea93509 Merge branch 'devops_16884' into 'master'
* Fix bug#16884,16856

See merge request easycorp/zentaopms!758
2021-12-03 05:22:07 +00:00
zenggang 4b53f349df * Fix bug#16736,17037,16844 2021-12-03 01:59:04 +00:00