Seth Call d63d3ba1b2 * wip		2015-07-10 10:49:48 -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	* affiliate program in place VRFS-3030	2015-05-28 08:20:14 -05:00
features	Merge branch 'develop' into feature/new_session	2015-07-08 12:34:06 -05:00
files	Merge and fix	2015-04-16 12:16:09 -05: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 branch 'develop' into feature/new_session	2015-07-08 12:34:06 -05:00
managers	Merge with develop.	2015-06-03 14:22:21 -05:00
requests	Merge with develop.	2015-06-03 14:22:21 -05:00
support	* wip	2015-07-10 10:49:48 -05:00
factories.rb	VRFS-3190 : Merge with latest develop branch	2015-06-16 12:23:57 -05:00
spec_db.rb	wip	2014-05-29 14:34:18 -05:00
spec_helper.rb	Merge and fix	2015-04-16 12:16:09 -05: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