Commit Graph
885 Commits
Author SHA1 Message Date
holan20180123 f75815e4fb * Finish task #40305. 2021-07-16 16:58:36 +08:00
tianshujie98 9491fa4a5c * Ajust code. 2021-07-16 16:33:36 +08:00
tianshujie98 8409cb5b54 * Adjust style. 2021-07-16 16:08:16 +08:00
tianshujie98 3a2d22e188 * Ajust code. 2021-07-16 15:23:41 +08:00
tianshujie98 46688484f6 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-07-16 15:07:22 +08:00
tianshujie98 42217d6ae9 * Adjust code. 2021-07-16 15:07:06 +08:00
wangyidong 4fe3d248cd * fix bug #13699. 2021-07-16 15:00:36 +08:00
zenggang 3533722c49 * change video src task #40002 2021-07-16 14:35:43 +08:00
zenggang d8f8ae1e45 * English video task #40002 2021-07-16 14:31:28 +08:00
holan20180123 5d9942ff98 * Fix bug #13603. 2021-07-16 14:21:09 +08:00
tianshujie98 574ecd7bd3 * Fix the issue #173. 2021-07-16 14:12:08 +08:00
Guan Xiying 788620eeb1 * Skip process gitlab repo function. 2021-07-16 10:58:18 +08:00
Guan Xiying 7d86ce798a Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-07-16 08:57:11 +08:00
Guan Xiying be7bb7c331 * Add upgrade from 15.0.3 options. 2021-07-16 08:56:39 +08:00
tianshujie98 f8a107bd79 * Adjust code. 2021-07-15 17:27:25 +08:00
tianshujie98 347ca7c674 * Adjust code. 2021-07-15 17:02:03 +08:00
zenggang 03ac2e6820 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-07-15 16:34:49 +08:00
zenggang f448f4d37e * Finish task #40002 2021-07-15 16:33:59 +08:00
tianshujie98 6520a11545 * Adjust code. 2021-07-15 16:33:51 +08:00
tianshujie98 1f4d75765d * Adjust lang. 2021-07-15 16:03:56 +08:00
tianshujie98 ed6eddb82b * Adjust code. 2021-07-15 14:45:14 +08:00
tianshujie98 2759b55b41 * Adjust lang. 2021-07-15 14:39:58 +08:00
tianshujie98 8064db6050 * Fix bug #13663. 2021-07-15 13:14:00 +08:00
tianshujie98 d95833ed27 *Fix bug #13666. 2021-07-15 13:09:38 +08:00
tianshujie98 850d98c8a8 * Fix bug #13662. 2021-07-15 09:50:13 +08:00
tianshujie98 25b54558d0 * Adjust code. 2021-07-14 14:15:22 +08:00
tianshujie98 571be2ca67 * Adjust code. 2021-07-14 13:18:22 +08:00
tianshujie98 5ae0d22992 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-07-14 10:30:58 +08:00
tianshujie98 7e13c5544b * Adjust code style. 2021-07-14 10:30:19 +08:00
Guan Xiying 1c802f2a36 Merge branch 'jihu' 2021-07-14 09:48:58 +08:00
tianshujie98 e2f6101340 * Add start and end date judgment. 2021-07-13 14:00:34 +08:00
tianshujie98 1926cb7ad9 * Fix bug #13579. 2021-07-13 13:41:57 +08:00
tianshujie98 6977cf91ed * Add select all. 2021-07-13 13:38:14 +08:00
tianshujie98 309f6047ee * Fix logic problems. 2021-07-13 10:11:34 +08:00
tianshujie98 106ffc839e * Finish task #40011. 2021-07-12 16:34:59 +08:00
tianshujie98 bad9c9e042 * Finish task #40016,40017. 2021-07-12 14:52:46 +08:00
tianshujie98 55130c2ee9 * Finish task #40003. 2021-07-10 10:12:49 +08:00
tianshujie98 5e1e83721a * Add language item. 2021-07-10 00:40:33 +08:00
tianshujie98 4c3af55bbb * Add the language item of the project. 2021-07-08 14:31:03 +08:00
wangyidong fa4fa5941e Merge branch '15.0' 2021-07-06 19:28:30 +08:00
Guan Xiying a4f4cfd8a9 * Rename gitlabModel::createWebhook to initWebhooks. 2021-07-02 17:16:56 +08:00
wangyidong aedf5935d1 + add version and upgrade. 2021-06-24 13:17:04 +08:00
wangyidong 11b261b4ca * adjust for upgrade. 2021-06-24 11:24:32 +08:00
wangyidong 205129859f * finish task #38732. 2021-06-21 15:02:35 +08:00
wangyidong 5e371ace2d * add new version and upgrade. 2021-06-12 15:46:12 +08:00
wangyidong dd9214da2f * adjust for upgrade. 2021-06-07 14:37:32 +08:00
wangyidong 08de61a26c * fix bug and merge from master. 2021-06-07 14:13:01 +08:00
wangyidong 3fe8523aba * adjust for upgrade. 2021-06-06 18:33:33 +08:00
wangyidong 9a0512f334 * add zh-tw lang. 2021-06-06 09:46:11 +08:00
wangyidong ce35cfd368 * change version. 2021-06-06 09:29:56 +08:00