Commit Graph
24860 Commits
Author SHA1 Message Date
dingguodong 7f211e633e * Increase robustness. 2021-06-10 14:53:27 +08:00
Guanxiying cab06fced9 Merge branch 'jihu' of https://gitlab.zcorp.cc/easycorp/zentaopms into jihu 2021-06-10 14:09:12 +08:00
Guanxiying 1847e38c73 * Finish task 39216. 2021-06-10 14:08:06 +08:00
Guanxiying b995276fb1 * Fix gitlab repo path and client field. 2021-06-10 14:06:04 +08:00
Guanxiying f918d0c652 * Set gitlab info by gitlab server. 2021-06-10 13:59:44 +08:00
Guanxiying 3fd9aed0ce * Fix TABLE_PIPELINE table. 2021-06-10 13:48:44 +08:00
David.li 5ab9031369 Merge branch 'jihu' of https://gitlab.zcorp.cc/easycorp/zentaopms into jihu
# Conflicts:
#	module/gitlab/model.php
2021-06-10 11:11:53 +08:00
David.li 45412184bb * Add getUserBindList Function. 2021-06-09 23:03:15 +08:00
Guanxiying a10130df5c * Add getProjectsByID function. 2021-06-09 19:49:43 +08:00
Guanxiying f3f5574ad0 * Change pipeline table name. 2021-06-09 19:16:30 +08:00
Guanxiying b9584dc3c2 * Finish task 38937. 2021-06-08 16:53:22 +08:00
David.li e09060e7ca Merge branch 'jihu' of https://gitlab.zcorp.cc/easycorp/zentaopms into jihu
# Conflicts:
#	config/zentaopms.php
#	module/gitlab/model.php
2021-06-08 13:34:19 +08:00
David.li 42eb835fa3 * Add 2021-06-08 13:31:44 +08:00
Guanxiying f27fef0b00 * Call pipeline model in gitlab model. 2021-06-08 13:16:58 +08:00
Guanxiying 4492f5f23c * Rename jenkins table. 2021-06-08 13:04:03 +08:00
dingguodong e2157697e8 * Rename pipline to pipeline. 2021-06-08 12:13:16 +08:00
dingguodong 7ea2322002 * Rename PIPLINE to PIPELINE. 2021-06-08 11:45:32 +08:00
Guanxiying 08567f098a * Rename jenkins table.
+ Add pipline module.
2021-06-07 18:53:52 +08:00
Guanxiying c68d0be34d Merge branch 'jihu' of https://gitlab.zcorp.cc/easycorp/zentaopms into jihu 2021-06-07 16:43:47 +08:00
Guanxiying 8e00b74c72 * Add pipline module. 2021-06-07 16:43:21 +08:00
David.li 6be518e93b * gitlab for upgrade. 2021-06-07 16:36:46 +08:00
Guanxiying 3716f8568e * Add pipline table. 2021-06-07 15:53:43 +08:00
David.li f61d966f07 Add Gitlab module. 2021-06-07 12:03:42 +08:00
qiyu-xie 0ccc2c3f28 * Finish task#38926. 2021-06-04 18:03:28 +08:00
tianshujie98 3dbe2cde46 Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-06-04 17:30:43 +08:00
tianshujie98 80b876383c * Finish task #38920. 2021-06-04 17:30:09 +08:00
hufangzhou d83af0420d * Finish task #38898. 2021-06-04 17:28:48 +08:00
hufangzhou 7c1e69e3e0 * Finish task #38901, task #38899. 2021-06-04 17:25:07 +08:00
qiyu-xie 18ca3cbb99 * Finish task#38910. 2021-06-04 17:19:08 +08:00
tianshujie98 e4f221bf59 * Finish task #38917. 2021-06-04 16:41:38 +08:00
tianshujie98 ca9a6ba037 * Modify language items. 2021-06-04 16:21:19 +08:00
tianshujie98 d83d07dd68 Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-06-04 16:13:21 +08:00
tianshujie98 64ac581298 * Modify language items. 2021-06-04 16:12:59 +08:00
wangyidong e14b3a6b42 Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-06-04 16:07:13 +08:00
wangyidong 8d1ca6b022 * finish task #38890. 2021-06-04 15:59:01 +08:00
tianshujie98 3d91cef47c * Finish task #38919. 2021-06-04 15:47:43 +08:00
tianshujie98 954b1d5a35 Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-06-04 15:46:12 +08:00
tianshujie98 10d2d37ee6 * Finish task #38918. 2021-06-04 15:45:59 +08:00
wangyidong 1a11405e6b Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-06-04 15:36:42 +08:00
wangyidong e858eb9d98 * fix bug. 2021-06-04 15:36:26 +08:00
tianshujie98 635515190f * Finish task #38878. 2021-06-04 15:24:53 +08:00
tianshujie98 fd979e7e32 * Finish task #38888. 2021-06-04 15:20:59 +08:00
tianshujie98 849d43b4b2 * Fix action bug. 2021-06-04 15:06:02 +08:00
qiyu-xie dbb2d5f650 * Adjust code. 2021-06-04 14:41:08 +08:00
tianshujie98 266c354102 * Finish task #38877. 2021-06-04 14:26:49 +08:00
tianshujie98 0eef651b56 * finish task #38880. 2021-06-04 13:57:20 +08:00
tianshujie98 c587c18b46 * Finish task #38889. 2021-06-04 13:18:23 +08:00
tianshujie98 bebed24d04 * Finish task #38894. 2021-06-04 12:49:40 +08:00
wangyidong 9d1876b009 Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-06-04 12:11:22 +08:00
wangyidong f6594c7022 * adjust version and adjust test. 2021-06-04 12:10:48 +08:00