Sabe Jones 6f85fcfde2 Merge branch 'develop' into sabrecat/party-page ...

Conflicts:
	common/dist/sprites/habitrpg-shared.css
	common/dist/sprites/spritesmith0.png
	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

2015-09-01 13:40:20 -05:00

..

controllers

Fix api and karma test

2015-08-24 18:07:21 -05:00

directives

Merge branch 'TheHollidayInn-directives-test-task-focus' into develop

2015-08-31 20:36:07 -05:00

filters

Adjustments to PR#5494

2015-06-27 22:21:50 -05:00

mocks

Reorganize karma.conf

2015-08-22 21:41:13 -05:00

services

Merge branch 'develop' into sabrecat/party-page

2015-08-28 23:06:00 -05:00

app.js

Switch over to using sinon.sandbox in karma specs

2015-06-20 14:48:38 -05:00

chatServicesSpec.js

Make phrasing of tests consistent

2015-05-30 12:42:31 -05:00

specHelper.js

Adjust newUser spec helper

2015-08-14 23:55:36 -05:00

translations.js

remove commented-out default task code and unused default task locale strings - fixes https://github.com/HabitRPG/habitrpg/issues/5631#issuecomment-130619901 (comment by GitHubSphinx)

2015-08-15 13:23:42 +10:00