Anthony Davis 26e4a2b72d Merge remote-tracking branch 'origin/develop' into develop		2014-05-06 22:35:27 -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	change join_the_session api to add tracks; move the impl to connection; a few bug fixes	2014-04-30 22:01:43 -05:00
features	VRFS-1651 - periodic real test of www	2014-05-06 22:35:00 -05:00
fixtures/files	merging jam-web into web	2013-09-15 18:04:37 +00:00
helpers	change join_the_session api to add tracks; move the impl to connection; a few bug fixes	2014-04-30 22:01:43 -05:00
javascripts	* VRFS-813 -most all frontend changes needed for start/stop recordings	2013-11-03 14:55:55 -06:00
managers	VRFS-1576 affiliate_partner model	2014-04-20 22:54:49 +00:00
requests	VRFS-1577 fixing specs	2014-05-06 07:20:14 +00:00
support	VRFS-1651 - periodic real test of www	2014-05-06 22:35:00 -05:00
factories.rb	a small cleanup of connection fields and fix broken tests	2014-05-02 13:44:29 -05:00
spec_db.rb	merging jam-web into web	2013-09-15 18:04:37 +00:00
spec_helper.rb	VRFS-1651 - periodic real test of www	2014-05-06 22:35:00 -05:00