Sabe Jones ad347090c3 Merge remote-tracking branch 'origin/pr/5968' into develop ...

Conflicts:
	website/views/options/social/challenge-box.jade

2015-11-26 13:33:33 -05:00

..

controllers

Merge remote-tracking branch 'origin/pr/5968' into develop

2015-11-26 13:33:33 -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

typo

2015-10-04 13:34:51 +01: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