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

Conflicts:
	views/options/inventory/stable.jade

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

..

authServices.js

initial grunt support, gzip enabled

2013-09-06 19:19:43 +02:00

challengeServices.js

[#1716] use ui-router to collapse challenge participants (WIP)

2013-11-01 23:46:14 -07:00

groupServices.js

[#1710] fix to party-in-header

2013-11-01 20:32:43 -07:00

guideServices.js

classes & grunt-spritesmith: NPCs habitrpg-shared#85164c9

2013-12-04 16:52:06 -07:00

memberServices.js

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

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

notificationServices.js

added growl style notification for errors

2013-10-30 19:29:46 +01:00

sharedServices.js

initial grunt support, gzip enabled

2013-09-06 19:19:43 +02:00

userServices.js

Merge branch 'develop' into classes

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