Commit Graph
598 Commits
Author SHA1 Message Date
holan20180123 824f465f8e * Adjust update mode. 2021-07-20 14:44:10 +08:00
holan20180123 56d0edbf4b * Fix update mode. 2021-07-20 14:42:57 +08:00
holan20180123 391ac55824 * Adjust executionCommon to projectCommon when upgrade. 2021-07-20 14:09:46 +08:00
wangyidong 54ff43eb6f * add changelog and zh-tw lang. 2021-07-20 09:58:58 +08:00
holan20180123 779b43eae9 * Finish task #40310. 2021-07-16 17:01:09 +08:00
holan20180123 f75815e4fb * Finish task #40305. 2021-07-16 16:58:36 +08:00
holan20180123 5d9942ff98 * Fix bug #13603. 2021-07-16 14:21:09 +08:00
qiyu-xie 34992b6a40 * Adjust code. 2021-07-16 14:00:27 +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
wangyidong 6a973517de * finish task #40306. 2021-07-16 13:43:54 +08:00
qiyu-xie 5e8bf5f6f6 * Adjust code. 2021-07-16 13:36:25 +08:00
zhujinyong 6f04aedcd3 Merge branch 'master' of http://gitlab.zcorp.cc/easycorp/zentaopms 2021-07-16 09:44:23 +08:00
zhujinyong 1677574443 * return before $this->send. 2021-07-16 09:40:41 +08:00
zenggang 8709db17bb * Adjust code 2021-07-16 08:46:15 +08:00
holan20180123 e276882ea8 * Fix bug #13603. 2021-07-13 16:20:07 +08:00
holan20180123 2e8884d86c * Fix bug #13585. 2021-07-13 13:51:21 +08:00
holan20180123 bf07567ff0 * Fix bug #13584. 2021-07-13 13:13:44 +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
Yagami e42385a1c3 * Modify custom setting verify. 2021-06-11 13:52:02 +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
wangyidong f79dec9b8a Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-05-21 16:59:34 +08:00
wangyidong 5206f44c1e * adjust for upgrade. 2021-05-21 16:59:19 +08:00
hufangzhou cb624d49bd * Fix bug #12669. 2021-05-21 14:14:27 +08:00
hufangzhou 071bc3dbcd * Remove the unused code. 2021-05-21 09:10:02 +08:00
hufangzhou a1e09e0bc4 * Change the judgment rules of story review when change the review rules halfway. 2021-05-21 09:01:52 +08:00
hufangzhou 02d891da70 * Change the story review rules halfway. 2021-05-19 15:02:45 +08:00
hufangzhou c86827e39c * Finish task#38171,#38168. 2021-05-14 17:10:45 +08:00
hufangzhou 0d0d85c9ff * Finish task #38171. 2021-05-13 16:07:09 +08:00
qiyu-xie 06694e4911 * Finish task#38174. 2021-05-13 13:53:23 +08:00
wangyidong 3785a39325 * adjust for zh-tw lang. 2021-04-30 14:14:43 +08:00
wangyidong d80bc64add * adjust for upgrade. 2021-04-29 13:33:27 +08:00
Yagami b13b635102 * Fix error. 2021-04-21 09:36:09 +08:00
Yagami 819960316a * Fix error. 2021-04-16 15:12:42 +08:00
zhujinyong ec60337667 Merge branch '15.0.beta3' of http://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-04-15 22:53:00 +08:00
zhujinyong 082d15eef3 * Fix divider before first item in menu. 2021-04-15 22:52:40 +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
zhujinyong 4aac098b3f * Fix menu divider. 2021-04-12 17:27:05 +08:00
wangyidong 85bc4283cb * adjust for menu. 2021-04-08 17:12:50 +08:00