jam-cloud/web/lib
Seth Call aed848c507 Merge branch 'develop' into feature/jam_tracks
Conflicts:
	db/manifest
	pb/src/client_container.proto
	ruby/lib/jam_ruby.rb
	web/config/environments/development.rb
	web/config/environments/test.rb
2015-01-04 09:31:33 -06:00
..
assets merging jam-web into web 2013-09-15 18:04:37 +00:00
jam_web merging jam-web into web 2013-09-15 18:04:37 +00:00
middlewares * fix broken tests because of removal of diagnostics, and fix bad logging pattern 2014-12-31 23:17:47 -06:00
tasks * fixes for multiple issues: VRFS-2587 - no forking in resque, VRFS-2586 - fix influxdb client's shutdown behavior, VRFS-2585 - firefox cache busting 2014-12-31 20:39:22 -06:00
js_connect.rb * VRFS-1493 - redirect to forums implemented, VRFS-1507 (signin url preserved on postback failure) 2014-03-21 03:23:33 +00:00
max_mind_manager.rb * VRFS-1403 - maxmind single step import done 2014-07-19 21:11:16 -05:00
music_session_manager.rb fix more session join/leave bugs 2014-09-14 15:12:25 -04:00
recurly_client.rb Address test failure by actually creating the jam_track_right. 2014-12-03 13:48:14 -06:00
user_manager.rb * VRFS-1403 - maxmind single step import done 2014-07-19 21:11:16 -05:00
you_tube_client.rb VRFS-2588 : YouTube client, remove logging 2014-12-31 19:35:20 -06:00