Commit Graph
25883 Commits
Author SHA1 Message Date
zenggang e7ac26998e * Finish task #40470 2021-07-22 16:48:02 +08:00
wangyidong 5a5436ffc5 Merge branch '15.2' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.2 2021-07-22 15:09:24 +08:00
wangyidong 07cac61f4c * adjust for substatus. 2021-07-22 15:08:57 +08:00
zenggang cf9275cbae * Finisth task #40426 2021-07-22 13:27:43 +08:00
wangyidong 546ed93e74 * finish task #40477. 2021-07-22 09:42:30 +08:00
wangyidong dd1331d853 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-07-21 17:42:02 +08:00
wangyidong 3384f53fa9 * fix bug. 2021-07-21 17:41:43 +08:00
zhujinyong eb5a96a23b Merge branch 'master' of http://gitlab.zcorp.cc/easycorp/zentaopms 2021-07-21 13:59:40 +08:00
dingguodong 9646584b16 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-07-21 13:58:16 +08:00
zhujinyong f157a35f20 * Add params of list. 2021-07-21 13:57:30 +08:00
dingguodong 443f016f25 * Finish task #40406 (change jenkins variables to general name). 2021-07-21 13:57:20 +08:00
tianshujie98 bbee699fe8 * Fix bug #13743. 2021-07-21 12:12:41 +08:00
zenggang 7781d1d5fd * Finish bug #13740 2021-07-21 11:44:13 +08:00
tianshujie98 7c0ee909ec * Fix bug #13744. 2021-07-21 11:38:10 +08:00
tianshujie98 fa763bc550 * Fix bug #13742. 2021-07-21 09:43:32 +08:00
wangyidong f0bb1eb52b * adjust for changelog. 2021-07-21 08:26:59 +08:00
zhujinyong 8f6bf9800e * Format fields of response data. 2021-07-21 06:44:41 +08:00
zenggang 51558901a5 * Finish task #40117 2021-07-20 18:30:19 +08:00
qiyu-xie 16e442433a * Fix bug#13685. 2021-07-20 17:30:18 +08:00
dingguodong 379e0ba43c Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms zentaopms_15.2_20210720 2021-07-20 16:49:05 +08:00
dingguodong cfd37eb46d * Revert jenkins related files. 2021-07-20 16:48:41 +08:00
wangyidong 26bef8c7de Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-07-20 16:48:34 +08:00
wangyidong eab9f17636 * adjust for english. 2021-07-20 16:48:14 +08:00
qiyu-xie 4171ee28b2 * Fix bug#13716. 2021-07-20 16:35:03 +08:00
holan20180123 499a4dbec0 Merge branch 'master' of http://gitlab.zcorp.cc/easycorp/zentaopms 2021-07-20 16:14:12 +08:00
holan20180123 1ae0fcda04 * Adjsut page style of install. 2021-07-20 16:13:54 +08:00
dingguodong 661dcdcc13 + Add engine column to zt_job. 2021-07-20 16:13:48 +08:00
dingguodong 7f491bea77 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-07-20 16:06:33 +08:00
dingguodong e5ea831b9d * Change jenkins variables to general name. 2021-07-20 16:05:43 +08:00
qiyu-xie 88d24e684b * Fix bug#13725. 2021-07-20 15:59:49 +08:00
hufangzhou 616f719120 * Adjust the product link in product dynamic page. 2021-07-20 15:11:06 +08:00
hufangzhou ea6c40b244 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-07-20 14:47:02 +08:00
hufangzhou c3d74652be * Fix bug #13713. 2021-07-20 14:46:56 +08:00
holan20180123 824f465f8e * Adjust update mode. 2021-07-20 14:44:10 +08:00
holan20180123 56d0edbf4b * Fix update mode. 2021-07-20 14:42:57 +08:00
wangyidong 68c2583a38 * change AUTHORIZATION to TOKEN. 2021-07-20 14:35:56 +08:00
qiyu-xie f6c4075c55 * Fix bug#13727. 2021-07-20 14:23:50 +08:00
wangyidong 6f8222ae97 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-07-20 14:18:19 +08:00
wangyidong c757f08599 * remove gitlab. 2021-07-20 14:18:06 +08:00
holan20180123 391ac55824 * Adjust executionCommon to projectCommon when upgrade. 2021-07-20 14:09:46 +08:00
wangyidong 49215a71e9 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-07-20 14:03:21 +08:00
wangyidong 6d897cf2d1 * fix bug for sessionID. 2021-07-20 14:03:06 +08:00
hufangzhou 7aacb6717a * Fix bug #13684. 2021-07-20 14:01:27 +08:00
wangyidong 2499c19069 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-07-20 11:48:11 +08:00
wangyidong e93daa531e Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-07-20 11:46:13 +08:00
holan20180123 d8a12f6f76 * Adjust project to execution when merage database. 2021-07-20 11:45:59 +08:00
wangyidong 8aa8534f73 * adjust for sql. 2021-07-20 11:45:53 +08:00
tianshujie98 b320376f87 * Historical projects are used as the start and end dates of the updated projects and programs when performing upgrades. 2021-07-20 11:43:31 +08:00
wangyidong d687dbb8f0 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-07-20 11:30:23 +08:00
wangyidong 5377eef475 * adjust for api. 2021-07-20 11:30:09 +08:00