Commit Graph
20919 Commits
Author SHA1 Message Date
holan20180123 4520e903fb * Fix bug #2852. 2021-05-06 16:29:16 +08:00
hufangzhou 78f08ca700 * Adjust the code. 2021-05-06 16:03:37 +08:00
hufangzhou b864f06de7 Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-05-06 15:52:21 +08:00
hufangzhou 36d42a882d * Fix bug #12491. 2021-05-06 15:52:16 +08:00
tianshujie98 9bd7e77547 Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-05-06 15:51:14 +08:00
tianshujie98 931b4e51bd * Fix bug #12520. 2021-05-06 15:50:50 +08:00
qiyu-xie 8a1ab47e0a * Finish task#37930. 2021-05-06 15:50:50 +08:00
holan20180123 791a25c554 * Finish task #37931. 2021-05-06 15:45:09 +08:00
wangyidong 5384ba4acf Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-05-06 15:35:47 +08:00
wangyidong e9fe38f8d4 * fix error. 2021-05-06 15:35:32 +08:00
holan20180123 ecc74b68a3 * Finish task #37931. 2021-05-06 15:24:27 +08:00
hufangzhou 09e79ede45 * Fix bug #12486. 2021-05-06 14:30:44 +08:00
hufangzhou 8a82c893a4 * Fix bug #12498. 2021-05-06 14:22:59 +08:00
hufangzhou e03fa8da3f * Finish task #37922. 2021-05-06 13:26:44 +08:00
wangyidong d95cbe7dcb * adjust for upgrade. 2021-05-06 13:02:01 +08:00
holan20180123 01b2b463db * Finish task #37931. 2021-05-06 10:26:17 +08:00
tianshujie98 55560f0f05 * Finish task #37924. 2021-05-06 10:01:45 +08:00
hufangzhou 36bbe8f06f Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-04-30 16:03:03 +08:00
hufangzhou 9eb8dd147d * Fix a bug. 2021-04-30 16:02:59 +08:00
wangyidong 5f8cecdfa9 * fix bug. 2021-04-30 16:01:28 +08:00
wangyidong 3785a39325 * adjust for zh-tw lang. 2021-04-30 14:14:43 +08:00
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 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 3d6e0158af * adjust for demo sql. 2021-04-29 17:16:39 +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
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
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
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