Commit Graph
216 Commits
Author SHA1 Message Date
liyuchun c1db0bcb01 * Finish task #45442. 2021-12-08 13:04:29 +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
王怡栋 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
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
zenggang 4b53f349df * Fix bug#16736,17037,16844 2021-12-03 01:59:04 +00:00
孙广明 32ec141d3d Merge branch 'sprint/devops_liyuchun_bug' into 'master'
* Adjust style.

See merge request easycorp/zentaopms!750
2021-12-03 01:04:19 +00:00
liyuchun 8e11431865 * Adjust style. 2021-12-02 15:46:53 +08:00
zenggang 0cf9288308 * Fix bug#17027,17024,16884 2021-12-02 06:26:33 +00:00
zenggang 0803759223 * Fix bug#16846 2021-12-02 03:06:27 +00:00
liyuchun f6301e4c9a Merge branch 'sugon' 2021-12-01 16:48:00 +08:00
liyuchun d11f6e9b6f * Fix bug #16901. 2021-12-01 16:29:36 +08:00
liyuchun aa118473b2 * Fix bug #16893. 2021-12-01 14:14:06 +08:00
liyuchun bdccb46405 * Fix bug #16918. 2021-12-01 13:57:33 +08:00
zenggang ce93ea9cf0 * Fix bug#16741 2021-12-01 01:05:20 +00:00
孙广明 c42cca1249 Merge branch 'sprint/168' 2021-11-30 14:38:32 +08:00
liyuchun 1e5db8c6db * Finish task #44798. 2021-11-29 13:30:33 +08:00
liyuchun ad5dfa073c * Fix bug #16845. 2021-11-29 08:39:32 +08:00
zenggang 6f43788b0c * Fix bug#16722 2021-11-26 05:16:35 +00:00
liyuchun 0479696334 * Finish task #44798. 2021-11-25 17:23:46 +08:00
zenggang 59605b34a6 * Finish task#44806 2021-11-25 07:52:32 +00:00
zenggang 1d8099d5ff Merge branch 'sugon' of https://gitlab.zcorp.cc/easycorp/zentaopms into sugon 2021-11-25 06:06:48 +00:00
zenggang 68862907dc * Finish task#44803 2021-11-25 06:02:52 +00:00
liyuchun ef9ad2c0d7 * Finish task #44802. 2021-11-25 13:49:04 +08:00
zenggang e0cf5d56f4 * Finish task#44804 2021-11-25 03:31:08 +00:00
zenggang 4b7d519ac5 * Finish task#44801 2021-11-25 02:30:53 +00:00
zenggang f2187d662b * Finish task#44805 2021-11-25 02:10:34 +00:00
liyuchun 00d1e992f6 * Fix bug #44799. 2021-11-25 09:47:07 +08: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 cfb84bb856 * Adjust code style 2021-11-16 02:40:25 +00:00
zenggang cf7ed682f0 * Finish task#43852 2021-11-15 05:31:10 +00:00
zenggang c55cee174d * Show gitlab project name with namespace 2021-11-12 02:55:33 +00:00
zenggang 430ded3626 * Finish task#43849,43851 2021-11-12 02:36:43 +00: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 7ee8e8dbef * Add gitlab user avatar 2021-11-08 06:25:03 +00:00