Merge branch 'develop' into api-v3

2016-03-30 23:40:00 +02:00
parent 7e9520b920 4fa8c6dfbd
commit 3089658cc7
26 changed files with 8755 additions and 8720 deletions
@@ -36,6 +36,9 @@ module.exports = function(user, options) {
  }
  user.auth.timestamps.loggedin = new Date();
  user.lastCron = now;
+  if (_.isFinite(+user.preferences.timezoneOffset)) {
+    user.preferences.timezoneOffsetAtLastCron = user.preferences.timezoneOffset;
+  }
  if (user.items.lastDrop.count > 0) {
    user.items.lastDrop.count = 0;
  }