Commit Graph
25868 Commits
Author SHA1 Message Date
zhujinyong f157a35f20 * Add params of list. 2021-07-21 13:57:30 +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
wangyidong c47b37d8d7 * fix bug. 2021-07-20 11:28:10 +08:00
qiyu-xie 19b3b75b2e * Restore code and fix a bug of unlink project`s product when edit the product has not change program. 2021-07-20 11:27:07 +08:00
tianshujie98 566c87f940 * Fix the issue of select all product lines. 2021-07-20 11:09:34 +08:00
qiyu-xie d8a7c921ba * Fix a bug of unlink project`s product when edit the product has not change program. 2021-07-20 10:51:03 +08:00
tianshujie98 2a80e33c1f * Fix the issue of select all projects. 2021-07-20 10:43:47 +08:00
tianshujie98 566a2091c1 * Fix the select all issue. 2021-07-20 10:25:40 +08:00
qiyu-xie 23858061c9 * Fix bug#13686. 2021-07-20 10:17:07 +08:00
holan20180123 ea798466aa * Delete a blank line. 2021-07-20 10:11:56 +08:00
tianshujie98 027408f64d Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-07-20 10:04:24 +08:00
tianshujie98 f7284ad5de * Fix comment. 2021-07-20 10:04:09 +08:00
wangyidong 4a5a4956f1 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-07-20 09:59:33 +08:00
wangyidong 54ff43eb6f * add changelog and zh-tw lang. 2021-07-20 09:58:58 +08:00
tianshujie98 cc3574c20a * Adjust code. 2021-07-20 09:58:55 +08:00
tianshujie98 66ef18e845 * Adjust code. 2021-07-20 09:49:31 +08:00
zhujinyong b5864c2e60 Merge branch 'master' of http://gitlab.zcorp.cc/easycorp/zentaopms 2021-07-20 09:37:16 +08:00