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
2019-03-15 10:37:22 -05:00
parent f1b5ce9c66 1d81916674
commit dae37c17d6
5 changed files with 4 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
package-lock.json
Generated
+1 -1
View File
@@ -1,6 +1,6 @@
{
"name": "habitica",
"version": "4.87.2",
"version": "4.87.3",
"lockfileVersion": 1,
"requires": true,
"dependencies": {
package.json
+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.87.2",
"version": "4.87.3",
"main": "./website/server/index.js",
"dependencies": {
"@google-cloud/trace-agent": "^3.5.2",
test/common/ops/buy/purchase.js
+1 -1
View File
@@ -13,7 +13,7 @@ import forEach from 'lodash/forEach';
import moment from 'moment';
describe('shared.ops.purchase', () => {
const SEASONAL_FOOD = 'Pie_Base';
const SEASONAL_FOOD = 'Meat';
let user;
let goldPoints = 40;
let analytics = {track () {}};
website/common/script/content/index.js
+1 -1
View File
@@ -372,7 +372,7 @@ api.mountInfo = stable.mountInfo;
// For seasonal events, change this constant:
const FOOD_SEASON = 'Pie';
const FOOD_SEASON = 'Normal';
api.food = {
Meat: {
website/server/models/user/hooks.js
-19
View File
@@ -124,28 +124,9 @@ function _setUpNewUser (user) {
let taskTypes;
let iterableFlags = user.flags.toObject();
/* eslint-disable camelcase */
user.items.quests.dustbunnies = 1;
user.purchased.background.violet = true;
user.preferences.background = 'violet';
user.items.gear.owned.shield_special_piDay = true;
user.items.gear.equipped.shield = 'shield_special_piDay';
user.items.gear.costume.shield = 'shield_special_piDay';
user.items.gear.owned.head_special_piDay = true;
user.items.gear.equipped.head = 'head_special_piDay';
user.items.gear.costume.head = 'head_special_piDay';
user.items.food.Pie_Skeleton = 1;
user.items.food.Pie_Base = 1;
user.items.food.Pie_CottonCandyBlue = 1;
user.items.food.Pie_CottonCandyPink = 1;
user.items.food.Pie_Shade = 1;
user.items.food.Pie_White = 1;
user.items.food.Pie_Golden = 1;
user.items.food.Pie_Zombie = 1;
user.items.food.Pie_Desert = 1;
user.items.food.Pie_Red = 1;
user.migration = '20190314_pi_day';
/* eslint-enable camelcase */
const testGroup = Math.random();