Commit Graph
24466 Commits
Author SHA1 Message Date
wangyidong c5fe348490 * adjust for upgrade. 2021-04-30 13:55:45 +08:00
wangyidong 3f75e066e3 * fix bug. 2021-04-30 13:17:43 +08:00
wangyidong 5b0230c7ce * adjust for demo sql. 2021-04-30 11:44:26 +08:00
wangyidong 970e666d4c Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-04-30 11:23:58 +08:00
wangyidong 8fbb5c1c89 * adjust for upgrade. 2021-04-30 11:23:46 +08:00
tianshujie98 443f322340 * Fix the navigation highlighting problem of the testtask. 2021-04-30 10:35:11 +08:00
tianshujie98 28af0816de * Fix the navigation highlighting problem of the testtask. 2021-04-30 10:13:43 +08:00
wangyidong fd2cea594a * adjust for create doc. 2021-04-30 09:26:50 +08:00
wangyidong 107dd03c42 * adjust for xuanxuan. 2021-04-30 08:50:22 +08:00
wangyidong 3d6e0158af * adjust for demo sql. 2021-04-29 17:16:39 +08:00
wangyidong c4184ed4bc Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-04-29 16:10:14 +08:00
wangyidong bc64f29551 * fix for xuanxuan. 2021-04-29 16:09:51 +08:00
wangyidong b8d1cc17d8 * adjust for demo. 2021-04-29 14:18:58 +08:00
tianshujie98 63a63135c6 * Fix bug #12368. 2021-04-29 14:13:38 +08:00
tianshujie98 b6da28f99c * Fix bug #12456. 2021-04-29 13:38:07 +08:00
wangyidong d80bc64add * adjust for upgrade. 2021-04-29 13:33:27 +08:00
wangyidong f8f39f8f95 * change for upgrade. 2021-04-29 13:05:34 +08:00
wangyidong 76c1de90af Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-04-29 12:11:05 +08:00
wangyidong 57e1291823 * fix bug #12452. 2021-04-29 12:10:34 +08:00
tianshujie98 58028b469b * Fix bug #12455. 2021-04-29 11:43:19 +08:00
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