Merge branch 'release' into develop

This commit is contained in:
Sabe Jones 2021-03-15 15:45:34 -05:00
commit dd5d5bf5fc
4 changed files with 4 additions and 8 deletions

2
package-lock.json generated
View file

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

View file

@ -1,7 +1,7 @@
{
"name": "habitica",
"description": "A habit tracker app which treats your goals like a Role Playing Game.",
"version": "4.184.2",
"version": "4.184.3",
"main": "./website/server/index.js",
"dependencies": {
"@babel/core": "^7.12.10",

View file

@ -160,7 +160,7 @@ const bundles = {
'yarn',
],
canBuy () {
return moment().isBetween('2019-06-10', '2019-07-03');
return moment().isBetween('2021-03-16T08:00-05:00', '2021-03-31T20:00-05:00');
},
type: 'quests',
value: 7,

View file

@ -8,14 +8,10 @@ const gemsPromo = {
'84gems': 125,
};
// IMPORTANT: The end date should be one to two days AFTER the actual end of
// the event, to allow people in different timezones to still buy the
// event gear up until at least the actual end of the event.
// Unless we want a precise ending, for example during a Gems sale / promotion.
export const EVENTS = {
noCurrentEvent2021: {
start: '2021-02-16T08:00-05:00',
end: '2021-03-07T08:00-05:00',
end: '2021-03-23T08:00-05:00',
season: 'normal',
},
valentines2021: {