krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-17 14:47:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

MErged in develop

Browse Source
This commit is contained in:
Keith Holliday
2017-05-10 15:51:50 -06:00
parent 59fb32ea2e 727cdc9402
commit 850f332ddc
199 changed files with 1150 additions and 698 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
website/common/script/cron.js
View File

@@ -33,6 +33,7 @@ function sanitizeOptions (o) {
let timezoneOffset;
let timezoneOffsetDefault = Number(moment().zone());
if (isFinite(o.timezoneOffsetOverride)) {
timezoneOffset = Number(o.timezoneOffsetOverride);
} else if (Number.isFinite(o.timezoneOffset)) {
@@ -101,6 +102,7 @@ export function shouldDo (day, dailyTask, options = {}) {
// The time portion of the Start Date is never visible to or modifiable by the user so we must ignore it.
// Therefore, we must also ignore the time portion of the user's day start (startOfDayWithCDSTime), otherwise the date comparison will be wrong for some times.
// NB: The user's day start date has already been converted to the PREVIOUS day's date if the time portion was before CDS.
let startDate = moment(dailyTask.startDate).zone(o.timezoneOffset).startOf('day');
if (startDate > startOfDayWithCDSTime.startOf('day')) {