Merge remote-tracking branch 'upstream/develop' into todos-dated-tab-2014-11-01

2015-01-19 17:53:48 +10:00
parent 27dab4ae4e 62d7505233
commit da1a11b62d
278 changed files with 13878 additions and 12693 deletions
@@ -550,7 +550,7 @@ api.wrap = (user, main=true) ->

      updateTask: (req, cb) ->
        return cb?({code:404,message:i18n.t('messageTaskNotFound', req.language)}) unless task = user.tasks[req.params?.id]
-        _.merge task, _.omit(req.body,['checklist','id'])
+        _.merge task, _.omit(req.body,['checklist','id', 'type'])
        task.checklist = req.body.checklist if req.body.checklist
        task.markModified? 'tags'
        cb? null, task