Seth Call 472c86497d * fix syntax error		2015-07-20 14:04:16 -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	Merge feature/calendaring branch:	2015-07-06 15:34:27 -05:00
features	* fix syntax error	2015-07-20 14:04:16 -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 conflict from feature/new_session (VRFS-3283)	2015-07-15 10:04:45 -05:00
managers	Merge with develop.	2015-06-03 14:22:21 -05:00
requests	merge conflict from feature/new_session (VRFS-3283)	2015-07-15 10:04:45 -05:00
support	* trying to fix these find session test failures	2015-07-20 13:52:36 -05:00
factories.rb	* fixing feed_spec	2015-07-17 07:18:27 -05:00
spec_db.rb	wip	2014-05-29 14:34:18 -05:00
spec_helper.rb	* add intermittent:true to avoid certain tests	2015-07-20 12:56:47 -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