Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity
41,478 Commits 2 Branches 292 Tags
4d16cbf4dc9f8fbcbdfc462594de6d3d825e5a39
Commit Graph
267 Commits
Author SHA1 Message Date
王怡栋 c69384617a Merge branch 'master_xieqiyu_57850' into 'master' 
* Code for task#57850.

See merge request easycorp/zentaopms!4083
 2022-06-23 00:39:25 +00:00
xieqiyu 21b0217aa8 * Code for task#57850. 2022-06-22 13:15:44 +08:00
tanghucheng 98d4d45079 * Add menuorder for custom setting. 2022-06-21 10:10:25 +08:00
mayue 0beaa60d98 * Optimize code. 2022-06-09 09:55:19 +08:00
mayue 4c0d6836b6 * Fix bug. 2022-06-09 09:28:00 +08:00
mayue 1e69f979cd * Optimize code. 2022-06-08 14:42:03 +08:00
mayue d64e16d4ef * Finish story#9206. 2022-06-08 13:48:36 +08:00
孙广明 b896377846 * Change zentao license. 2022-06-08 10:02:29 +08:00
孙广明 b528156589 * Change license. 2022-06-08 09:34:46 +08:00
liumengyi 07bebde892 * Fix bug for #task #55677. 2022-06-01 14:28:51 +08:00
liumengyi 499024e935 * Finish tash #55677. 2022-06-01 10:36:46 +08:00
孙广明 ececdba8df * Fix bug #55323. 2022-05-25 14:46:59 +08:00
tianshujie 244a281a47 * Finish task #54329. 2022-05-19 09:57:00 +08:00
tianshujie db940f77fd * Finish task #54329. 2022-05-19 09:43:34 +08:00
tianshujie f1f4c511b5 * Finish task #54329. 2022-05-18 16:08:09 +08:00
liumengyi dfa70c678b * Finish task #54349. 2022-05-17 16:51:19 +08:00
liumengyi 71cb47e7eb * Finish task #54349. 2022-05-17 14:51:13 +08:00
liumengyi fb4e586acf * Finish task #54349. 2022-05-17 14:50:31 +08:00
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