Commit Graph
24552 Commits
Author SHA1 Message Date
Yagami fbd2d87db8 * Verify branch name. 2021-06-16 16:01:57 +08:00
Yagami 93ba2dce18 * Fix an error. 2021-06-16 13:45:07 +08:00
Yagami 93430eae9f * Fix details. 2021-06-16 13:20:19 +08:00
wangyidong 3e626efb0b Merge branch '15.0' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0 2021-06-15 17:28:32 +08:00
wangyidong 17578d3a8c * fix bug. 2021-06-15 17:28:14 +08:00
Yagami 4c84e02be8 * Add new sql. 2021-06-15 14:01:38 +08:00
wangyidong 5e371ace2d * add new version and upgrade. zentaopms_15.0.2_20210612 2021-06-12 15:46:12 +08:00
wangyidong d13ef4c690 Merge branch '15.0' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0 2021-06-11 16:51:40 +08:00
wangyidong 4d5bacb823 * adjust for web page. 2021-06-11 16:51:28 +08:00
Yagami c8b77f1b0d * Fix bug #1552. 2021-06-08 15:49:10 +08:00
wangyidong 3f7fdecfc4 Merge branch '15.0' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0 2021-06-08 13:33:47 +08:00
wangyidong 3893084999 * adjust for mhtml. 2021-06-08 13:33:34 +08:00
holan20180123 64be23b2c5 * Fix bug #12627. 2021-06-07 16:06:09 +08:00
wangyidong 608b41e153 Merge branch '15.0' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0 2021-06-07 14:37:47 +08:00
wangyidong dd9214da2f * adjust for upgrade. 2021-06-07 14:37:32 +08:00
hufangzhou f67ee188dc * Fix bug #13004. 2021-06-07 14:26:03 +08:00
wangyidong aacf8c1e1b Merge branch '15.0' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0 2021-06-07 14:13:17 +08:00
wangyidong 08de61a26c * fix bug and merge from master. 2021-06-07 14:13:01 +08:00
holan20180123 0080c97b0f Merge branch '15.0' of http://gitlab.zcorp.cc/easycorp/zentaopms into 15.0 2021-06-07 13:28:11 +08:00
holan20180123 a055980108 * Add English language file for automation. 2021-06-07 13:27:51 +08:00
hufangzhou fedd2ddc87 Merge branch '15.0' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0 2021-06-07 12:26:32 +08:00
hufangzhou 0942d6a4f7 * Adjust the code. 2021-06-07 12:26:28 +08:00
wangyidong 8d75769726 Merge branch '15.0' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0 2021-06-07 11:31:32 +08:00
wangyidong 773356c97c * fix bug for xuanxuan get dept. 2021-06-07 11:30:10 +08:00
holan20180123 af0a85083b * Fix bug #12627. 2021-06-07 09:15:44 +08:00
holan20180123 206dea63bd * Add comments. 2021-06-07 08:56:57 +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