Commit Graph
23586 Commits
Author SHA1 Message Date
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
wangyidong 94045515a0 * fix bug #11064. 2021-04-01 10:26:52 +08:00
wangyidong a741a53553 Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-04-01 10:22:04 +08:00
wangyidong 2df46bb90d * fix bug #11145. 2021-04-01 10:21:36 +08:00
tianshujie98 859bf0986f * Fix bug #11317. 2021-04-01 09:28:29 +08:00
tianshujie98 98b0f084ad * Fix bug #11663. 2021-04-01 09:25:16 +08:00
Yagami 81e67145b6 * Fix bug #11388. 2021-04-01 09:23:07 +08:00
Yagami 64c1fe32e4 * Replace waterfall lang. 2021-04-01 09:10:03 +08:00
leiyong 6b518a55d7 * Fix bug. 2021-04-01 04:01:41 +03:00
zhujinyong 918999b58b * Fix testcase copy. 2021-04-01 08:53:01 +08:00
zhujinyong b201a2137b Merge branch '15.0.beta3' of http://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-04-01 07:53:15 +08:00
zhujinyong 3a03f8b613 * Fix menu switch. 2021-04-01 07:52:56 +08:00
wangyidong 6689b67538 * fix bug #11468. 2021-03-31 17:37:53 +08:00
wangyidong f381544c6f Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-03-31 17:33:40 +08:00
wangyidong a265197bb9 * fix bug #11467. 2021-03-31 17:33:06 +08:00
holan20180123 e17648144b Merge branch '15.0.beta3' of http://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-03-31 17:15:51 +08:00
holan20180123 4c73b6a489 * Adjust hour unit. 2021-03-31 17:15:33 +08:00
leiyong 2296b03083 * Adjust code. 2021-03-31 12:15:23 +03:00
Yagami 4b37af11aa * Fix lang. 2021-03-31 17:07:49 +08:00
wangyidong ad5f261a37 Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-03-31 17:04:56 +08:00
wangyidong 2537dd035b * fix bug #11352. 2021-03-31 17:04:11 +08:00
Yagami 32ce91bdde * Comment unused code. 2021-03-31 17:02:10 +08:00
Yagami eeeca403d7 * Fix menu. 2021-03-31 17:01:08 +08:00
leiyong e9f8347506 * Fix bug#11645. 2021-03-31 11:58:18 +03:00
wangyidong 1c9260eeca Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-03-31 16:49:56 +08:00
wangyidong 5dd5f12b1f * fix bug #11115. 2021-03-31 16:49:34 +08:00
leiyong b1c24577ee * Fix bug, 2021-03-31 11:49:23 +03:00
leiyong 7b971221a4 * Fix bug#11646. 2021-03-31 11:47:56 +03:00
tianshujie98 eddd75f15a * Fix bug #11157. 2021-03-31 16:32:06 +08:00
wangyidong 27317517dc Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-03-31 16:27:40 +08:00
wangyidong 0a32be6e2e * fix bug #11064. 2021-03-31 16:27:26 +08:00