Commit Graph

20153 Commits

Author SHA1 Message Date
holan20180123
c9c22cdecd Merge branch '15.0.beta3' of http://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-04-01 15:30:00 +08:00
holan20180123
e6849940e9 * Finish task #37015. 2021-04-01 15:27:55 +08:00
Yagami
3dd13d66c5 * Fix upgrade logic. 2021-04-01 15:26:16 +08:00
wangyidong
f5b2465455 Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-04-01 15:23:15 +08:00
wangyidong
7567d4436a * fix error. 2021-04-01 15:23:01 +08:00
tianshujie98
dfe3c61c65 * Reduction. 2021-04-01 15:06:04 +08:00
Yagami
e420af7ad7 * Fix lang menu. 2021-04-01 15:00:49 +08:00
leiyong
abd8af87a6 * Fix bug. 2021-04-01 09:57:12 +03:00
leiyong
d935b46f4a * Fix bug. 2021-04-01 09:34:13 +03:00
qiyu-xie
9db0c51417 * Finish task#37029. 2021-04-01 14:33:45 +08:00
tianshujie98
0f85934319 * Finish task #37022. 2021-04-01 14:32:02 +08:00
tianshujie98
4769457a36 * Finish task #37023. 2021-04-01 14:26:12 +08:00
leiyong
ac932f0ad6 * Adjust caselib module. 2021-04-01 09:24:03 +03:00
tianshujie98
1aac135eb5 * Finish task #37024. 2021-04-01 14:21:41 +08:00
tianshujie98
c720a37e55 * Fix bug. 2021-04-01 14:13:11 +08:00
tianshujie98
5458688995 * Fix bug. 2021-04-01 14:09:21 +08:00
tianshujie98
ef9dd85d0a * Finish task #37006. 2021-04-01 14:02:36 +08:00
qiyu-xie
458e7dfc4f * Finish task#37036. 2021-04-01 13:56:15 +08:00
tianshujie98
b6a9d36280 Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-04-01 13:50:46 +08:00
tianshujie98
29cb438eb7 * Modify language format. 2021-04-01 13:50:20 +08:00
wangyidong
71c4c72b64 Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-04-01 13:48:57 +08:00
wangyidong
256dadcacc * fix bug #11631. 2021-04-01 13:48:35 +08:00
tianshujie98
a700423fa0 * Modify the display problem of creating and editing project permissions. 2021-04-01 13:46:14 +08:00
Yagami
a6fe7fdf34 * Fix upgrade view. 2021-04-01 13:43:57 +08:00
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