Merge branch 'develop' into api-v3

This commit is contained in:
Matteo Pagliazzi
2016-03-30 23:40:00 +02:00
26 changed files with 8755 additions and 8720 deletions

View File

@@ -54,6 +54,7 @@ let beforeAfter = (options = {}) => {
before.preferences.dayStart = after.preferences.dayStart = options.dayStart;
}
before.preferences.timezoneOffset = after.preferences.timezoneOffset = options.timezoneOffset || moment().zone();
before.preferences.timezoneOffsetAtLastCron = after.preferences.timezoneOffsetAtLastCron = before.preferences.timezoneOffset;
if (options.limitOne) {
before[`${options.limitOne}s`] = [before[`${options.limitOne}s`][0]];
after[`${options.limitOne}s`] = [after[`${options.limitOne}s`][0]];