Commit Graph
10089 Commits
Author SHA1 Message Date
liugang 0b90bae736 Merge branch 'master' of https://github.com/easysoft/zentaopms 2017-11-01 13:10:26 +08:00
liugang a3a4a4bac0 * Fix bug #1216. 2017-11-01 13:06:24 +08:00
滔哥 3d17d07926 * fix format score config.php 2017-11-01 11:32:57 +08:00
滔哥 c5d9187baf * fix score module 2017-11-01 11:29:07 +08:00
滔哥 3b246f43f1 Merge branch 'master' of https://github.com/easysoft/zentaopms 2017-10-31 21:15:18 +08:00
liugang 34b3df57e2 * Remove category from module menu. 2017-10-31 16:33:58 +08:00
liugang 6fc4e4850a Merge branch 'master' of https://github.com/easysoft/zentaopms 2017-10-31 14:08:22 +08:00
liugang fc8e08698f * Browse products by category. 2017-10-31 14:08:02 +08:00
wangyidong f0914224f8 * adjust for task #3239. 2017-10-31 13:15:10 +08:00
wangyidong e9ac65b7dc * fix for task #3239. 2017-10-31 11:13:40 +08:00
滔哥 c6b07c7bac Merge branch 'master' of https://github.com/easysoft/zentaopms 2017-10-31 11:13:14 +08:00
滔哥 e3ea70b43a * change score module 2017-10-31 11:13:09 +08:00
wangyidong 9c7e311c8c Fix bug#1231 产品-计划中计划描述插入图片,在计划列表不显示,6.5之前版本描述插入图片会显示在计划列表中。 2017-10-31 10:47:28 +08:00
滔哥 09395f45e8 * add score for my model 2017-10-31 10:14:12 +08:00
滔哥 44bc56d7e0 Merge branch 'master' of https://github.com/easysoft/zentaopms 2017-10-31 10:04:00 +08:00
滔哥 3d0dff1420 * add score auth 2017-10-31 10:03:54 +08:00
wangyidong b56bacb0e1 Merge branch 'master' of github.com:easysoft/zentaopms 2017-10-31 09:00:39 +08:00
wangyidong aacff2955f Finish task#3239 项目需求可以拖动排序,cost:4 left:0 2017-10-31 09:00:21 +08:00
滔哥 2dc822ca73 Merge branch 'master' of https://github.com/easysoft/zentaopms 2017-10-31 07:31:32 +08:00
滔哥 d42cf9b277 * add score init 2017-10-31 07:31:28 +08:00
liugang 6dd2154233 * Add category to product. 2017-10-30 17:55:55 +08:00
liugang fd35539014 * @someone in message of dingding when assign an object. 2017-10-30 16:01:03 +08:00
liugang 09b7b0c0d2 * Adjust style. 2017-10-30 14:37:29 +08:00
liugang 3dd4a31365 Merge branch 'master' of https://github.com/easysoft/zentaopms 2017-10-30 14:27:33 +08:00
liugang 3076736e9e * Set default msgtype as markdown for dingding. 2017-10-30 14:26:51 +08:00
wangyidong 1b82933c0d Finish task#3237 所有项目 /所有产品页面增加导出功能,cost:2 left:0 2017-10-30 11:32:53 +08:00
wangyidong a1d0b80852 Merge branch 'master' of github.com:easysoft/zentaopms 2017-10-30 08:18:36 +08:00
滔哥 a0e8b24f25 * + score model 2017-10-27 23:46:50 +08:00
滔哥 3833a7f861 Merge branch 'master' of https://github.com/easysoft/zentaopms 2017-10-27 23:46:15 +08:00
liugang 4b141a137f Merge branch 'master' of https://github.com/easysoft/zentaopms 2017-10-27 17:40:55 +08:00
liugang 99ffc7407b * Add document link for entry. 2017-10-27 17:40:16 +08:00
滔哥 0feb29c9e2 Merge branch 'master' of https://github.com/easysoft/zentaopms 2017-10-27 15:36:45 +08:00
wangyidong 0f2eb04f6a Fix bug#1258 每日提醒有错误记录 2017-10-27 14:21:12 +08:00
wangyidong cba3dff61f Finish task#3243 看板增加自定义设置显示颜色的功能,cost:4 left:0 2017-10-27 13:30:18 +08:00
滔哥 cd16f35a54 Merge branch 'master' of https://github.com/easysoft/zentaopms 2017-10-27 11:15:33 +08:00
滔哥 d9290cbf9b * + score in all model 2017-10-27 11:15:28 +08:00
wangyidong 8f90f7b8e6 * adjust for dao cache. 2017-10-27 11:14:13 +08:00
wangyidong a8cbbd2aef Merge branch 'master' of github.com:easysoft/zentaopms 2017-10-27 10:58:17 +08:00
wangyidong 5bd85abc7c * fix for dao cache. 2017-10-27 10:57:15 +08:00
liugang 7116d5b454 * Add function to avoid error when user cron to async send message. 2017-10-27 10:26:11 +08:00
liugang 3acbf6bd0a * Add @xxx function when post message to dingding. 2017-10-27 09:10:05 +08:00
liugang d41c411bfd + Finish task #3244. 2017-10-26 18:36:41 +08:00
liugang 6ba9bc8b88 * Finish task #3245. 2017-10-26 18:12:31 +08:00
liugang c4f435237e Merge branch 'master' of https://github.com/easysoft/zentaopms 2017-10-26 17:55:18 +08:00
liugang 8f6026ca78 + Add api.php as entrance. 2017-10-26 17:54:34 +08:00
滔哥 fc52d683c7 Merge branch 'master' of https://github.com/easysoft/zentaopms 2017-10-26 17:26:12 +08:00
滔哥 001057edb0 * + my score log 2017-10-26 17:26:09 +08:00
wangyidong 7c066756bd Finish task#3256 看板可以按照其他的字段进行分组,cost:7 left:0 2017-10-26 14:16:07 +08:00
wangyidong ee25589b77 Merge branch 'master' of github.com:easysoft/zentaopms 2017-10-26 08:56:48 +08:00
wangyidong 4626e4f0d1 * fix for error. 2017-10-26 08:56:01 +08:00