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

Merge branch 'release' into develop

Browse source
This commit is contained in:
Sabe Jones 2018-03-08 00:30:37 +00:00
commit 37650ca674
3 changed files with 2 additions and 4 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", "name": "habitica",
"version": "4.29.3", "version": "4.29.4",
"lockfileVersion": 1, "lockfileVersion": 1,
"requires": true, "requires": true,
"dependencies": { "dependencies": {

2
package.json
View file

@ -1,7 +1,7 @@
{ {
"name": "habitica", "name": "habitica",
"description": "A habit tracker app which treats your goals like a Role Playing Game.", "description": "A habit tracker app which treats your goals like a Role Playing Game.",
"version": "4.29.3", "version": "4.29.4",
"main": "./website/server/index.js", "main": "./website/server/index.js",
"greenkeeper": { "greenkeeper": {
"ignore": [ "ignore": [

2
website/server/models/user/hooks.js
View file

@ -140,8 +140,6 @@ function _setUpNewUser (user) {
user.items.quests.dustbunnies = 1; user.items.quests.dustbunnies = 1;
user.purchased.background.violet = true; user.purchased.background.violet = true;
user.preferences.background = 'violet'; user.preferences.background = 'violet';
user.items.gear.owned.armor_special_birthday = true; // eslint-disable-line camelcase
user.items.gear.equipped.body = 'armor_special_birthday';
if (user.registeredThrough === 'habitica-web') { if (user.registeredThrough === 'habitica-web') {
taskTypes = ['habit', 'daily', 'todo', 'reward', 'tag']; taskTypes = ['habit', 'daily', 'todo', 'reward', 'tag'];