Tyler Renelle 928f7cfdd7 Merge remote-tracking branch 'origin/sabe/rebirth' into develop ...

Conflicts:
	src/models/user.js
	views/shared/modals/index.jade

2013-12-31 08:04:51 -07:00

..

inventory

Merge remote-tracking branch 'origin/sabe/rebirth' into develop

2013-12-31 08:04:51 -07:00

social

fix #2155 . Since quest.leader is new, doesn't apply to quests started

2013-12-28 21:54:25 -07:00

admin.jade

admin: add section in admin page for manually granting gems and

2013-12-25 20:33:21 -07:00

index.jade

contrib: add Admin page to update contributor status. Start migrating from User.backer => User.contributor

2013-11-06 15:59:56 -08:00

profile.jade

RPG demystification, cont'd

2013-12-29 20:58:35 -06:00

settings.jade

checklists: inline by default, add help popover

2013-12-30 14:40:07 -07:00