Sabe Jones 0f31873262 Merge branch 'develop' into sabrecat/party-page ...

Conflicts:
	common/dist/sprites/habitrpg-shared.css
	common/dist/sprites/spritesmith1.css
	common/dist/sprites/spritesmith1.png
	common/dist/sprites/spritesmith4.css
	common/dist/sprites/spritesmith4.png
	website/views/options/social/index.jade

2015-08-14 11:23:35 -05:00

..

authCtrl.js

Merge branch 'develop' into analytics-service-server-side

2015-07-19 10:13:34 -05:00

challengesCtrl.js

Add buttons to challenge participant modal

2015-08-03 08:40:33 -05:00

filtersCtrl.js

Initialize user.filterQuery as undefined

2015-06-13 14:09:08 -05:00

footerCtrl.js

feat(party): Conclude invite experiment

2015-07-16 11:22:19 -05:00

groupsCtrl.js

WIP(party-page): Roll back to 1x invites

2015-08-12 11:29:36 -05:00

hallCtrl.js

scroll to top and load hero; add tests for new behavior.

2015-04-10 23:51:34 -05:00

headerCtrl.js

WIP(event): Summer Splash cont'd

2015-07-08 16:13:23 -05:00

inventoryCtrl.js

Refactor how cards are recieved

2015-08-12 08:36:57 -05:00

memberModalCtrl.js

Remove countPets and countMounts from codebase

2015-07-20 08:11:00 -05:00

menuCtrl.js

feat(greeting-cards): Thank-You & Greets

2015-08-13 16:58:31 -05:00

notificationCtrl.js

feat(mystery): July 2015 goodies

2015-07-23 12:05:13 -05:00

rootCtrl.js

initialise buyThis message variable at point of declaration - fixes https://github.com/HabitRPG/habitrpg/issues/5770

2015-08-12 21:26:51 +10:00

settingsCtrl.js

Refactor inventory ctrl variables

2015-07-20 12:51:10 -05:00

tasksCtrl.js

Split out potion and armoire out of the itemStore object

2015-08-12 18:53:49 -05:00

userCtrl.js

Remove countPets and countMounts from codebase

2015-07-20 08:11:00 -05:00