Commit Graph
24446 Commits
Author SHA1 Message Date
wangyidong 180405a9d1 Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-04-29 11:31:28 +08:00
wangyidong fb21c70896 * adjust for xuanxuan upgrade. 2021-04-29 11:31:12 +08:00
hufangzhou 9fa83d4269 Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-04-29 11:30:23 +08:00
hufangzhou 485e2c4d46 * Fix bug #12451. 2021-04-29 11:30:19 +08:00
tianshujie98 290fccfef0 * Fix bug #12453. 2021-04-29 11:04:22 +08:00
wangyidong 64501298c8 Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-04-29 10:56:13 +08:00
wangyidong 4bb52f334f * code for xuanxuan. 2021-04-29 10:55:42 +08:00
tianshujie98 44385524fa * Fix bug #12452. 2021-04-29 10:50:26 +08:00
hufangzhou f82c488dff Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-04-29 10:27:52 +08:00
hufangzhou 19395757fe * Fix bug #12451. 2021-04-29 10:27:47 +08:00
tianshujie98 cf1ca1ad6d * Fix bug #12246. 2021-04-29 10:23:39 +08:00
tianshujie98 95ff14e30f * Fix bug #12450. 2021-04-29 09:55:03 +08:00
tianshujie98 bfc78b6f43 * Fix bug #12445. 2021-04-29 09:39:40 +08:00
tianshujie98 aacdace383 * Fix bug #12446. 2021-04-29 09:02:26 +08:00
tianshujie98 d285dd2aea * Fix bug #12444. 2021-04-29 09:00:40 +08:00
tianshujie98 b0ee3e7ada * Adjust code. 2021-04-29 08:26:38 +08:00
tianshujie98 6530f01c2f * Fix bug #12415. 2021-04-28 17:26:40 +08:00
Yagami c4409fce08 * Fix upgrade logic. 2021-04-28 17:22:30 +08:00
wangyidong 2f0c62524c Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-04-28 16:28:28 +08:00
wangyidong faf4c2b4dd * fix bug and xuanxuan. 2021-04-28 16:27:34 +08:00
tianshujie98 5beeb1c894 Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-04-28 16:01:23 +08:00
tianshujie98 d6ff645901 * Fix bug #12440. 2021-04-28 16:01:01 +08:00
hufangzhou 29e9ed0f51 Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-04-28 15:59:32 +08:00
hufangzhou 1ba92805c1 * Fix bug #12439. 2021-04-28 15:59:29 +08:00
tianshujie98 e70e2a7a22 Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-04-28 15:52:44 +08:00
Guanxiying b9c059ce40 Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-04-28 15:52:29 +08:00
tianshujie98 77ac56be5b * Fix bug #12437. 2021-04-28 15:52:21 +08:00
Guanxiying 616341779a * Fix get projects error. 2021-04-28 15:52:14 +08:00
tianshujie98 9edbd23c41 * Fix bug #12440. 2021-04-28 15:19:26 +08:00
hufangzhou 53b42e6eb2 Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-04-28 15:07:17 +08:00
hufangzhou bc71469cd1 * Adjust the product getSwitcher link under the testtask module. 2021-04-28 15:07:12 +08:00
tianshujie98 08da42d6f4 Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-04-28 14:54:46 +08:00
tianshujie98 2ec29e2c70 * Fix bug #12031. 2021-04-28 14:54:22 +08:00
hufangzhou bbf9941348 * Adjust the code. 2021-04-28 14:29:53 +08:00
hufangzhou a937d44c8b Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-04-28 14:27:46 +08:00
hufangzhou 88e140be8f * Update the user view when create project. 2021-04-28 14:27:41 +08:00
wangyidong 75ddc26f82 * adjust for demo sql. 2021-04-28 13:44:22 +08:00
zhujinyong 375b47bf83 * wrap get file size. 2021-04-28 13:12:56 +08:00
Yagami 2e03100a96 * Fix bug. 2021-04-28 13:12:21 +08:00
Guanxiying 67a4154017 Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-04-28 11:41:46 +08:00
Guanxiying 962685950e * Add field param to comments of getById function. 2021-04-28 11:41:02 +08:00
Guanxiying 3ec725bfa6 * Fix spelling mistakes. 2021-04-28 11:39:46 +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