From a3b59d925478f4a9fdffc1de9edecca3f7f9b3e6 Mon Sep 17 00:00:00 2001 From: Sabe Jones Date: Fri, 8 May 2020 13:52:04 -0500 Subject: [PATCH 1/2] 4.141.1 --- package-lock.json | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index b4514dd4d8..3a7328c681 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "habitica", - "version": "4.141.0", + "version": "4.141.1", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 1250b25a9a..3ce72544ab 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "habitica", "description": "A habit tracker app which treats your goals like a Role Playing Game.", - "version": "4.141.0", + "version": "4.141.1", "main": "./website/server/index.js", "dependencies": { "@babel/core": "^7.9.6", From 6658abbcd99e55f2001f3ca05781b8aca58c796b Mon Sep 17 00:00:00 2001 From: Sabe Jones Date: Mon, 11 May 2020 14:02:10 -0500 Subject: [PATCH 2/2] fix(events): Spring Fling lingering --- website/common/script/content/constants.js | 2 +- website/common/script/content/quests.js | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/website/common/script/content/constants.js b/website/common/script/content/constants.js index 215a5a1086..81dc6aa33c 100644 --- a/website/common/script/content/constants.js +++ b/website/common/script/content/constants.js @@ -39,7 +39,7 @@ export const EVENTS = { summer2019: { start: '2019-06-18', end: '2019-08-02' }, fall2019: { start: '2019-09-24', end: '2019-11-02' }, winter2020: { start: '2019-12-19', end: '2020-02-02' }, - spring2020: { start: '2019-03-17', end: '2020-05-02' }, + spring2020: { start: '2020-03-17', end: '2020-05-02' }, }; export const SEASONAL_SETS = { diff --git a/website/common/script/content/quests.js b/website/common/script/content/quests.js index a5660a76e3..895cd98247 100644 --- a/website/common/script/content/quests.js +++ b/website/common/script/content/quests.js @@ -3621,6 +3621,9 @@ each(quests, (v, key) => { defaults(v, { key, canBuy () { + if (v.event) { + return moment().isBetween(v.event.start, v.event.end); + } return true; }, });