Tyler Renelle f8f8a1334b Merge branch 'develop' into classes ...

Conflicts:
	views/options/inventory/stable.jade

2013-12-07 20:23:26 -07:00

..

inventory

Merge branch 'develop' into classes

2013-12-07 20:23:26 -07:00

social

grunt-spritesmith contrib gear habitrpg-shared#69d248f

2013-12-05 15:47:08 -07:00

admin.jade

admin: add list of contributors. Add contributor.contributions, textarea for links of contributions for tracking. move all admin stuff to dedicated controller & routes

2013-11-15 19:27:23 -08: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

classes: small tweaks

2013-12-07 11:31:11 -07:00

settings.jade

support for xml and json export of all user data

2013-11-25 08:06:27 -08:00