Merge branch 'develop' into split-shared

2016-03-10 17:00:59 +01:00
parent 986bfd8035 2a5011b648
commit c39967767c
76 changed files with 5136 additions and 4754 deletions
@@ -9,10 +9,13 @@ module.exports = function(user, req, cb) {
      message: i18n.t('messageTaskNotFound', req.language)
    }) : void 0;
  }
-  _.merge(task, _.omit(req.body, ['checklist', 'id', 'type']));
+  _.merge(task, _.omit(req.body, ['checklist', 'reminders', 'id', 'type']));
  if (req.body.checklist) {
    task.checklist = req.body.checklist;
  }
+  if (req.body.reminders) {
+    task.reminders = req.body.reminders;
+  }
  if (typeof task.markModified === "function") {
    task.markModified('tags');
  }