Commit Graph
133 Commits
Author SHA1 Message Date
王怡栋 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
zenggang cf7ed682f0 * Finish task#43852 2021-11-15 05:31:10 +00:00
dingguodong b865527512 * Optimize codes that add a same webhook only once and others. 2021-11-12 18:14:10 +08:00
zenggang 430ded3626 * Finish task#43849,43851 2021-11-12 02:36:43 +00:00
xiawenlong c004b06e1e finish webhook. 2021-11-12 09:48:11 +08:00
zenggang 763a7e0175 * Finish task#43848,43850,add gitlab project namespace 2021-11-10 09:31:47 +00:00
zenggang 20f94c4e7c * Finish task#43847,43860 2021-11-09 09:18:04 +00:00
zenggang 65d9c524bb * Finish task#43846 2021-11-08 09:38:15 +00:00
zenggang 06c235fe9a * Finish task#43845 2021-11-06 08:58:11 +00:00
zenggang 02aa340f18 * Code for task#43845 2021-11-06 07:50:54 +00:00
zenggang 7945a8c8cb * Finish task#43841,43842,43843 2021-11-05 05:13:36 +00:00
dingguodong 074d13aa20 * Correct malformed codes and create sugon branch. 2021-11-03 08:53:18 +08:00
王怡栋 46f2aecae3 Merge branch 'sprint/167' 2021-11-01 15:27:58 +08:00
mayue d506cba4a5 *Fix bug #15506. 2021-10-18 17:17:13 +08:00
mayue 1bfd0b0b62 * Fix bug #15506. 2021-10-18 16:55:50 +08:00
dingguodong c0764bb1e9 * Add GitLab and ZenTao user binding status. 2021-10-11 16:21:11 +08:00