Commit Graph
24527 Commits
Author SHA1 Message Date
wangyidong 773356c97c * fix bug for xuanxuan get dept. 2021-06-07 11:30:10 +08:00
wangyidong 9a0512f334 * add zh-tw lang. 2021-06-06 09:46:11 +08:00
wangyidong b6676572f0 * merge from 15.0.beta3. 2021-06-06 09:05:34 +08:00
wangyidong 968c88329a * fix bug. 2021-06-05 15:40:09 +08:00
wangyidong a07123b8cb * adjust for upgrade. 2021-06-05 15:22:26 +08:00
wangyidong 769e6b433b * merge from 15.0.beta3. 2021-06-05 13:01:53 +08:00
qiyu-xie 7ff5ccae12 * Fix bug. 2021-05-11 13:59:33 +08:00
tianshujie98 12eeaa107a * Fix bug #12585. 2021-05-11 13:36:17 +08:00
qiyu-xie 504f44715b * Modify the button to edit project. 2021-05-11 13:03:50 +08:00
holan20180123 5174ede18e * Fix bug #10841. 2021-05-11 10:43:56 +08:00
wangyidong b712c10fbd Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-05-10 16:04:14 +08:00
wangyidong cb2fb0ccdc * set default value for systemMode. 2021-05-10 16:03:50 +08:00
qiyu-xie 6bff4cc5e7 * Fix bug#12524. 2021-05-10 15:56:20 +08:00
tianshujie98 3ddf64e750 * Fix bug #12570. 2021-05-10 15:02:31 +08:00
tianshujie98 184c5eb3a0 Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-05-10 14:56:01 +08:00
tianshujie98 0f93148727 * Fix bug #12568. 2021-05-10 14:55:31 +08:00
qiyu-xie 183cea7e84 * Fix bug#12516. 2021-05-10 14:49:22 +08:00
wangyidong bfe532113f Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-05-10 14:38:21 +08:00
wangyidong 3ed2493a59 * adjust for php5.3 2021-05-10 14:38:01 +08:00
qiyu-xie d66c726032 * Fix bug#12497. 2021-05-10 13:59:29 +08:00
qiyu-xie 4ef83185fe * Fix bug#12525. 2021-05-10 13:59:29 +08:00
hufangzhou a81bdc4c73 Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-05-10 13:28:19 +08:00
hufangzhou 5c0c62f669 * Fix bug #12500. 2021-05-10 13:28:14 +08:00
tianshujie98 e26e1a5a15 * Reduction. 2021-05-10 13:07:58 +08:00
tianshujie98 875ed7fb9b * Fix an error. 2021-05-10 11:29:48 +08:00
wangyidong 1f24c935c2 Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-05-10 11:15:51 +08:00
wangyidong 8e003ff449 * fix error. 2021-05-10 11:15:31 +08:00
tianshujie98 c24a099448 * Fix bug #12530. 2021-05-10 09:58:53 +08:00
tianshujie98 3d73a666e1 * Fix bug #12557. 2021-05-10 09:41:23 +08:00
tianshujie98 97deea5233 * Fix bug #12546. 2021-05-10 09:26:21 +08:00
hufangzhou 93d80f1321 * Adjust the code. 2021-05-07 16:11:14 +08:00
hufangzhou c3ba333323 Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-05-07 13:22:26 +08:00
hufangzhou 12c783069d * Fix bug #12482. 2021-05-07 13:22:21 +08:00
tianshujie98 aed1a2f6a5 * Fix the dynamic problem of make-up class. 2021-05-07 10:38:02 +08:00
tianshujie98 b8cea83e10 Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-05-07 09:27:53 +08:00
tianshujie98 da7ac30dbd * Modifying Language Items. 2021-05-07 09:27:26 +08:00
wangyidong 910521d3d0 Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-05-07 09:20:19 +08:00
wangyidong 56cb93207b * adjust for demo sql. zentaopms_15.0.stable_20210430 2021-05-07 09:19:34 +08:00
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