Kai/habitica
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'release' into develop

Browse Source
This commit is contained in:
Sabe Jones
2020-12-17 12:44:06 -06:00
parent 8f05fc250a 75f198789b
commit 7f1d6ffef0
4 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
website/common/script/content/bundles.js
+1 -3
View File
@@ -3,9 +3,7 @@ import find from 'lodash/find';
import t from './translation';
import { EVENTS } from './constants';
const CURRENT_EVENT = find(EVENTS, event => {
moment().isBetween(event.start, event.end);
});
const CURRENT_EVENT = find(EVENTS, event => moment().isBetween(event.start, event.end));
/*
---------------------------------------------------------------
website/common/script/content/quests.js
+1 -3
View File
@@ -9,9 +9,7 @@ import {
USER_CAN_OWN_QUEST_CATEGORIES,
} from './constants';
const CURRENT_EVENT = find(EVENTS, event => {
moment().isBetween(event.start, event.end);
});
const CURRENT_EVENT = find(EVENTS, event => moment().isBetween(event.start, event.end));
const userCanOwnQuestCategories = USER_CAN_OWN_QUEST_CATEGORIES;
const quests = {