Merge branch 'release' into develop

This commit is contained in:
Sabe Jones
2020-12-17 12:44:06 -06:00
4 changed files with 4 additions and 8 deletions
+1 -1
View File
@@ -1,6 +1,6 @@
{
"name": "habitica",
"version": "4.175.3",
"version": "4.175.5",
"lockfileVersion": 1,
"requires": true,
"dependencies": {
+1 -1
View File
@@ -1,7 +1,7 @@
{
"name": "habitica",
"description": "A habit tracker app which treats your goals like a Role Playing Game.",
"version": "4.175.3",
"version": "4.175.5",
"main": "./website/server/index.js",
"dependencies": {
"@babel/core": "^7.12.10",
+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));
/*
---------------------------------------------------------------
+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 = {