Commit Graph
20129 Commits
Author SHA1 Message Date
Yagami 810fce9f91 * Fix todo bug. 2021-04-01 13:42:23 +08:00
wangyidong ee9084699c Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-04-01 13:39:00 +08:00
wangyidong 15de086ca7 * fix bug #11630. 2021-04-01 13:38:46 +08:00
hufangzhou 187181eab1 Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-04-01 13:37:34 +08:00
hufangzhou bddbc3d7d1 * Finish task #37053. 2021-04-01 13:37:30 +08:00
leiyong 4075817079 * Fix bug#11528. 2021-04-01 08:32:26 +03:00
zhujinyong 8606de7f22 Merge branch '15.0.beta3' of http://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-04-01 13:29:38 +08:00
zhujinyong 8da3e5ed4a - Remove sidebar and header in doc module. 2021-04-01 13:29:11 +08:00
tianshujie98 3d705f840b Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-04-01 13:28:38 +08:00
holan20180123 5becfb3e31 Merge branch '15.0.beta3' of http://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-04-01 13:27:09 +08:00
leiyong 261e7ddbdc * Fix bug. 2021-04-01 08:26:55 +03:00
holan20180123 7739b36a32 * Finish task #37007. 2021-04-01 13:26:54 +08:00
tianshujie98 82062bbe8a * The classic version mode lists the execution list. 2021-04-01 13:26:13 +08:00
wangyidong fb9051a775 Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-04-01 13:25:18 +08:00
wangyidong 1bad944701 * merge from 12.x. 2021-04-01 13:25:05 +08:00
hufangzhou 5b1a279c3d * Finish task #37041. 2021-04-01 13:24:56 +08:00
wangyidong 935689e392 * fix bug #11629. 2021-04-01 13:23:40 +08:00
holan20180123 59ef112709 * Finish task #37013. 2021-04-01 13:22:03 +08:00
Yagami dad8fc8e7f * Fix upgrade details. 2021-04-01 13:20:24 +08:00
Yagami 88b7632ac0 * Fix bug. 2021-04-01 11:43:18 +08:00
holan20180123 e8e1b40d97 * Finish task #37008. 2021-04-01 11:40:01 +08:00
wangyidong 4e545c0a40 Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-04-01 11:35:41 +08:00
wangyidong 57f7d592ad * adjust for upgrade. 2021-04-01 11:35:23 +08:00
tianshujie98 ff3bb25320 * Sort products. 2021-04-01 11:32:55 +08:00
qiyu-xie eab73f9546 * Finish task#37039. 2021-04-01 11:30:54 +08:00
hufangzhou e3b6117235 Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-04-01 11:27:57 +08:00
hufangzhou 75a531c422 * Finish task #37051. 2021-04-01 11:27:53 +08:00
qiyu-xie b04ca379f2 * Finish task#37050. 2021-04-01 11:25:29 +08:00
holan20180123 840a91effd Merge branch '15.0.beta3' of http://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-04-01 11:14:00 +08:00
qiyu-xie 437b79eeea * Fix bug. 2021-04-01 11:13:56 +08:00
holan20180123 8f2b381f5a * Hide program setting in project list. 2021-04-01 11:13:32 +08:00
tianshujie98 227c8642de * Fix product custom whitelist upgrade issue. 2021-04-01 11:12:23 +08:00
holan20180123 b12efb31ef * Finish task #37004. 2021-04-01 11:07:11 +08:00
Yagami d026b0ba55 * Fix bug #11044. 2021-04-01 11:00:17 +08:00
holan20180123 c80f7b2197 * Fix bug #11051. 2021-04-01 10:57:29 +08:00
leiyong 4496315212 * Fix bug#11462. 2021-04-01 05:57:20 +03:00
qiyu-xie 74a1d60d91 * Finish task#37011. 2021-04-01 10:55:55 +08:00
tianshujie98 8daec0e8f5 * Finish task #37003. 2021-04-01 10:47:51 +08:00
wangyidong 066e0a58c6 Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-04-01 10:45:03 +08:00
wangyidong 14b00b3a58 * fix bug #11454. 2021-04-01 10:44:49 +08:00
hufangzhou 7378c1d3b0 Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-04-01 10:37:15 +08:00
hufangzhou 2e6c336522 * Fix a bug. 2021-04-01 10:37:12 +08:00
leiyong c9fb6d16c5 Merge branch '15.0.beta3' of http://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-04-01 05:36:35 +03:00
leiyong c723069c1b * Fix bug#11644. 2021-04-01 05:36:30 +03:00
holan20180123 f664192bbf * Fix bug #11729. 2021-04-01 10:35:44 +08:00
hufangzhou 70553ac61d Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-04-01 10:35:23 +08:00
hufangzhou 9d3c37f493 * Fix a bug. 2021-04-01 10:35:19 +08:00
holan20180123 7558efce21 Merge branch '15.0.beta3' of http://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-04-01 10:32:51 +08:00
holan20180123 dbbd31f861 * Finish task #37012. 2021-04-01 10:32:39 +08:00
wangyidong a1b0346114 * fix error. 2021-04-01 10:32:12 +08:00