Commit Graph

614 Commits

Author SHA1 Message Date
tianshujie
cfda1731a1 * Fix bug #15889. 2021-11-02 10:10:02 +08:00
hufangzhou
bf78fe9be4 * Add the 15.6 version and upgrade. 2021-10-12 09:35:39 +08:00
王怡栋
96a8ef6b04 Merge branch '15.5' into 165 2021-10-09 10:06:05 +08:00
tianshujie
4f977efaeb * Finish task #42854. 2021-09-28 13:14:32 +08:00
zenggang
7650e33988 * Fix bug#15232 2021-09-17 17:23:15 +08:00
liyuchun
3302a7bedb * Code for task #41764. 2021-09-14 15:10:15 +08:00
liyuchun
48254bab16 * Code for task #41764. 2021-09-14 15:02:34 +08:00
王怡栋
b70381885a * add new version and upgrade. 2021-09-14 11:36:00 +08:00
liyuchun
8e2eae4f05 * Fix bug #14697. 2021-09-14 08:59:24 +08:00
王怡栋
5bc20274e0 * fix bug #14701. 2021-09-10 11:24:25 +08:00
liyuchun
26d6ce34c1 * Fix bug #14269. 2021-09-01 09:00:15 +08:00
zhujinyong
664e290f97 * Rename openApp to tab. 2021-08-31 00:30:48 +08:00
xieqiyu
f5f503cea4 * Finish task#41787. 2021-08-30 10:06:55 +08:00
王怡栋
808932285c Merge branch '15.2' 2021-08-23 10:02:31 +08:00
holan20180123
1e71901af9 * Finish task #41243. 2021-08-10 13:11:38 +08:00
leiyong
df5d8e384d * Finish task#40899. 2021-08-05 14:34:50 +08:00
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