Kai/habitica
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' into api-v3

Browse Source
This commit is contained in:
Matteo Pagliazzi
2015-11-27 17:05:29 +01:00
parent 99f6ac8f1a 9f53365648
commit 5fa514b6fa
56 changed files with 3747 additions and 3338 deletions
Download Patch File Download Diff File Expand all files Collapse all files
website/src/controllers/api-v2/groups.js
+1 -1
View File
@@ -524,7 +524,7 @@ api.leave = function(req, res, next) {
}
if (group.quest && group.quest.active && group.quest.members && group.quest.members[user._id]) {
return res.json(403, 'You cannot leave party during an active quest. Please leave the quest first');
return res.json(403, 'You cannot leave party during an active quest. Please leave the quest first.');
}
}
website/src/models/user.js
+10
View File
@@ -164,12 +164,22 @@ export let schema = new Schema({
inviteParty: {type: Boolean, default: false},
},
ios: {
<<<<<<< HEAD
addTask: {type: Boolean, default: false},
editTask: {type: Boolean, default: false},
deleteTask: {type: Boolean, default: false},
filterTask: {type: Boolean, default: false},
groupPets: {type: Boolean, default: false},
},
=======
addTask: {type: Boolean, 'default': false},
editTask: {type: Boolean, 'default': false},
deleteTask: {type: Boolean, 'default': false},
filterTask: {type: Boolean, 'default': false},
groupPets: {type: Boolean, 'default': false},
inviteParty: {type: Boolean, 'default': false},
}
>>>>>>> develop
},
dropsEnabled: {type: Boolean, default: false},
itemsEnabled: {type: Boolean, default: false},