Commit Graph
30890 Commits
Author SHA1 Message Date
liyuchun d121e2e01a * Fix bug #17293. 2021-12-10 10:11:56 +08:00
王怡栋 4ca00009d5 Merge branch 'sprint/devops_liyuchun_45443' into 'sprint/devops16'
* Fix bug #17343, Finish task #45443.

See merge request easycorp/zentaopms!876
2021-12-10 01:48:01 +00:00
liyuchun 0ab14d8df2 * Fix bug #17343, Finish task #45443. 2021-12-10 09:42:21 +08:00
李玉春 8e4803745c Merge branch 'sprint/devops16_45445' into 'sprint/devops16'
* Adjust code

See merge request easycorp/zentaopms!867
2021-12-10 01:02:17 +00:00
liyuchun ddc651efbb * Code for task #45445. 2021-12-10 09:01:31 +08:00
liyuchun 802f13b4db Merge branch 'sprint/devops16_wangyidong_45438' into sprint/devops16 2021-12-10 08:26:37 +08:00
liyuchun 33e92f4e21 Merge branch 'sprint/devops16' of https://gitlab.zcorp.cc/easycorp/zentaopms into devops16 2021-12-10 08:26:02 +08:00
liyuchun 6b295805b9 * Finish task #45675. 2021-12-10 08:24:49 +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
王怡栋 760cfb42be Merge branch 'sprint/devops_liyuchun_45441' into 'sprint/devops16'
* Finish task #45439.

See merge request easycorp/zentaopms!852
2021-12-09 09:24:55 +00:00
王怡栋 068eeee4e8 * code for task #45435. 2021-12-09 17:14:36 +08:00
zenggang dcc9200457 * Adjust code 2021-12-09 09:01:02 +00:00
王怡栋 e3e5325efb * code for task #45436. 2021-12-09 16:49:46 +08:00
李玉春 730e5f6491 Merge branch 'sprint/devops16_17141' into 'sprint/devops16'
* Fix bug#17141

See merge request easycorp/zentaopms!861
2021-12-09 08:38:47 +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
李玉春 0ebff09658 Merge branch 'sprint/devops16_wangyidong_45504' into 'sprint/devops16'
Sprint/devops16 wangyidong 45504

See merge request easycorp/zentaopms!857
2021-12-09 07:56:27 +00:00
王怡栋 dc7416ebb4 * adjust code for mr. 2021-12-09 15:54:41 +08:00
zenggang fe5571a0ed * Fix bug#17141 2021-12-09 07:46:07 +00:00
王怡栋 c4dd3a4954 Merge branch 'sprint/devops16' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/devops16 2021-12-09 15:40:55 +08:00
王怡栋 c09fcb0c15 Merge branch 'devops16_caoyanyi_45499' into sprint/devops16 2021-12-09 15:40:44 +08:00
李玉春 40c3eb41e8 Merge branch 'sprint/devops16_unit' into 'sprint/devops16'
* Add pipeline data and apigetbranches model method

See merge request easycorp/zentaopms!858
2021-12-09 07:26:41 +00: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
zenggang 6985783f0a * Add pipeline data and apigetbranches model method 2021-12-09 06:57:48 +00:00
caoyanyi 60e6727f35 * Add mouseover title. 2021-12-09 06:48:32 +00:00
王怡栋 cb6dbdf1d1 * fix error for task #45504. 2021-12-09 14:42:14 +08:00
caoyanyi f7e55495be * Optimize page style. 2021-12-09 06:04:33 +00:00
王怡栋 973bb32da4 * fix error. 2021-12-09 13:30:48 +08:00
王怡栋 cc682f7953 * fix error. 2021-12-09 13:24:00 +08:00
王怡栋 beadf58834 * adjust for bug type for mr. 2021-12-09 13:04:26 +08:00
liyuchun 07ce01bda2 * Finish task #45439. 2021-12-09 12:28:32 +08:00
王怡栋 f1689b4dea * code for task #45504. 2021-12-09 11:24:14 +08:00
caoyanyi a8abcb6c9f * Add create and edit auth. 2021-12-09 02:14:37 +00:00
王怡栋 d03205740a Merge branch 'sprint/devops_liyuchun_45441' into 'sprint/devops16'
* Fix error and add unit testcase.

See merge request easycorp/zentaopms!831
2021-12-09 02:11:21 +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
liyuchun b13f4e6cfc * Finish task #45441. 2021-12-08 16:27:47 +08:00
李玉春 c2c208a86f Merge branch 'sprint/devops16_45444' into 'sprint/devops16'
* Finish task#45444

See merge request easycorp/zentaopms!833
2021-12-08 08:20:50 +00:00
李玉春 8271c13e86 Merge branch 'sprint/devops16_45445' into 'sprint/devops16'
* Finish task#45445

See merge request easycorp/zentaopms!830
2021-12-08 08:18:49 +00:00
zenggang 6117354514 * Finish task#45444 2021-12-08 07:52:52 +00:00
liyuchun 568b618199 * Fix error and add unit testcase. 2021-12-08 15:09:32 +08:00
zenggang 4061d19777 * Finish task#45445 2021-12-08 06:53:11 +00:00
李玉春 ad24ae81f2 Merge branch 'sprint/devops16_45440' into 'sprint/devops16'
* Finish task#45440

See merge request easycorp/zentaopms!827
2021-12-08 06:22:18 +00:00
zenggang d5d7e8a578 * Finish task#45440 2021-12-08 05:26:59 +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
王怡栋 d13ad41246 Merge branch 'sprint/devops_liyuchun_45442' into 'sprint/devops16'
* Finish task #45442.

See merge request easycorp/zentaopms!824
2021-12-08 05:08:19 +00:00
liyuchun c1db0bcb01 * Finish task #45442. 2021-12-08 13:04:29 +08:00