Steven Miers 433fe0be74 Initial merge and manual conflict and fix for tests.		2014-11-04 14:55:12 -06:00
..
app_config.rb	* VRFS-821 many changes for upload apis, mostly	2013-12-17 19:44:21 +00:00
desk_multipass.rb	merging jam-ruby into ruby	2013-09-15 18:04:03 +00:00
em_helper.rb	* a fix for race condition that can hang eventmachine startup	2014-04-30 03:03:37 +00:00
google_analytics_tracker.rb	* commenting 'Measurement Protocol' into related classes	2014-04-24 02:27:31 +00:00
html_sanitize.rb	* VRFS-2064 - stop cycle in network test; VRFS-2062 - don't store HTML in user-inputs	2014-08-18 20:41:44 -05:00
ip.rb	* VRFS-1403 - maxmind single step import done	2014-07-19 21:11:16 -05:00
json_validator.rb	* more websocket/heartbeat fixes	2014-04-30 03:01:28 +00:00
module_overrides.rb	* VRFS-773 - isp page avaible	2013-10-16 11:20:37 -05:00
nav.rb	* show private recording on recording landing page to someone who was in the session	2014-10-29 07:22:45 -05:00
profanity.rb	* all tests pass; but need to now rename music session tables to match class names...	2014-05-06 16:17:26 -05:00
s3_manager.rb	Initial merge and manual conflict and fix for tests.	2014-11-04 14:55:12 -06:00
s3_manager_mixin.rb	VRFS-2094 wip notation upload bug fixes	2014-09-08 09:13:20 -04:00
s3_util.rb	* VRFS-821 many changes for upload apis, mostly	2013-12-17 19:44:21 +00:00