Commit Graph
249 Commits
Author SHA1 Message Date
liyuchun 3804046bdb * Fix bug #21182. 2022-04-07 09:15:35 +08:00
tianshujie b7c3e92e95 * Modify version judgment logic. 2022-02-24 16:17:26 +08:00
zhujinyong 5bd64d9312 Merge branch 'lite' into sprint/185 2022-02-17 08:56:40 +08:00
zhangzilong 2d9606bd71 * Code for bug #19249. 2022-02-15 13:35:33 +08:00
zhangzilong 7efdd3e0c5 * Fix bug #19249. 2022-02-15 13:24:04 +08:00
zhangzilong 07063776a6 * Fix bug #19249. 2022-02-15 09:42:47 +08:00
zhangzilong 5fa094a130 * Code for bug #19249. 2022-02-14 17:00:40 +08:00
zhangzilong e160e76018 * Code for bug #19249. 2022-02-14 16:58:59 +08:00
zhangzilong 0aa0fb2b6c * Fix bug #19249. 2022-02-14 14:45:56 +08:00
zhangzilong cebf6da372 * Fix bug #19249. 2022-02-11 09:07:54 +08:00
Wenrui LI 29a752fdce * fix custom header not including properly. 2022-01-27 14:30:57 +08:00
xieqiyu 77ba543cc8 * Modify the mutual test problem. 2022-01-04 10:08:14 +08:00
hufangzhou 9743ebbb92 * Finish task #46388. 2021-12-21 22:26:07 +08:00
tianshujie cfda1731a1 * Fix bug #15889. 2021-11-02 10:10:02 +08:00
liyuchun 48254bab16 * Code for task #41764. 2021-09-14 15:02:34 +08:00
liyuchun 8e2eae4f05 * Fix bug #14697. 2021-09-14 08:59:24 +08:00
liyuchun 26d6ce34c1 * Fix bug #14269. 2021-09-01 09:00:15 +08:00
holan20180123 1e71901af9 * Finish task #41243. 2021-08-10 13:11:38 +08:00
holan20180123 f75815e4fb * Finish task #40305. 2021-07-16 16:58:36 +08:00
wangyidong 3f25c7db97 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-07-16 13:49:47 +08:00
wangyidong f63bb9135f * finish task #40307. 2021-07-16 13:45:01 +08:00
qiyu-xie 5e8bf5f6f6 * Adjust code. 2021-07-16 13:36:25 +08:00
zenggang 8709db17bb * Adjust code 2021-07-16 08:46:15 +08:00
holan20180123 2e8884d86c * Fix bug #13585. 2021-07-13 13:51:21 +08:00
holan20180123 6e235a0e6a * Finish task #40015. 2021-07-13 10:10:37 +08:00
holan20180123 ecf718ee9b * Finish task #40015. 2021-07-12 13:16:11 +08:00
zenggang 0cbd7bd2b8 finish task #40019 2021-07-12 01:37:50 +00:00
wangyidong fa4fa5941e Merge branch '15.0' 2021-07-06 19:28:30 +08:00
holan20180123 d6368e99a6 * Fix bug #13271. 2021-07-05 14:46:03 +08:00
王怡栋 5f15025297 Merge branch 'master' into '15.0.beta1'
# Conflicts:
#   module/upgrade/control.php
2021-06-18 02:19:40 +00:00
wangyidong 17578d3a8c * fix bug. 2021-06-15 17:28:14 +08:00
wangyidong b6676572f0 * merge from 15.0.beta3. 2021-06-06 09:05:34 +08:00
hufangzhou fcf1d669d7 * Revert the changed code of task #38644. 2021-06-05 18:14:44 +08:00
wangyidong 769e6b433b * merge from 15.0.beta3. 2021-06-05 13:01:53 +08:00
hufangzhou b0291eeba4 * Fix bug #38644. 2021-06-01 09:29:30 +08:00
hufangzhou 0d0d85c9ff * Finish task #38171. 2021-05-13 16:07:09 +08:00
Yagami 819960316a * Fix error. 2021-04-16 15:12:42 +08:00
Yagami cf7c1dc400 * Fix menu. 2021-04-15 16:43:27 +08:00
Yagami 9ce2232cbf * Add change flow. 2021-04-15 16:09:58 +08:00
holan20180123 d5fcc2fc1a * Finish task #37536. 2021-04-15 09:21:53 +08:00
wangyidong 85bc4283cb * adjust for menu. 2021-04-08 17:12:50 +08:00
Yagami 71de6b2e96 * Fix bug. 2021-03-31 13:34:04 +08:00
Yagami 2034dbd3a3 * Fix bug #6954. 2021-03-31 10:40:50 +08:00
zhujinyong 6582a700bb * Fix story of project. 2021-03-21 16:11:07 +08:00
zhujinyong a6eff425ca * Adjust menu logic. 2021-03-21 12:15:55 +08:00
hufangzhou ff5c09c76f * Adjust the code. 2021-03-12 08:21:40 +08:00
hufangzhou 1e4b9124a9 * Adjust the divider style. 2021-03-11 16:18:03 +08:00
Yagami 60f8cadc08 * Finish task #36435. 2021-03-11 09:31:39 +08:00
Yagami 1082a2425f * Finish task #36436. 2021-03-10 13:43:28 +08:00
holan20180123 33475fb2d2 Merge branch 'master' of http://gitlab.zcorp.cc/easycorp/zentaopms 2021-03-09 13:06:56 +08:00