Commit Graph

1017 Commits

Author SHA1 Message Date
Yagami
4f617ea6cc * Fix bug. 2021-04-02 13:22:57 +08:00
holan20180123
27c9c799f8 * Finish task #11761. 2021-04-02 11:45:00 +08:00
tianshujie98
9f94ef80fc * Adjust block style. 2021-04-02 11:15:23 +08:00
tianshujie98
b7eba90982 * Fix an error. 2021-04-02 10:51:41 +08:00
tianshujie98
a85e503194 Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-04-02 10:40:23 +08:00
tianshujie98
af872d39a0 * Adjustment block. 2021-04-02 10:40:03 +08:00
qiyu-xie
f66b27f71b * Adjust code style. 2021-04-02 09:49:13 +08:00
tianshujie98
752f08b3aa * Fix an error. 2021-04-02 09:09:03 +08:00
tianshujie98
f897503c01 * Fix an error. 2021-04-02 09:00:09 +08:00
tianshujie98
1537ff53d0 * Add link. 2021-04-02 08:47:15 +08:00
tianshujie98
8d5421e83e * Modify card style. 2021-04-02 08:22:48 +08:00
leiyong
e97e88f0c5 * Adjust language items. 2021-04-01 12:52:15 +03:00
tianshujie98
690d4aa32a Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-04-01 17:40:46 +08:00
tianshujie98
d0b6699671 * Finish task#37020. 2021-04-01 17:40:15 +08:00
holan20180123
82cc3f6ce4 * Finish task #37015. 2021-04-01 17:12:59 +08:00
hufangzhou
ee4864a30a Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-04-01 15:48:24 +08:00
hufangzhou
24e7dd0e61 * Finish task #37035. 2021-04-01 15:48:18 +08:00
holan20180123
992ad08c17 * Fix bug #11743. 2021-04-01 15:39:24 +08:00
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
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
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
tianshujie98
1aac135eb5 * Finish task #37024. 2021-04-01 14:21:41 +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
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
holan20180123
7739b36a32 * Finish task #37007. 2021-04-01 13:26:54 +08:00
hufangzhou
5b1a279c3d * Finish task #37041. 2021-04-01 13:24:56 +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
holan20180123
e8e1b40d97 * Finish task #37008. 2021-04-01 11:40:01 +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
b12efb31ef * Finish task #37004. 2021-04-01 11:07:11 +08: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
holan20180123
4c73b6a489 * Adjust hour unit. 2021-03-31 17:15:33 +08:00
holan20180123
2b8d2a2503 * Finish task #37002. 2021-03-31 16:24:24 +08:00
holan20180123
a3e7399566 * Finish task #37027. 2021-03-31 15:51:06 +08:00
Yagami
399daad442 * Fix bug #11257. 2021-03-31 13:51:46 +08:00
holan20180123
21ab7ec3b2 * Finish task #37030. 2021-03-31 13:43:55 +08:00
wangyidong
faf5134ab3 * fix bug #11064. 2021-03-31 13:41:37 +08:00
Yagami
5c59c161e5 * Fix bugs. 2021-03-31 10:57:34 +08:00