Steven Miers b2219da522 Merge feature/video_mvp to develop and resolve conflicts.		2014-11-03 18:28:28 -06: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	VRFS-2427 fixed broken test	2014-11-02 14:26:56 -05:00
features	Merge feature/video_mvp to develop and resolve conflicts.	2014-11-03 18:28:28 -06:00
files	Merge feature/video_mvp to develop and resolve conflicts.	2014-11-03 18:28:28 -06:00
fixtures/files	merging jam-web into web	2013-09-15 18:04:37 +00:00
helpers	* VRFS-1764 - fix for content falling out of bounds; VRFS-1762 - tracking audio latency now; need to still make sure this works with new create session flow when it arrives	2014-06-09 15:43:16 -05:00
javascripts	* fix my sorry teaspoon tests	2014-11-03 15:45:29 -06:00
managers	* VRFS-1403 - maxmind single step import done	2014-07-19 21:11:16 -05:00
requests	* merge in faster score searches (VRFS-2202)	2014-09-30 10:51:23 -05:00
support	Merge feature/video_mvp to develop and resolve conflicts.	2014-11-03 18:28:28 -06:00
factories.rb	Merge feature/video_mvp to develop and resolve conflicts.	2014-11-03 18:28:28 -06:00
spec_db.rb	wip	2014-05-29 14:34:18 -05:00
spec_helper.rb	Merge feature/video_mvp to develop and resolve conflicts.	2014-11-03 18:28:28 -06:00
teaspoon_env.rb	* merged	2014-09-22 14:20:58 -05:00
testing_oauth.txt	Merge feature/video_mvp to develop and resolve conflicts.	2014-11-03 18:28:28 -06:00