From 12701f447dd346748377fbd2948a9a41f264d10a Mon Sep 17 00:00:00 2001 From: Brian Smith Date: Tue, 11 Mar 2014 00:52:39 -0400 Subject: [PATCH 1/6] VRFS-600 attempt to fix IE10 --- web/app/assets/javascripts/AAA_Log.js | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/web/app/assets/javascripts/AAA_Log.js b/web/app/assets/javascripts/AAA_Log.js index ecd63180a..cd16f22b6 100644 --- a/web/app/assets/javascripts/AAA_Log.js +++ b/web/app/assets/javascripts/AAA_Log.js @@ -1,4 +1,4 @@ -(function(context, $) { +(function (context, $) { "use strict"; @@ -22,6 +22,11 @@ }); } + if (!console.debug) { + console.log("No console.debug found - defining..."); + context.console.debug = function() { console.log(arguments); } + } + context.JK.logger = context.console; // JW - some code to tone down logging. Uncomment the following, and From dd71838af0177ec1dd6a98e0d09b8e4f154fbf23 Mon Sep 17 00:00:00 2001 From: Seth Call Date: Wed, 12 Mar 2014 02:00:41 +0000 Subject: [PATCH 2/6] * fix bad text in the FTUE --- web/app/views/clients/_ftue.html.erb | 4 ++-- web/app/views/users/_signupDialog.html.erb | 2 -- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/web/app/views/clients/_ftue.html.erb b/web/app/views/clients/_ftue.html.erb index d47a5b3d8..9ef6872bd 100644 --- a/web/app/views/clients/_ftue.html.erb +++ b/web/app/views/clients/_ftue.html.erb @@ -112,8 +112,8 @@ - - + + diff --git a/web/app/views/users/_signupDialog.html.erb b/web/app/views/users/_signupDialog.html.erb index 1c6e38aec..66d6fea7f 100644 --- a/web/app/views/users/_signupDialog.html.erb +++ b/web/app/views/users/_signupDialog.html.erb @@ -22,8 +22,6 @@
Already have an account?
-
-

Signups not accepted until Wednesday, March 12th
From 1a68a49fbdd576bc27a8dc110da45273cc5dadb0 Mon Sep 17 00:00:00 2001 From: Seth Call Date: Wed, 12 Mar 2014 14:17:31 +0000 Subject: [PATCH 3/6] * change all video links to the one that's ready (the Overview one) --- web/app/controllers/users_controller.rb | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/web/app/controllers/users_controller.rb b/web/app/controllers/users_controller.rb index 0c34d2e8a..c80d709e2 100644 --- a/web/app/controllers/users_controller.rb +++ b/web/app/controllers/users_controller.rb @@ -198,12 +198,12 @@ class UsersController < ApplicationController def welcome @slides = [ - Slide.new("JamKazam Overview", "web/carousel_musicians.jpg", "http://www.youtube.com/embed/ylYcvTY9CVo?autoplay=1"), - Slide.new("Getting Started", "web/carousel_fans.jpg", "http://www.youtube.com/embed/eaYNM7p6Z5s"), - Slide.new("Playing in a Session", "web/carousel_bands.jpg", "http://www.youtube.com/embed/eaYNM7p6Z5s"), - Slide.new("JamKazam Overview", "web/carousel_musicians.jpg", "http://www.youtube.com/embed/ylYcvTY9CVo?autoplay=1"), - Slide.new("Getting Started", "web/carousel_fans.jpg", "http://www.youtube.com/embed/eaYNM7p6Z5s"), - Slide.new("Playing in a Session", "web/carousel_bands.jpg", "http://www.youtube.com/embed/eaYNM7p6Z5s") + Slide.new("JamKazam Overview", "web/carousel_musicians.jpg", "http://www.youtube.com/embed/ylYcvTY9CVo?autoplay=1"), + Slide.new("Getting Started", "web/carousel_fans.jpg", "http://www.youtube.com/embed/ylYcvTY9CVo?autoplay=1"), + Slide.new("Playing in a Session", "web/carousel_bands.jpg", "http://www.youtube.com/embed/ylYcvTY9CVo?autoplay=1"), + Slide.new("JamKazam Overview", "web/carousel_musicians.jpg", "http://www.youtube.com/embed/ylYcvTY9CVo?autoplay=1"), + Slide.new("Getting Started", "web/carousel_fans.jpg", "http://www.youtube.com/embed/ylYcvTY9CVo?autoplay=1"), + Slide.new("Playing in a Session", "web/carousel_bands.jpg", "http://www.youtube.com/embed/ylYcvTY9CVo?autoplay=1") ] @promo_buzz = PromoBuzz.active From 19f21236e47b3cc6157a708967896634776c485b Mon Sep 17 00:00:00 2001 From: Seth Call Date: Wed, 12 Mar 2014 14:37:13 +0000 Subject: [PATCH 4/6] * link to press release --- web/app/views/corps/media_center.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/app/views/corps/media_center.html.erb b/web/app/views/corps/media_center.html.erb index 90c9435d8..b32e1a6ef 100644 --- a/web/app/views/corps/media_center.html.erb +++ b/web/app/views/corps/media_center.html.erb @@ -46,7 +46,7 @@

From 0b02e9e3235b625df976f1a69d92c9c0a84bdc65 Mon Sep 17 00:00:00 2001 From: Brian Smith Date: Thu, 13 Mar 2014 05:24:24 -0400 Subject: [PATCH 5/6] fix JS error with notifications --- web/app/assets/javascripts/layout.js | 2 +- web/app/controllers/users_controller.rb | 12 ++++++------ web/app/views/corps/media_center.html.erb | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/web/app/assets/javascripts/layout.js b/web/app/assets/javascripts/layout.js index 6d05f6437..d2afc4ef5 100644 --- a/web/app/assets/javascripts/layout.js +++ b/web/app/assets/javascripts/layout.js @@ -731,7 +731,7 @@ } if (notifyDetails !== undefined) { - setNotificationInfo(notifyDetails.message, notifyDetails.descriptor); + setNotificationInfo(notifyDetails.message, notifyDetails.descriptor, $notify); } notifyDetails = {}; diff --git a/web/app/controllers/users_controller.rb b/web/app/controllers/users_controller.rb index 0c34d2e8a..c80d709e2 100644 --- a/web/app/controllers/users_controller.rb +++ b/web/app/controllers/users_controller.rb @@ -198,12 +198,12 @@ class UsersController < ApplicationController def welcome @slides = [ - Slide.new("JamKazam Overview", "web/carousel_musicians.jpg", "http://www.youtube.com/embed/ylYcvTY9CVo?autoplay=1"), - Slide.new("Getting Started", "web/carousel_fans.jpg", "http://www.youtube.com/embed/eaYNM7p6Z5s"), - Slide.new("Playing in a Session", "web/carousel_bands.jpg", "http://www.youtube.com/embed/eaYNM7p6Z5s"), - Slide.new("JamKazam Overview", "web/carousel_musicians.jpg", "http://www.youtube.com/embed/ylYcvTY9CVo?autoplay=1"), - Slide.new("Getting Started", "web/carousel_fans.jpg", "http://www.youtube.com/embed/eaYNM7p6Z5s"), - Slide.new("Playing in a Session", "web/carousel_bands.jpg", "http://www.youtube.com/embed/eaYNM7p6Z5s") + Slide.new("JamKazam Overview", "web/carousel_musicians.jpg", "http://www.youtube.com/embed/ylYcvTY9CVo?autoplay=1"), + Slide.new("Getting Started", "web/carousel_fans.jpg", "http://www.youtube.com/embed/ylYcvTY9CVo?autoplay=1"), + Slide.new("Playing in a Session", "web/carousel_bands.jpg", "http://www.youtube.com/embed/ylYcvTY9CVo?autoplay=1"), + Slide.new("JamKazam Overview", "web/carousel_musicians.jpg", "http://www.youtube.com/embed/ylYcvTY9CVo?autoplay=1"), + Slide.new("Getting Started", "web/carousel_fans.jpg", "http://www.youtube.com/embed/ylYcvTY9CVo?autoplay=1"), + Slide.new("Playing in a Session", "web/carousel_bands.jpg", "http://www.youtube.com/embed/ylYcvTY9CVo?autoplay=1") ] @promo_buzz = PromoBuzz.active diff --git a/web/app/views/corps/media_center.html.erb b/web/app/views/corps/media_center.html.erb index 90c9435d8..b32e1a6ef 100644 --- a/web/app/views/corps/media_center.html.erb +++ b/web/app/views/corps/media_center.html.erb @@ -46,7 +46,7 @@

From 90ab928a7c8f7a435a9e59f19e0294ed6aa54e7f Mon Sep 17 00:00:00 2001 From: Brian Smith Date: Thu, 13 Mar 2014 22:56:11 -0400 Subject: [PATCH 6/6] VRFS-1448 fix bug with Connect button in Fan hover bubble --- web/app/assets/javascripts/hoverFan.js | 1 + 1 file changed, 1 insertion(+) diff --git a/web/app/assets/javascripts/hoverFan.js b/web/app/assets/javascripts/hoverFan.js index 44d6ba075..1aa510721 100644 --- a/web/app/assets/javascripts/hoverFan.js +++ b/web/app/assets/javascripts/hoverFan.js @@ -51,6 +51,7 @@ } var fanHtml = context.JK.fillTemplate(template, { + userId: response.id, avatar_url: context.JK.resolveAvatarUrl(response.photo_url), name: response.name, location: response.location,