Merge branch 'hotfix/recording_fix' into develop

ruby/lib/jam_ruby/models/mix.rb

@@ -141,12 +141,14 @@ module JamRuby
 
       recording.recorded_tracks.each do |recorded_track|
         manifest["files"] << { "filename" => recorded_track.sign_url(one_day), "codec" => "vorbis", "offset" => 0 }
-        mix_params << { "level" => 1.0, "balance" => 0 }
+        mix_params << { "level" => 100, "balance" => 0 }
+        # change to 1.0 level later
       end
 
       recording.recorded_backing_tracks.each do |recorded_backing_track|
         manifest["files"] << { "filename" => recorded_backing_track.sign_url(one_day), "codec" => "vorbis", "offset" => 0 }
-        mix_params << { "level" => 1.0, "balance" => 0 }
+        mix_params << { "level" => 100, "balance" => 0 }
+        # change to 1.0 level later
       end
 
       recording.recorded_jam_track_tracks.each do |recorded_jam_track_track|

web/app/assets/javascripts/layout.js

@@ -215,14 +215,6 @@
           top: childLayout.top,
           left: childLayout.left
         }, opts.animationDuration);
-
-        if($(this).is('.feed')) {
-          $('#jamblaster-notice').animate({
-            width: childLayout.width,
-            bottom: '102%',
-            left: childLayout.left
-          }, opts.animationDuration)
-        }
       });
     }
 

web/app/assets/stylesheets/client/jamkazam.css.scss

@@ -593,16 +593,4 @@ body.jam .icheckbox_minimal {
     display:inline-block;
   }
 
-}
-
-#jamblaster-notice {
-    position:absolute;
-    width:100%;
-    bottom:105%;
-    border-color:#ED3618;
-    border-style:solid;
-    border-width:1px;
-    padding:10px;
-    text-align:center;
-    @include border_box_sizing;
 }

web/app/views/clients/_home.html.slim

@@ -1,8 +1,4 @@
 .screen layout="screen" layout-id="home"
-  -if Rails.configuration.show_jamblaster_notice
-    #jamblaster-notice
-      a href='https://www.youtube.com/watch?v=gAJAIHMyois' rel="external"
-        span Check out the amazing new JamBlaster, and learn how it can improve your sessions!
   / Layout is different if jam_tracks tile available:
   -jamtracks=Rails.configuration.jam_tracks_available
   -if (jamtracks) 

web/config/application.rb

@@ -314,7 +314,6 @@ if defined?(Bundler)
     config.influxdb_ignored_environments = ENV["INFLUXDB_ENABLED"] == '1' ? ['test', 'cucumber'] : ['test', 'cucumber', 'development']
 
     config.allow_spikes = false
-    config.show_jamblaster_notice = true
     config.show_jamblaster_kickstarter_link = true
     config.metronome_available = true
     config.backing_tracks_available = true