Commit Graph
24266 Commits
Author SHA1 Message Date
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
tianshujie98 2f3fca3927 Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-04-21 11:00:59 +08:00
tianshujie98 23ebc8f532 * Fix bug #12125. 2021-04-21 11:00:42 +08:00
holan20180123 ae9fc5a1e8 * Fix bug #12228. 2021-04-21 10:56:54 +08:00
holan20180123 8f5359eba4 * Fix bug #12096. 2021-04-21 10:27:33 +08:00
Yagami b13b635102 * Fix error. 2021-04-21 09:36:09 +08:00
holan20180123 c342f47628 * Fix bug #12210. 2021-04-21 09:21:39 +08:00
holan20180123 ddbcdf63b4 * Fix bug #12233. 2021-04-21 09:09:28 +08:00
tianshujie98 ca41001014 * Fix bug #12260. 2021-04-21 09:05:50 +08:00
tianshujie98 df950305f3 * Fix error. 2021-04-20 17:20:36 +08:00
tianshujie98 0c351122cd * Fix error. 2021-04-20 16:53:09 +08:00
holan20180123 3c96c44935 * Fix bug #11915. 2021-04-20 16:06:43 +08:00
tianshujie98 c399696227 * Fix bug #12238. 2021-04-20 15:55:33 +08:00
hufangzhou 3d7ed816fb Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-04-20 15:31:16 +08:00
hufangzhou 175264712b * Adjust the language file. 2021-04-20 15:31:12 +08:00
tianshujie98 c844419a66 * Adjust style. 2021-04-20 15:00:33 +08:00
tianshujie98 01a2b73704 * Fix the link to the document library on the execution view. 2021-04-20 14:45:39 +08:00
hufangzhou ce88bfedf0 Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-04-20 14:41:18 +08:00
hufangzhou 29f6b0f2df * Fix bug #12255. 2021-04-20 14:41:14 +08:00
Yagami 9a2d565cce * Fix detail. 2021-04-20 14:35:57 +08:00
tianshujie98 bb605c56f5 * Fix the report back link problem. 2021-04-20 14:28:33 +08:00
tianshujie98 6b7e386366 * Fix the project history note issue. 2021-04-20 14:02:13 +08:00
qiyu-xie d69021b8df * Fix bug. 2021-04-20 13:55:17 +08:00
tianshujie98 29c5cfe989 * Fix the language item error. zentaopms_15.0.rc3_20210420 2021-04-20 13:39:29 +08:00