sudoxreboot/habitica
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica.git synced 2026-07-13 23:42:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'release' into develop

Browse source
This commit is contained in:
Sabe Jones 2020-05-11 14:02:38 -05:00
commit 721ae0872f
4 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
package-lock.json generated
View file

@ -1,6 +1,6 @@
{
"name": "habitica",
"version": "4.141.0",
"version": "4.141.1",
"lockfileVersion": 1,
"requires": true,
"dependencies": {

2
package.json
View file

@ -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",

2
website/common/script/content/constants.js
View file

@ -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 = {

3
website/common/script/content/quests.js
View file

@ -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;
},
});