Steven Miers 5f953d1b19 VRFS-2830 : Merge / manual fix		2015-03-25 10:56:24 -05:00
..
assets/images	* VRFS-783 - the filepicker service behaves different; workaround added. test attempted, but does not work because phantomjs crashes	2013-10-22 14:27:20 -05:00
controllers	* fix two tests needing new method of uploading	2015-03-24 15:07:33 -05:00
features	VRFS-2830 : Merge / manual fix	2015-03-25 10:56:24 -05:00
files	VRFS-2782 : Add api controller test for multiple bitrates. Fix bug found as a result.	2015-03-04 16:13:58 -06:00
fixtures/files	merging jam-web into web	2013-09-15 18:04:37 +00:00
helpers	* fix issues with music session 'other count' and tests	2014-11-09 10:59:31 -06:00
javascripts	Merge with develop	2015-02-27 11:51:45 -06:00
managers	VRFS-2785 : Factory recurly client into ruby project. Fix references and specs as appropriate.	2015-02-19 01:06:50 -06:00
requests	* merge in faster score searches (VRFS-2202)	2014-09-30 10:51:23 -05:00
support	* wip	2015-03-20 08:48:00 -05:00
factories.rb	* wip	2015-03-20 08:48:00 -05:00
spec_db.rb	wip	2014-05-29 14:34:18 -05:00
spec_helper.rb	* merged	2015-02-15 22:01:06 -06:00
teaspoon_env.rb	* merged	2014-09-22 14:20:58 -05:00
testing_oauth.txt	VRFS-2540 : Fix. Remove usage of recaptcha; refactor nocaptcha check in google_client (was youtube_client). Fix and add tests.	2015-01-11 19:17:18 -06:00