Commit Graph
9242 Commits
Author SHA1 Message Date
wangyidong 0a00ab84a8 Merge branch 'master' of github.com:easysoft/zentaopms 2017-02-24 10:23:33 +08:00
wangyidong c1427b373e * ignore empty order. 2017-02-24 10:23:04 +08:00
wangyidong 53f0953951 * adjust for get last extension version. 2017-02-24 10:15:01 +08:00
pengjiangxiu 96979544d9 * finish task #2934. 2017-02-24 10:04:06 +08:00
pengjiangxiu 14f1158bde * finish task #2935. 2017-02-23 13:55:12 +08:00
wangyidong 6520403138 Merge branch 'master' of github.com:easysoft/zentaopms 2017-02-23 13:23:14 +08:00
wangyidong 8133b79b48 * finish task #2926. 2017-02-23 13:22:22 +08:00
pengjiangxiu 0e5c648c54 * finish task #2932 2017-02-23 13:04:35 +08:00
pengjiangxiu 82c7d41f08 * finish task #2922 2017-02-23 09:52:57 +08:00
pengjiangxiu 73b27f4e6a * finish task #2911 2017-02-23 09:37:39 +08:00
wangyidong 5a658521d7 * fix bug #1016. 2017-02-23 09:24:46 +08:00
pengjiangxiu aef586576b * finish task #2936 2017-02-23 09:08:51 +08:00
wangyidong 16d2f2a9b9 * finish task #2921. 2017-02-22 17:11:33 +08:00
wangyidong 08cdbfdd27 Merge branch 'master' of github.com:easysoft/zentaopms 2017-02-22 16:31:10 +08:00
wangyidong 625948aad3 * finish task #2933. 2017-02-22 16:30:53 +08:00
wangyidong 7fd78bbb8c * fix for order by plan. 2017-02-22 16:19:27 +08:00
QingDao Nature Easy Soft Network Technology Co,LTD 75ec1671cf Merge pull request #7 from PeterDaveHelloKitchen/image-optimize
optimize png images using zopflipng
2017-02-16 09:48:35 +08:00
wangyidong 522022360d * changeLog. zentaopms_9.0.1_20170215 2017-02-15 10:17:41 +08:00
wangyidong 5a72fcb503 * adjust for safe. 2017-02-15 10:05:43 +08:00
wangyidong 8d309ad7cf * adjust for project tree. 2017-02-15 10:04:07 +08:00
wangyidong 5619ac5f4c * change for upgrade and en,zh-tw lang. 2017-02-14 16:33:06 +08:00
wangyidong ce087026a7 * adjust for safe. 2017-02-14 16:04:02 +08:00
wangyidong b5e9d08b8c * adjust for resolve page. 2017-02-14 15:11:45 +08:00
wangyidong d17a138f05 * adjust for dao class. 2017-02-14 14:01:39 +08:00
wangyidong a32496e911 * remove urlencode. 2017-02-14 13:39:43 +08:00
wangyidong ef2cc89e5a * fix bug #1002. 2017-02-14 13:38:24 +08:00
wangyidong 4610fdad32 * check sql for safe in order and limit function. 2017-02-14 13:36:13 +08:00
wangyidong 05cb13e012 * fix bug #1007. 2017-02-14 10:34:46 +08:00
wangyidong 4a398b0e42 * fix for add doc image delete. 2017-02-14 10:30:54 +08:00
wangyidong 29b4f4f531 * adjust for burn in index. 2017-02-14 10:09:09 +08:00
wangyidong 3537469229 * fix bug #1006. 2017-02-13 17:25:38 +08:00
wangyidong c8630c8d32 * fix bug #996. 2017-02-13 15:32:09 +08:00
wangyidong 3eb8385a63 * fix projectproduct data. 2017-02-13 15:19:02 +08:00
wangyidong 1a004fc60c * finish task #2890. 2017-02-13 14:50:44 +08:00
wangyidong 7986d739a6 * code for task #2892. 2017-02-10 09:37:39 +08:00
wangyidong c3fd6d6f91 * finish task #2891. 2017-02-09 15:14:27 +08:00
wangyidong 9ce0e008cb * finish task #2889. 2017-02-09 14:55:37 +08:00
wangyidong 313032128d * change for task #2887. 2017-02-09 14:34:50 +08:00
tengfei f6aea7992e *update 2017-02-09 13:52:03 +08:00
tengfei 2b3fbcd497 *update 2017-02-09 13:50:22 +08:00
tengfei 2de2af1d5c *adjust password 2017-02-09 13:47:00 +08:00
wangyidong 357f0216d7 * finish task #2888. 2017-02-09 10:39:43 +08:00
wangyidong 33f8c7dbd1 * finish task #2887. 2017-02-09 10:11:01 +08:00
wangyidong eab8af2e8c * finish task #2886. 2017-02-08 10:57:27 +08:00
wangyidong 217c6c4795 * finish task #2885. 2017-02-08 10:23:33 +08:00
wangyidong 3d380fa3a3 * adjust for bug. 2017-02-08 09:34:39 +08:00
wangyidong ca2f2db54a Merge branch 'master' of github.com:easysoft/zentaopms 2017-02-06 15:19:25 +08:00
wangyidong 4a2ff90ddc * adjust for comment story. 2017-02-06 15:18:54 +08:00
wangyidong 5b0f01462a * fix bug for comment story. 2017-02-04 16:25:19 +08:00
wangyidong e37578024e Merge branch 'master' of github.com:easysoft/zentaopms 2017-02-04 16:23:34 +08:00