Merge branch 'develop' into feature/mobile

admin/app/admin/affiliate_traffic_totals.rb

@@ -23,7 +23,7 @@ ActiveAdmin.register JamRuby::AffiliateTrafficTotal, :as => 'Affiliate Daily Sta
     # default_actions # use this for all view/edit/delete links
 
     column 'Day' do |oo| oo.day end
-    column 'Partner' do |oo| link_to(oo.affiliate_partner, oo.affiliate_partner.admin_url, {:title => oo.affiliate_partner.display_name}) end
+    column 'Partner' do |oo| link_to(oo.affiliate_partner.display_name, oo.affiliate_partner.admin_url, {:title => oo.affiliate_partner.display_name}) end
     column 'Signups' do |oo| oo.signups end
     column 'Visits' do |oo| oo.visits end
 

admin/app/admin/affiliate_users.rb

@@ -2,9 +2,12 @@ ActiveAdmin.register JamRuby::User, :as => 'Referrals' do
 
   menu :label => 'Referrals', :parent => 'Affiliates'
 
+  config.sort_order = 'created_at DESC'
   config.batch_actions = false
   config.clear_action_items!
-  config.filters = false
+  config.filters = true
+
+  filter :affiliate_referral
 
   index do
     column 'User' do |oo| link_to(oo.name, oo.admin_url, {:title => oo.name}) end

ruby/lib/jam_ruby/models/affiliate_partner.rb

@@ -55,7 +55,7 @@ class JamRuby::AffiliatePartner < ActiveRecord::Base
   end
 
   def admin_url
-    APP_CONFIG.admin_root_url + "/admin/affiliates/" + id
+    APP_CONFIG.admin_root_url + "/admin/affiliates/#{id}"
   end
 
   # used by admin
@@ -477,4 +477,8 @@ class JamRuby::AffiliatePartner < ActiveRecord::Base
   def affiliate_query_params
     AffiliatePartner::AFFILIATE_PARAMS + self.id.to_s
   end
+
+  def to_s
+    display_name
+  end
 end

web/README.md

@@ -1,4 +1,3 @@
-
 Jasmine Javascript Unit Tests
 =============================
 

web/app/assets/javascripts/react-components/JamTrackLandingScreen.js.jsx.coffee

@@ -26,7 +26,7 @@ rest = context.JK.Rest()
     else
       howTo = `<div className="no-free-jamtrack">
         <span>
-          The fastest way to start playing with your JamTracks is to open them below and use our <a href="https://jamkazam.desk.com/customer/en/portal/articles/2138903-using-custom-mixes-to-slow-tempo-change-pitch" onClick={this.customMixHelpClicked}>custom mix feature</a> to play them back in your browser. To access the full set of JamTrack features, <a href="/downloads" rel="external" onClick={this.downloadsClicked}>install our free app</a>. To learn more about all you can do with JamTracks, check out our <a href="https://jamkazam.desk.com/customer/en/portal/articles/2124663-playing-with-jamtracks" onClick={this.jamTrackHelpClicked}>JamTracks help docs</a>.
+          The fastest way to start playing with your JamTracks is to open them below and use our <a href="https://jamkazam.desk.com/customer/portal/articles/2166273-playing-your-jamtracks-in-a-browser" onClick={this.customMixHelpClicked}>custom mix feature</a> to play them back in your browser. To access the full set of JamTrack features, <a href="/downloads" rel="external" onClick={this.downloadsClicked}>install our free app</a>. To learn more about all you can do with JamTracks, check out our <a href="https://jamkazam.desk.com/customer/en/portal/articles/2124663-playing-with-jamtracks" onClick={this.jamTrackHelpClicked}>JamTracks help docs</a>.
         </span>
       </div>`
 

web/app/assets/javascripts/react-components/stores/JamTrackPlayerStore.js.coffee

@@ -55,7 +55,7 @@ BrowserMediaActions = @BrowserMediaActions
           @childWindow.close()
 
         logger.debug("opening JamTrackPlayer window")
-        @childWindow = window.open("/popups/jamtrack-player/" + @jamTrack.id, 'Media Controls', 'scrollbars=yes,toolbar=no,status=no,height=580,width=450')
+        @childWindow = window.open("/popups/jamtrack-player/" + @jamTrack.id, 'Media Controls', 'scrollbars=yes,toolbar=no,status=no,height=667,width=450')
 
       @changed()