Commit Graph
8049 Commits
Author SHA1 Message Date
滔哥 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 deb8adaec6 Merge branch 'master' of github.com:easysoft/zentaopms 2017-10-25 10:26:39 +08:00
wangyidong 04528419bd Finish task#3272 后台-二次开发-编辑器 存在安全漏洞,cost:1 left:0 2017-10-25 10:26:25 +08:00
wangyidong 7280a01aa3 Merge branch 'master' of github.com:easysoft/zentaopms 2017-10-25 10:10:44 +08:00
wangyidong f560cb7091 Finish task#3277 调整测试报告,cost:4 left:0 2017-10-25 10:10:31 +08:00
sgm0422 729f39daeb * Fix Bug #1234. 2017-10-25 10:10:24 +08:00
滔哥 7a9edad861 * + grouptask style add childTask 2017-10-25 09:59:35 +08:00
liugang 9db67eb25b Merge branch 'master' of https://github.com/easysoft/zentaopms 2017-10-25 09:47:11 +08:00
滔哥 e066c51c8e * fix common style 2017-10-25 09:36:37 +08:00
滔哥 6e2f0aa9bd * fix common style 2017-10-25 09:36:25 +08:00
滔哥 0cd0caa451 * fix bug 2017-10-25 09:36:01 +08:00
滔哥 83ff859016 * fix bug 2017-10-25 09:35:49 +08:00
滔哥 12cfe294fc * + child task export 2017-10-25 09:34:48 +08:00
liugang 785c49ca54 * Fix bug. 2017-10-24 18:10:07 +08:00
liugang 37bb58a23e Merge branch 'master' of https://github.com/easysoft/zentaopms 2017-10-24 18:02:30 +08:00
liugang a259217bdf + Post data when hook is triggered.
+ Add log.
2017-10-24 18:01:56 +08:00
wangyidong 5e3cc44e86 Merge branch 'master' of github.com:easysoft/zentaopms 2017-10-24 17:22:15 +08:00
wangyidong 87d230dd2a * fix bug for report. 2017-10-24 17:21:39 +08:00
sgm0422 9b2bb638dd * Fix Bug #1235. 2017-10-24 16:15:03 +08:00
滔哥 a9bc7fbd27 * fix childTask 2017-10-24 16:07:41 +08:00
滔哥 a85c0ceaef * fix dataTable style 2017-10-24 16:00:50 +08:00
滔哥 014e958530 * fix dataTable style 2017-10-24 16:00:32 +08:00
滔哥 0c04dcbaa3 * fix task 2017-10-24 15:38:55 +08:00
滔哥 fddfe83cb3 Merge branch 'master' of https://github.com/easysoft/zentaopms 2017-10-24 15:37:22 +08:00
滔哥 9b5f00ea0d * fix batchCreate 2017-10-24 15:36:46 +08:00
滔哥 9b077f12c6 * fix batchCreate 2017-10-24 15:36:28 +08:00
wangyidong 6c6c618337 Finish task#3262 各个表单的必填项字段可以自定义,cost:16 left:0 2017-10-24 14:54:34 +08:00
sgm0422 7eefad2430 * Fix bug #1237. 2017-10-24 09:19:44 +08:00
sgm0422 11a4dc28f0 Merge remote-tracking branch 'refs/remotes/origin/master' 2017-10-24 09:06:13 +08:00
sgm0422 b267870db4 * Fix bug #1245. 2017-10-24 09:03:43 +08:00
滔哥 a8e3dd25b9 * childTask status change 2017-10-24 08:46:41 +08:00
滔哥 91eb91ecb1 * format task model 2017-10-23 21:16:23 +08:00
滔哥 4a7c7c7402 * Task Status change 2017-10-23 21:13:35 +08:00
滔哥 c0ccf6ff4b * Task style 2017-10-23 17:48:26 +08:00
滔哥 d3358d4637 * change children style 2017-10-23 17:32:20 +08:00
wangyidong b252c629d9 Merge branch 'master' of github.com:easysoft/zentaopms 2017-10-23 17:21:30 +08:00
wangyidong 1508828fc1 * fix bug select all. 2017-10-23 17:21:04 +08:00
滔哥 c9805574df * task children style 2017-10-23 17:15:45 +08:00
滔哥 4f14940ece Merge branch 'master' of https://github.com/easysoft/zentaopms 2017-10-23 16:51:01 +08:00
滔哥 492bf6e956 * Task Bug 2017-10-23 16:50:48 +08:00
wangyidong 2b5d8d1640 Merge branch 'master' of github.com:easysoft/zentaopms 2017-10-23 16:36:46 +08:00
wangyidong 5801f9c07d * fix bug for browse list page. 2017-10-23 16:36:02 +08:00
滔哥 cd23a2dd23 * multiTask assignedDate empty value bug 2017-10-23 14:09:58 +08:00
滔哥 540e02f895 * add task lang 2017-10-23 13:59:34 +08:00
滔哥 cf94b99b5b es->ea 2017-10-23 13:37:34 +08:00
滔哥 a8c27a1513 * fix task model empty 2017-10-23 13:19:06 +08:00
wangyidong 0970f411a6 Merge branch 'master' of github.com:easysoft/zentaopms 2017-10-23 09:11:20 +08:00
滔哥 53d0b2b8fa view add btn for childTask 2017-10-20 16:40:21 +08:00
wangyidong 0a79bdc4bb Merge branch 'master' of github.com:easysoft/zentaopms 2017-10-20 16:28:40 +08:00