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

Merge branch 'develop' into classes

Browse Source 
Conflicts:
	views/options/inventory/stable.jade
This commit is contained in:
Tyler Renelle
2013-12-07 20:23:26 -07:00
parent 59f8727cbf a85baa2725
commit f8f8a1334b
10 changed files with 80 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/controllers/groups.js
+1 -2
View File
@@ -16,8 +16,7 @@ var api = module.exports;
------------------------------------------------------------------------
*/
var itemFields = 'items.armor items.head items.shield items.weapon items.currentPet items.pets'; // TODO just send down count(items.pets) for better performance
var partyFields = 'profile preferences stats achievements party backer contributor flags.rest auth.timestamps ' + itemFields;
var partyFields = 'profile preferences stats achievements party backer contributor flags.rest auth.timestamps items';
var nameFields = 'profile.name';
var challengeFields = '_id name';
var guildPopulate = {path: 'members', select: nameFields, options: {limit: 15} };