Bert Owen 00d06fe6f2 * merge		2014-05-22 16:07:17 +08: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	* all tests pass; but need to now rename music session tables to match class names...	2014-05-06 16:17:26 -05:00
features	* VRFS-1730 - websocket on web layout	2014-05-20 00:33:43 -04:00
fixtures/files	merging jam-web into web	2013-09-15 18:04:37 +00:00
helpers	* all tests pass; but need to now rename music session tables to match class names...	2014-05-06 16:17:26 -05:00
javascripts	* VRFS-813 -most all frontend changes needed for start/stop recordings	2013-11-03 14:55:55 -06:00
managers	* renaming of tables in	2014-05-06 17:50:41 -05:00
requests	* merge	2014-05-22 16:07:17 +08:00
support	* VRFS-1730 - websocket on web layout	2014-05-20 00:33:43 -04:00
factories.rb	* renaming of tables in	2014-05-06 17:50:41 -05:00
spec_db.rb	merging jam-web into web	2013-09-15 18:04:37 +00:00
spec_helper.rb	* merging manifest	2014-05-07 05:17:17 -05:00