Commit Graph

194 Commits

Author SHA1 Message Date
wangyidong
36de63e1fe Merge branch 'master' of github.com:easysoft/zentaopms 2019-02-25 08:54:56 +08:00
wangyidong
3e7caa0da1 * finish task #5271. 2019-02-25 08:43:53 +08:00
Yagami
07fe890768 * Code for task #5271. 2019-02-23 14:43:24 +08:00
wangyidong
7bcd62dfdc * finish task #5279. 2019-02-20 14:34:22 +08:00
wangyidong
767de3e234 * fix bug for custom. 2019-02-12 10:10:21 +08:00
wangyidong
cada6c243b * adjust for showDeleted custom. 2019-01-11 15:57:01 +08:00
wangyidong
2b15b8d3c6 * finish task #5201. 2019-01-02 09:51:06 +08:00
wangyidong
bcaaed2692 * change for doc custom. 2018-10-26 10:48:43 +08:00
wangyidong
eac9682bd7 * adjust for task #5044. 2018-10-24 14:23:19 +08:00
wangyidong
3676747f10 * finish task #5044,5045. 2018-10-24 10:06:20 +08:00
wangyidong
84f178f3aa * finish task #5031. 2018-10-17 15:14:31 +08:00
wangyidong
f505297ac7 Merge branch 'master' of github.com:easysoft/zentaopms 2018-09-18 10:38:25 +08:00
wangyidong
30eb2ce98f * change $_SERVER to $this->server. 2018-09-17 15:53:06 +08:00
wangyidong
30239402f5 * finish task #4697. 2018-09-11 15:53:20 +08:00
liugang
fed443460d * Finish task #4628. 2018-07-05 14:26:18 +08:00
liugang
5e5221ebbc * Optimize codes. 2018-06-26 10:58:18 +08:00
liugang
1eb7ed4198 * Finish task #4461. 2018-06-20 14:11:52 +08:00
liugang
5b0459d968 * Custom define menu. 2018-06-19 16:55:43 +08:00
wangyidong
56256fb190 * fix bug. 2018-06-08 09:54:32 +08:00
wangyidong
78dda99381 * finish task #4210. 2018-05-28 13:50:08 +08:00
wangyidong
b1bbcb7c22 * finish task #4225. 2018-05-23 14:55:33 +08:00
wangyidong
56489075b0 Merge branch 'zentaopms_9.8' 2018-05-07 16:48:59 +08:00
wangyidong
d67fd9d165 * remove custom-ajaxsethomepage page. 2018-05-02 13:05:54 +08:00
wumo
48b97ea292 * optimize the notes. 2018-03-26 15:33:46 +08:00
wumo
1ea17ed25d * Fix the bug of typeList of todo. 2018-03-22 23:08:55 +08:00
wumo
402861a88e * Filter the invalid key in custom module.
* Change function called to picture when edit product.
2018-03-22 16:49:51 +08:00
wumo
7ebfcde7f2 * Fix the bug of comment and setting key. 2018-03-21 16:01:12 +08:00
wumo
cd918d09fd * Check the key of user when setting. 2018-03-20 10:00:30 +08:00
daitingting
2f5ac1ad32 * Adjust length checking. 2018-03-19 17:13:12 +08:00
daitingting
c81e7570b3 * Fix bug #1431. 2018-03-14 16:28:32 +08:00
wangyidong
9cf249835e * fix bug for custom story review. 2017-12-27 17:29:20 +08:00
wangyidong
ad3ce6bab6 * change for pro. 2017-11-16 15:26:20 +08:00
滔哥
40995c4dc3 * Fix bug 2017-11-09 15:12:02 +08:00
wangyidong
38073d2ad7 * finish task #3310. 2017-11-03 13:22:27 +08:00
wangyidong
1a3a404677 * fix for custom required. 2017-11-01 14:14:40 +08:00
wangyidong
8000d57e9d * adjust for save custom with global. 2017-11-01 13:26:03 +08:00
滔哥
39b46a01cf + add score switch of custom 2017-10-25 10:49:05 +08:00
wangyidong
6c6c618337 Finish task#3262 各个表单的必填项字段可以自定义,cost:16 left:0 2017-10-24 14:54:34 +08:00
wangyidong
b965b706a8 Finish task#3252 管理员可以将自己的菜单配置作为公共的配置,cost:3 left:0 2017-10-19 14:31:03 +08:00
pengjiangxiu
479a1b1ea8 * Finish task #3218. 2017-09-13 09:39:11 +08:00
pengjiangxiu
c8049d270a * Finish task #3209. 2017-09-11 15:14:30 +08:00
wangyidong
f60a4c664b * custom show deleted user. 2017-09-04 14:46:17 +08:00
pengjiangxiu
202d76db45 * Adjust code. 2017-08-23 13:08:06 +08:00
pengjiangxiu
9e34e50947 * Finish task #3111. 2017-08-17 10:31:21 +08:00
wangyidong
27a57e6ee3 * finish task #3158. 2017-08-15 17:04:15 +08:00
wangyidong
b91e47c2e7 * finish task #3117. 2017-08-14 10:05:30 +08:00
daitingting
9498716f33 * Adjust working way name. 2017-05-02 17:05:37 +08:00
daitingting
ddb772a947 * Set working in admin. 2017-05-02 10:36:51 +08:00
wangyidong
6e5dbf8d84 * fix for set block closed. 2017-03-22 09:50:41 +08:00
wangyidong
41965a24b4 * adjust code. 2017-03-17 10:46:12 +08:00