Sabe Jones 95bb5be22a Merge branch 'develop' into armoire ...

Conflicts:
	common/dist/sprites/habitrpg-shared.css
	common/dist/sprites/spritesmith0.css
	common/dist/sprites/spritesmith0.png
	common/dist/sprites/spritesmith1.css
	common/dist/sprites/spritesmith1.png
	common/dist/sprites/spritesmith2.css
	common/dist/sprites/spritesmith2.png
	common/dist/sprites/spritesmith3.css
	common/dist/sprites/spritesmith3.png
	common/dist/sprites/spritesmith4.css
	common/dist/sprites/spritesmith4.png
	common/dist/sprites/spritesmith5.css
	common/dist/sprites/spritesmith5.png
	common/dist/sprites/spritesmith6.css
	common/dist/sprites/spritesmith6.png

2015-06-04 15:49:06 -05:00

..

authCtrl.js

feat(analytics): Mixpanel implementation WIP

2015-05-29 16:22:35 -05:00

challengesCtrl.js

Adjust NotGonnaGitUs's PR

2015-05-24 21:22:40 -05:00

filtersCtrl.js

Fixes more bad git-fu. New tag creation works now.

2015-03-31 23:23:24 -04:00

footerCtrl.js

feat(analytics): "motivate yourself" 3 variants @lemoness

2015-05-04 15:31:00 -04:00

groupsCtrl.js

feat(analytics): Mixpanel implementation WIP

2015-05-29 16:22:35 -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

Final adjustments to PR #5114

2015-06-04 08:48:05 -05:00

inventoryCtrl.js

feat(analytics): Mixpanel implementation WIP

2015-05-29 16:22:35 -05:00

notificationCtrl.js

feat(Armoire): Improved counter

2015-06-04 15:45:55 -05:00

rootCtrl.js

feat(Armoire): Improved counter

2015-06-04 15:45:55 -05:00

settingsCtrl.js

change coupon route in angular router to promo

2015-05-08 21:24:57 -05:00

tasksCtrl.js

feat(Armoire): Improved counter

2015-06-04 15:45:55 -05:00

userCtrl.js

fix(interactive-tour): cleanup steps when navigating chapters, don't use tour.restart()

2015-03-10 15:40:19 -06:00