Commit Graph

168 Commits

Author SHA1 Message Date
tengfei
ee44254608 Merge branch 'master' of https://github.com/easysoft/zentaopms 2017-12-05 11:26:51 +08:00
tengfei
232d00dbcd translation minor error 2017-12-05 11:24:06 +08:00
滔哥
11ad8f1d95 * Fix bug 1315 2017-12-04 13:32:17 +08:00
tengfei
5a4f5057d6 “minor change 2017-11-27 17:08:29 +08:00
wangyidong
ad3ce6bab6 * change for pro. 2017-11-16 15:26:20 +08:00
wangyidong
87e4abfcb8 Merge branch 'master' of github.com:easysoft/zentaopms 2017-11-09 16:46:51 +08:00
滔哥
40995c4dc3 * Fix bug 2017-11-09 15:12:02 +08:00
wangyidong
c2e05057f5 * finish task #3341. 2017-11-09 15:11:08 +08:00
滔哥
2f2c99f346 * Fix bug 2017-11-09 10:51:03 +08:00
guanxiying
9d2861678f Format codes. 2017-11-08 16:00:24 +08:00
Xiying Guan
f1ba417162 * Format codes. 2017-11-08 13:28:26 +08:00
wangyidong
49909d01c1 * adjust for required. 2017-11-06 17:46:57 +08:00
wangyidong
7293086b45 * fix for required. 2017-11-06 16:57:13 +08:00
wangyidong
fbc5b38585 * change for zh-tw lang. 2017-11-06 10:13:16 +08:00
wangyidong
38073d2ad7 * finish task #3310. 2017-11-03 13:22:27 +08:00
滔哥
4446a7160b Merge branch 'master' of https://github.com/easysoft/zentaopms 2017-11-01 19:32:12 +08:00
滔哥
7aa86734db * fix score module 2017-11-01 19:31:59 +08:00
wangyidong
1a3a404677 * fix for custom required. 2017-11-01 14:14:40 +08:00
wangyidong
d4dd502c31 Merge branch 'master' of github.com:easysoft/zentaopms 2017-11-01 13:28:14 +08:00
wangyidong
8000d57e9d * adjust for save custom with global. 2017-11-01 13:26:03 +08:00
滔哥
c5d9187baf * fix score module 2017-11-01 11:29:07 +08:00
滔哥
e3ea70b43a * change score module 2017-10-31 11:13:09 +08:00
滔哥
d42cf9b277 * add score init 2017-10-31 07:31:28 +08:00
滔哥
d9290cbf9b * + score in all model 2017-10-27 11:15:28 +08:00
滔哥
001057edb0 * + my score log 2017-10-26 17:26:09 +08:00
滔哥
66ff400d7a * add score admin authority 2017-10-25 11:09:54 +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
wangyidong
06752d4cb3 * add new version and upgrade. 2017-09-26 13:45:32 +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
ea306d3f3b * change lang file. 2017-08-24 14:03:58 +08:00
wangyidong
9dce33c3df Merge branch 'master' of github.com:easysoft/zentaopms 2017-08-23 14:56:32 +08:00
wangyidong
094c960bf4 * finish task #3088. 2017-08-23 14:55:49 +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
wangyidong
359949f582 * finish task #3118. 2017-08-11 15:00:52 +08:00
wangyidong
12c288a4e7 * change for upgrade. 2017-05-16 14:27:53 +08:00
daitingting
e5b388d585 * Adjust codes. 2017-05-12 16:22:22 +08:00
daitingting
ce174f973c * Set as working as only test. 2017-05-05 12:09:19 +08:00
daitingting
fa4671b824 Merge branch 'master' of https://github.com/easysoft/zentaopms 2017-05-03 17:36:20 +08:00
daitingting
2e5e8ec5a4 * Set working.
* Set as only task.
 * Set as only story.
2017-05-03 17:35:37 +08:00
wangyidong
2edc510b77 * can not add custom item for reviewResult. 2017-05-03 16:18:49 +08:00
daitingting
4b2202d3f6 Merge branch 'master' of https://github.com/easysoft/zentaopms 2017-05-02 17:05:56 +08:00
daitingting
9498716f33 * Adjust working way name. 2017-05-02 17:05:37 +08:00
wangyidong
99fbbbe92a Merge branch 'master' of github.com:easysoft/zentaopms 2017-05-02 11:17:27 +08:00