Commit Graph
24406 Commits
Author SHA1 Message Date
wangyidong faf4c2b4dd * fix bug and xuanxuan. 2021-04-28 16:27:34 +08:00
wangyidong 75ddc26f82 * adjust for demo sql. 2021-04-28 13:44:22 +08:00
wangyidong b9dc226197 Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-04-28 11:10:11 +08:00
wangyidong c201e15bb4 * fix bug. 2021-04-28 11:09:03 +08:00
hufangzhou 1eeeef6cf6 Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-04-28 11:00:32 +08:00
hufangzhou 09acfbbc53 * Modify the project doc lib acl when the project acl is program. 2021-04-28 11:00:28 +08:00
wangyidong 3cf8005a7d Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-04-28 10:54:24 +08:00
wangyidong 3b8dd3db34 * fix bug #12050. 2021-04-28 10:53:52 +08:00
Guanxiying a43d99ff02 Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-04-28 09:57:13 +08:00
Guanxiying 96d2f5a07d * Fix comments of public funtions. 2021-04-28 09:56:44 +08:00
tianshujie98 92da7aa0dd * Fix the issue of the module that created the bug. 2021-04-28 09:46:55 +08:00
qiyu-xie f29b1e949a * Fix bug#11391. 2021-04-28 09:36:38 +08:00
wangyidong a2f78623de Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-04-28 09:19:10 +08:00
wangyidong 33bc4ee8b3 * adjust for load lang. 2021-04-28 09:18:59 +08:00
wangyidong 1e744baa53 * adjust for bug #11171. 2021-04-28 09:17:53 +08:00
tianshujie98 9cd7618fbc * Remove useless code. 2021-04-28 08:29:25 +08:00
Guanxiying 3264f6146f * Fix comments of getById function. 2021-04-27 19:17:15 +08:00
Guanxiying 4f963166b8 Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-04-27 19:15:16 +08:00
Guanxiying 7c07fb49ba * Add zendata path. 2021-04-27 19:14:54 +08:00
Guanxiying 56639160c4 * Add getbyid file. 2021-04-27 19:12:54 +08:00
Guanxiying f154f10c9e * Add chdir and fix run and expect funtion. 2021-04-27 19:05:12 +08:00
tianshujie98 12b33378f2 * Fix bug #12386. 2021-04-27 17:21:28 +08:00
hufangzhou 43d74042f0 Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-04-27 16:57:35 +08:00
hufangzhou 1c1b100a69 * Adjust the project doclib acl when merge data. 2021-04-27 16:57:31 +08:00
zhujinyong d3922df5a9 * Recovery file upload. 2021-04-27 16:56:44 +08:00
tianshujie98 df4a023a7d * Fix bug #12426. 2021-04-27 16:55:07 +08:00
hufangzhou acd04944e7 Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-04-27 16:17:56 +08:00
hufangzhou 7e89f43e86 * Fix bug #12226. 2021-04-27 16:17:49 +08:00
tianshujie98 7ed10733b3 * Fix bug #11210. 2021-04-27 15:06:52 +08:00
qiyu-xie 402e1cb492 * Fix bug#12397. 2021-04-27 15:04:11 +08:00
qiyu-xie 7874535fd5 * Fix bug#12380. 2021-04-27 14:35:16 +08:00
holan20180123 4cec21a516 * Fix bug #12333. 2021-04-27 14:28:21 +08:00
qiyu-xie 68ac249914 * Fix bug#12373. 2021-04-27 14:24:24 +08:00
hufangzhou 35b297388f Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-04-27 14:13:45 +08:00
hufangzhou 7f3145888c * Fix bug #12420. 2021-04-27 14:13:40 +08:00
tianshujie98 5b2dd0cfec * Fix bug #12404. 2021-04-27 13:16:13 +08:00
holan20180123 f83a4e4b41 * Fix bug #12368. 2021-04-27 11:37:39 +08:00
hufangzhou 83762f4350 Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-04-27 11:35:38 +08:00
hufangzhou 6c14bd8916 * Fix bug #12181. 2021-04-27 11:35:33 +08:00
tianshujie98 9d88236bfd * Fix bug #12400. 2021-04-27 11:13:05 +08:00
hufangzhou c8f2782c0e Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-04-27 11:12:36 +08:00
hufangzhou 29115a9882 * Fix bug #12413. 2021-04-27 11:12:33 +08:00
holan20180123 cd8799bd03 Merge branch '15.0.beta3' of http://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-04-27 10:55:07 +08:00
holan20180123 7535cfe35f * Fix bug #12406. 2021-04-27 10:54:34 +08:00
tianshujie98 65f9d1cb1c * Fix bug #12402. 2021-04-27 10:39:35 +08:00
tianshujie98 b97ab834bf * Fix bug #12411. 2021-04-27 10:23:49 +08:00
Catouse 532f087884 * improve UI of more apps menu. 2021-04-26 17:53:46 +08:00
wangyidong 2148ba9b7d Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-04-26 17:32:31 +08:00
wangyidong 23800eace1 * adjust for gitlab. 2021-04-26 17:32:10 +08:00
tianshujie98 a20f580a5d * Fix bug #12402. 2021-04-26 17:29:18 +08:00