Commit Graph
24289 Commits
Author SHA1 Message Date
Yagami 4ffef413e9 * Fix bug assign logic. 2021-04-25 11:42:32 +08:00
tianshujie98 47cc78ea86 Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-04-25 09:53:00 +08:00
tianshujie98 b46e886060 * Adjust guest avatar. 2021-04-25 09:52:26 +08:00
holan20180123 9d5d20170f * Fix menu error. 2021-04-25 09:27:21 +08:00
hufangzhou 8a20dc3ccf * Fix bug #12322. 2021-04-25 09:25:15 +08:00
qiyu-xie 4c40da1ec7 * Modify the navigation of the edit program. 2021-04-25 08:24:25 +08:00
hufangzhou b2475a73f5 Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-04-23 16:15:50 +08:00
hufangzhou 6611af5bf3 * Fix a bug. 2021-04-23 16:15:46 +08:00
tianshujie98 bcf9ee5ede * Fix error of search builds in execution module. 2021-04-23 15:28:06 +08:00
Catouse f21e1f9334 * fix icon-qucheng with large font size. 2021-04-23 15:28:38 +08:00
hufangzhou 0d204ca328 Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-04-23 15:18:32 +08:00
hufangzhou 8f6f9fa0b7 * Fix a bug. 2021-04-23 15:18:27 +08:00
tianshujie98 29cc7eb9b0 * Fix select of build error. 2021-04-23 15:15:12 +08:00
hufangzhou 21e1e636f3 Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-04-23 15:09:48 +08:00
hufangzhou e86b0d2a7b * Fix an error. 2021-04-23 15:09:42 +08:00
tianshujie98 241d2245f0 * Fix an error. 2021-04-23 15:08:07 +08:00
hufangzhou 4d7bf73990 Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-04-23 14:49:20 +08:00
hufangzhou b90c9dd573 * Fix bugs. 2021-04-23 14:49:16 +08:00
tianshujie98 ce3f93e8d8 * Fix menu error. 2021-04-23 14:32:33 +08:00
tianshujie98 059b41fa32 * Fix execution menu. 2021-04-23 14:16:41 +08:00
Catouse be8a73b171 * fix link with data-app not work in tree content view. 2021-04-23 14:09:18 +08:00
tianshujie98 794f0f1b50 * Fix menu error. 2021-04-23 14:06:38 +08:00
tianshujie98 6f94a46546 * Fix menu error. 2021-04-23 13:58:54 +08:00
Catouse b276f0369f Revert "* update zui.js."
This reverts commit 60c2855bba.
2021-04-23 13:47:21 +08:00
Catouse 744703fff4 * update zui.js.
# Conflicts:
#	www/js/zui/min.js
2021-04-23 13:46:48 +08:00
tianshujie98 7fccbfde30 * Fix testcase of execution module error. 2021-04-23 13:34:42 +08:00
Guanxiying 0553379bf1 Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-04-23 11:23:12 +08:00
Guanxiying 1640e5a20d * Provider tester object. 2021-04-23 11:22:46 +08:00
tianshujie98 5c188665d7 * Fix menu error. 2021-04-23 10:45:52 +08:00
tianshujie98 1ca1e16a7b * Fix manage task module tree error. 2021-04-23 10:11:12 +08:00
Guanxiying 142e73552d Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-04-23 09:37:41 +08:00
Guanxiying 164c218209 + Add init tester file. 2021-04-23 09:37:20 +08:00
zhujinyong cf24126d5b * Wrap move_uploaded_file function. 2021-04-22 17:23:14 +08:00
wangyidong 75fe67cbdb Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-04-22 15:00:43 +08:00
wangyidong 58d01b093f * fix error. 2021-04-22 15:00:30 +08:00
tianshujie98 64406fe023 * Fix bug #12272. 2021-04-22 11:38:54 +08:00
qiyu-xie 89ec9cec9c * Fix bug#12065. 2021-04-22 11:36:12 +08:00
Guanxiying 4c329dfcef Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-04-22 10:40:40 +08:00
Guanxiying 5ec52b5ba4 * Fix Gitlab judgement. 2021-04-22 10:35:16 +08:00
holan20180123 f1954b3dab * Fix bug #12275. 2021-04-22 09:37:34 +08:00
holan20180123 ef47bc7e2c * Fix upgrade error. 2021-04-21 17:15:25 +08:00
qiyu-xie e638da0be7 * Fix bug#12087. 2021-04-21 15:20:03 +08:00
tianshujie98 076f572326 * Fix bug #12279. 2021-04-21 15:19:24 +08:00
wangyidong 9ce713bb46 Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-04-21 14:34:25 +08:00
wangyidong dd1550a434 * fix bug. 2021-04-21 14:34:08 +08:00
tianshujie98 5b9dc62ae5 Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-04-21 14:14:10 +08:00
tianshujie98 c2e986dfac * Fix bug #12121. 2021-04-21 14:13:49 +08:00
holan20180123 e692b32d55 * Fix bug #12234. 2021-04-21 14:10:21 +08:00
hufangzhou 4b455d512f Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-04-21 13:42:21 +08:00
hufangzhou 03b63387a2 * Adjust the code. 2021-04-21 13:42:17 +08:00