From 6f3075a3bac9504b60bca32ee3836a55e0a28c70 Mon Sep 17 00:00:00 2001 From: Brian Smith Date: Sun, 2 Nov 2014 13:25:52 -0500 Subject: [PATCH 1/3] VRFS-2297 added tool tip to instruments on session info web page --- web/app/views/music_sessions/session_info.html.haml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web/app/views/music_sessions/session_info.html.haml b/web/app/views/music_sessions/session_info.html.haml index bde92930c..7c7e359d7 100644 --- a/web/app/views/music_sessions/session_info.html.haml +++ b/web/app/views/music_sessions/session_info.html.haml @@ -91,7 +91,7 @@ = rsvp.name .left.ml10 - process_approved_rsvps(rsvp).each do |i| - %img.instrument-icon{'instrument-id' => i[:id], height:24, width:24} + %img.instrument-icon{'instrument-id' => i[:id], 'title' => i[:id], height:24, width:24} .right.w30.ib.f11.center.latency-tags %br{:clear => "all"}/ @@ -108,7 +108,7 @@ - @open_slots.each do |slot| .clearall.left.w100.h20.ib.mb10 .ib.h20 - %img.instrument-icon{'instrument-id' => slot.instrument_id, height:24, width:24} + %img.instrument-icon{'instrument-id' => slot.instrument_id, 'title' => slot.instrument_id, height:24, width:24} .f11.ml10.ib.h20 = slot.instrument_id.capitalize = "(#{slot.proficiency_desc})" From 33a431f82240f7160554ac8c781a2fabcf4baf25 Mon Sep 17 00:00:00 2001 From: Brian Smith Date: Sun, 2 Nov 2014 14:26:56 -0500 Subject: [PATCH 2/3] VRFS-2427 fixed broken test --- ruby/lib/jam_ruby/models/feed.rb | 19 ++++--------------- web/app/assets/javascripts/feedHelper.js | 6 +++--- .../controllers/api_feeds_controller_spec.rb | 10 +++++----- 3 files changed, 12 insertions(+), 23 deletions(-) diff --git a/ruby/lib/jam_ruby/models/feed.rb b/ruby/lib/jam_ruby/models/feed.rb index f61c949b6..7fba1e705 100644 --- a/ruby/lib/jam_ruby/models/feed.rb +++ b/ruby/lib/jam_ruby/models/feed.rb @@ -20,14 +20,6 @@ module JamRuby sort ||= 'date' raise "not valid sort #{sort}" unless SORT_TYPES.include?(sort) - # start = params[:start].presence - # if sort == 'date' - # start ||= FIXNUM_MAX - # else - # start ||= 0 - # end - # start = start.to_i - time_range = params[:time_range] time_range ||= 'all' raise "not valid time_range #{time_range}" unless TIME_RANGES.has_key?(time_range) @@ -47,13 +39,10 @@ module JamRuby # handle sort if sort == 'date' - # query = query.where("feeds.id < #{start}") query = query.order('feeds.active DESC, feeds.id DESC') elsif sort == 'plays' - # query = query.offset(start) query = query.order("feeds.active DESC, COALESCE(recordings.play_count, music_sessions.play_count) DESC") elsif sort == 'likes' - # query = query.offset(start) query = query.order("feeds.active DESC, COALESCE(recordings.like_count, music_sessions.like_count) DESC") else raise "sort not implemented: #{sort}" @@ -117,17 +106,17 @@ module JamRuby query = query.paginate(:page => current_page, :per_page => limit) if params[:hash] - if query.length == 0 + if query.length == 0 # no more results { query: query, next_page: nil} - elsif query.length < limit + elsif query.length < limit # no more results { query: query, next_page: nil} else { query: query, next_page: next_page } end else - if query.length == 0 + if query.length == 0 # no more results [query, nil] - elsif query.length < limit + elsif query.length < limit # no more results [query, nil] else [query, next_page] diff --git a/web/app/assets/javascripts/feedHelper.js b/web/app/assets/javascripts/feedHelper.js index 74dfae892..ab7c8b14a 100644 --- a/web/app/assets/javascripts/feedHelper.js +++ b/web/app/assets/javascripts/feedHelper.js @@ -20,7 +20,7 @@ var $refresh = null; var $sortFeedBy = null; var $includeDate = null; - var nextPage = null; + var nextPage = 1; var $includeType = null; var didLoadAllFeeds = false, isLoading = false; @@ -53,7 +53,7 @@ currentFeedPage = 0; $content.empty(); // TODO: do we need to delete audio elements? $noMoreFeeds.hide(); - nextPage = null; + nextPage = 1; } function handleFeedResponse(response) { @@ -63,7 +63,7 @@ if(nextPage == null) { didLoadAllFeeds = true; - // if we less results than asked for, end searching + // if we got less results than asked for, end searching logger.debug("end of feeds") if(currentFeedPage == 0 && response.entries.length == 0) { diff --git a/web/spec/controllers/api_feeds_controller_spec.rb b/web/spec/controllers/api_feeds_controller_spec.rb index 78a60b021..c0a62ab8b 100644 --- a/web/spec/controllers/api_feeds_controller_spec.rb +++ b/web/spec/controllers/api_feeds_controller_spec.rb @@ -100,19 +100,19 @@ describe ApiFeedsController do get :index, { limit: 1 } json = JSON.parse(response.body, :symbolize_names => true) json[:entries].length.should == 1 - _next = json[:next] + _next = json[:next_page] _next.should_not be_nil - get :index, { limit: 1, since: _next } + get :index, { limit: 1, next_page: _next } json = JSON.parse(response.body, :symbolize_names => true) json[:entries].length.should == 1 - _next = json[:next] + _next = json[:next_page] _next.should_not be_nil - get :index, { limit: 1, since: _next } + get :index, { limit: 1, next_page: _next } json = JSON.parse(response.body, :symbolize_names => true) json[:entries].length.should == 0 - _next = json[:next] + _next = json[:next_page] _next.should be_nil end end From 0007930936be6ac69ea472c1c64aa5a955e83af0 Mon Sep 17 00:00:00 2001 From: Brian Smith Date: Sun, 2 Nov 2014 16:43:56 -0500 Subject: [PATCH 3/3] VRFS-2401 revert to inline styles for email links for now, need to revisit better solution --- .../app/views/jam_ruby/corp_mailer/feedback.html.erb | 2 +- .../invited_user_mailer/friend_invitation.html.erb | 2 +- .../invited_user_mailer/welcome_betauser.html.erb | 2 +- .../jam_ruby/progress_mailer/client_dl_notrun.html.erb | 2 +- .../jam_ruby/progress_mailer/client_notdl.html.erb | 4 ++-- .../progress_mailer/client_run_notgear.html.erb | 4 ++-- .../jam_ruby/progress_mailer/gear_notsess.html.erb | 4 ++-- .../jam_ruby/progress_mailer/reg_notconnect.html.erb | 4 ++-- .../jam_ruby/progress_mailer/reg_notinvite.html.erb | 2 +- .../jam_ruby/progress_mailer/sess_notgood.html.erb | 2 +- .../jam_ruby/user_mailer/band_session_join.html.erb | 2 +- .../views/jam_ruby/user_mailer/confirm_email.html.erb | 2 +- .../views/jam_ruby/user_mailer/friend_request.html.erb | 2 +- .../user_mailer/musician_session_join.html.erb | 2 +- .../views/jam_ruby/user_mailer/new_musicians.html.erb | 2 +- .../views/jam_ruby/user_mailer/password_reset.html.erb | 2 +- .../user_mailer/scheduled_session_cancelled.html.erb | 2 +- .../user_mailer/scheduled_session_comment.html.erb | 2 +- .../user_mailer/scheduled_session_daily.html.erb | 4 ++-- .../user_mailer/scheduled_session_invitation.html.erb | 2 +- .../user_mailer/scheduled_session_reminder.html.erb | 2 +- .../user_mailer/scheduled_session_rescheduled.html.erb | 2 +- .../user_mailer/scheduled_session_rsvp.html.erb | 2 +- .../scheduled_session_rsvp_approved.html.erb | 2 +- .../scheduled_session_rsvp_cancelled.html.erb | 2 +- .../scheduled_session_rsvp_cancelled_org.html.erb | 2 +- .../views/jam_ruby/user_mailer/text_message.html.erb | 2 +- .../views/jam_ruby/user_mailer/updating_email.html.erb | 2 +- .../jam_ruby/user_mailer/welcome_message.html.erb | 10 +++++----- .../app/views/layouts/from_user_mailer.html.erb | 2 +- .../jam_ruby/app/views/layouts/user_mailer.html.erb | 2 +- web/app/assets/javascripts/feedHelper.js | 6 ++++-- 32 files changed, 44 insertions(+), 42 deletions(-) diff --git a/ruby/lib/jam_ruby/app/views/jam_ruby/corp_mailer/feedback.html.erb b/ruby/lib/jam_ruby/app/views/jam_ruby/corp_mailer/feedback.html.erb index 7daab2af6..2f21454bf 100644 --- a/ruby/lib/jam_ruby/app/views/jam_ruby/corp_mailer/feedback.html.erb +++ b/ruby/lib/jam_ruby/app/views/jam_ruby/corp_mailer/feedback.html.erb @@ -8,7 +8,7 @@

-This email was received because someone left feedback at http://www.jamkazam.com/corp/contact +This email was received because someone left feedback at http://www.jamkazam.com/corp/contact

diff --git a/ruby/lib/jam_ruby/app/views/jam_ruby/invited_user_mailer/friend_invitation.html.erb b/ruby/lib/jam_ruby/app/views/jam_ruby/invited_user_mailer/friend_invitation.html.erb index 11c4bffd7..5b9b443d1 100644 --- a/ruby/lib/jam_ruby/app/views/jam_ruby/invited_user_mailer/friend_invitation.html.erb +++ b/ruby/lib/jam_ruby/app/views/jam_ruby/invited_user_mailer/friend_invitation.html.erb @@ -1,7 +1,7 @@ <% provide(:title, "You've been invited to JamKazam by #{@sender.name}!") %> <% provide(:photo_url, @sender.resolved_photo_url) %> -To signup, please go to the create account page. +To signup, please go to the create account page. <% content_for :note do %> <% if @note %> diff --git a/ruby/lib/jam_ruby/app/views/jam_ruby/invited_user_mailer/welcome_betauser.html.erb b/ruby/lib/jam_ruby/app/views/jam_ruby/invited_user_mailer/welcome_betauser.html.erb index c1aafeaee..fa698eaf5 100644 --- a/ruby/lib/jam_ruby/app/views/jam_ruby/invited_user_mailer/welcome_betauser.html.erb +++ b/ruby/lib/jam_ruby/app/views/jam_ruby/invited_user_mailer/welcome_betauser.html.erb @@ -1,3 +1,3 @@ <% provide(:title, 'Welcome to the JamKazam Beta!') %> -To signup, please go to the create account page. \ No newline at end of file +To signup, please go to the create account page. \ No newline at end of file diff --git a/ruby/lib/jam_ruby/app/views/jam_ruby/progress_mailer/client_dl_notrun.html.erb b/ruby/lib/jam_ruby/app/views/jam_ruby/progress_mailer/client_dl_notrun.html.erb index 88d388512..137affe71 100644 --- a/ruby/lib/jam_ruby/app/views/jam_ruby/progress_mailer/client_dl_notrun.html.erb +++ b/ruby/lib/jam_ruby/app/views/jam_ruby/progress_mailer/client_dl_notrun.html.erb @@ -7,7 +7,7 @@

-https://jamkazam.desk.com +https://jamkazam.desk.com

-- Team JamKazam diff --git a/ruby/lib/jam_ruby/app/views/jam_ruby/progress_mailer/client_notdl.html.erb b/ruby/lib/jam_ruby/app/views/jam_ruby/progress_mailer/client_notdl.html.erb index 500479365..5ce39a3c6 100644 --- a/ruby/lib/jam_ruby/app/views/jam_ruby/progress_mailer/client_notdl.html.erb +++ b/ruby/lib/jam_ruby/app/views/jam_ruby/progress_mailer/client_notdl.html.erb @@ -7,11 +7,11 @@

-Go to Download Page +Go to Download Page

-Go to Support Center +Go to Support Center

-- Team JamKazam diff --git a/ruby/lib/jam_ruby/app/views/jam_ruby/progress_mailer/client_run_notgear.html.erb b/ruby/lib/jam_ruby/app/views/jam_ruby/progress_mailer/client_run_notgear.html.erb index a06990e41..b6e1af4de 100644 --- a/ruby/lib/jam_ruby/app/views/jam_ruby/progress_mailer/client_run_notgear.html.erb +++ b/ruby/lib/jam_ruby/app/views/jam_ruby/progress_mailer/client_run_notgear.html.erb @@ -6,13 +6,13 @@

We noticed that you have not yet successfully set up your audio gear and passed the JamKazam latency and input/output audio gear tests. This means that you cannot yet play in online sessions with other musicians. If you are having trouble with this step, please click the link below for a knowledge base article that can help you get past this hurdle. If the test says your audio gear is not fast enough, or if your audio quality sounds poor, or if you are just confused, it’s very likely the tips in this article will help you get things set up and optimized so you can start playing online.

-

http://bit.ly/1i4Uul4 +

http://bit.ly/1i4Uul4

And if this knowledge base article does not get you fixed up, please visit our JamKazam support center at the link below, and post a request for assistance so that we can help you get up and running:

-

https://jamkazam.desk.com +

https://jamkazam.desk.com

-- Team JamKazam diff --git a/ruby/lib/jam_ruby/app/views/jam_ruby/progress_mailer/gear_notsess.html.erb b/ruby/lib/jam_ruby/app/views/jam_ruby/progress_mailer/gear_notsess.html.erb index 3d96ac749..0a72b2017 100644 --- a/ruby/lib/jam_ruby/app/views/jam_ruby/progress_mailer/gear_notsess.html.erb +++ b/ruby/lib/jam_ruby/app/views/jam_ruby/progress_mailer/gear_notsess.html.erb @@ -10,7 +10,7 @@ It’s still very early in our company’s development, so we don’t have zillions of users online on our service yet. If you click Find Session, you will often not find a good session to join, both due to the number of musicians online at any given time, and also because you won’t see private sessions where groups of musicians don’t want to be interrupted in their sessions.

-

If you are having trouble getting into sessions, we’d suggest you click the Musicians tile on the home screen of the app or the website: Go To Musicians Page +

If you are having trouble getting into sessions, we’d suggest you click the Musicians tile on the home screen of the app or the website: Go To Musicians Page

This will display the JamKazam musicians sorted by latency to you - in other words, you can see which musicians have good network connections to you. Any musicians with green and yellow latency scores have good enough connections to support a play session with you. We recommend that read the profiles of these musicians to find others with shared musical interests and good network connections to you, and then use the Message button to say hi and see if they are interested in playing with you. If they are, use the Connect button to “friend” them on JamKazam, and use the Message button to set up a time to meet online for a session. @@ -24,7 +24,7 @@ One of the best ways to connect and play with others is to invite your friends f If you are having audio quality problems or other issues when you get into a session, please click the link below to visit our support center, and check the knowledge base articles under the Troubleshooting header to find solutions. And if that doesn’t work, please post a request for assistance in the support center so that we can help you get up and running:

-

https://jamkazam.desk.com +

https://jamkazam.desk.com

-- Team JamKazam diff --git a/ruby/lib/jam_ruby/app/views/jam_ruby/progress_mailer/reg_notconnect.html.erb b/ruby/lib/jam_ruby/app/views/jam_ruby/progress_mailer/reg_notconnect.html.erb index 0751b7388..0a0eada21 100644 --- a/ruby/lib/jam_ruby/app/views/jam_ruby/progress_mailer/reg_notconnect.html.erb +++ b/ruby/lib/jam_ruby/app/views/jam_ruby/progress_mailer/reg_notconnect.html.erb @@ -7,7 +7,7 @@

Find Other Musicians on JamKazam
-To find and connect with other musicians who are already on JamKazam, we’d suggest you click the Musicians tile on the home screen of the app or the website: Go To Musicians Page +To find and connect with other musicians who are already on JamKazam, we’d suggest you click the Musicians tile on the home screen of the app or the website: Go To Musicians Page

This will display the JamKazam musicians sorted by latency to you - in other words, you can see which musicians have good network connections to you. Any musicians with green and yellow latency scores have good enough connections to support a play session with you. We recommend that you read the profiles of these musicians to find others with shared musical interests and good network connections to you, and then use the Message button to say hi and see if they are interested in playing with you. If they are, use the Connect button to “friend” them on JamKazam, and use the Message button to set up a time to meet online for a session. @@ -20,7 +20,7 @@ One of the best ways to connect and play with others is to invite your friends f

If you have any trouble, please visit our support center at the link below any time to get help:

-

https://jamkazam.desk.com +

https://jamkazam.desk.com

-- Team JamKazam diff --git a/ruby/lib/jam_ruby/app/views/jam_ruby/progress_mailer/reg_notinvite.html.erb b/ruby/lib/jam_ruby/app/views/jam_ruby/progress_mailer/reg_notinvite.html.erb index 0794830df..77bc38ae4 100644 --- a/ruby/lib/jam_ruby/app/views/jam_ruby/progress_mailer/reg_notinvite.html.erb +++ b/ruby/lib/jam_ruby/app/views/jam_ruby/progress_mailer/reg_notinvite.html.erb @@ -9,7 +9,7 @@

If you have any trouble, please visit our support center at the link below any time to get help:

-

https://jamkazam.desk.com +

https://jamkazam.desk.com

-- Team JamKazam diff --git a/ruby/lib/jam_ruby/app/views/jam_ruby/progress_mailer/sess_notgood.html.erb b/ruby/lib/jam_ruby/app/views/jam_ruby/progress_mailer/sess_notgood.html.erb index adc2dc5c1..c0eaff2bc 100644 --- a/ruby/lib/jam_ruby/app/views/jam_ruby/progress_mailer/sess_notgood.html.erb +++ b/ruby/lib/jam_ruby/app/views/jam_ruby/progress_mailer/sess_notgood.html.erb @@ -9,7 +9,7 @@

If you are having audio quality problems or other issues when you get into a session, please click the link below to visit our support center, and check the knowledge base articles under the Troubleshooting header to find solutions. And if that doesn’t work, please post a request for assistance in the support center so that we can help you get up and running:

-

https://jamkazam.desk.com +

https://jamkazam.desk.com

We really want you to be successful and have fun with this new way of playing music with others, so please reach out and let us help you! diff --git a/ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/band_session_join.html.erb b/ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/band_session_join.html.erb index 276ae4fcc..8a625c669 100644 --- a/ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/band_session_join.html.erb +++ b/ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/band_session_join.html.erb @@ -1,3 +1,3 @@ <% provide(:title, 'New Band Session') %> -

<%= @body %> Listen in.

\ No newline at end of file +

<%= @body %> Listen in.

\ No newline at end of file diff --git a/ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/confirm_email.html.erb b/ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/confirm_email.html.erb index 651d1c236..6f760961e 100644 --- a/ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/confirm_email.html.erb +++ b/ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/confirm_email.html.erb @@ -2,4 +2,4 @@

Welcome to JamKazam, <%= @user.first_name %>!

-

To confirm this email address, please go to the signup confirmation page.

+

To confirm this email address, please go to the signup confirmation page.

diff --git a/ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/friend_request.html.erb b/ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/friend_request.html.erb index cf9df2fe2..b3c6f7b40 100644 --- a/ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/friend_request.html.erb +++ b/ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/friend_request.html.erb @@ -2,4 +2,4 @@

<%= @body %>

-

To accept this friend request, click here.

+

To accept this friend request, click here.

diff --git a/ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/musician_session_join.html.erb b/ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/musician_session_join.html.erb index de2b7e43c..198a6148a 100644 --- a/ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/musician_session_join.html.erb +++ b/ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/musician_session_join.html.erb @@ -1,3 +1,3 @@ <% provide(:title, 'Musician in Session') %> -

<%= @body %> Listen in.

\ No newline at end of file +

<%= @body %> Listen in.

\ No newline at end of file diff --git a/ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/new_musicians.html.erb b/ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/new_musicians.html.erb index 8551c23df..7a25bfe43 100644 --- a/ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/new_musicians.html.erb +++ b/ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/new_musicians.html.erb @@ -24,7 +24,7 @@ Hi <%= @user.first_name %>, <% end %>

-

There are currently <%= @new_musicians.size%> musicians on JamKazam with low enough latency Internet connections to you to support a good online session. To see ALL the JamKazam musicians with whom you may want to connect and play, view our Musicians page at: http://www.jamkazam.com/client#/musicians. +

There are currently <%= @new_musicians.size%> musicians on JamKazam with low enough latency Internet connections to you to support a good online session. To see ALL the JamKazam musicians with whom you may want to connect and play, view our Musicians page at: http://www.jamkazam.com/client#/musicians.

Best Regards,

diff --git a/ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/password_reset.html.erb b/ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/password_reset.html.erb index 2ac4845c6..048092f6c 100644 --- a/ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/password_reset.html.erb +++ b/ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/password_reset.html.erb @@ -1,3 +1,3 @@ <% provide(:title, 'JamKazam Password Reset') %> -Visit this link so that you can change your JamKazam password: reset password. \ No newline at end of file +Visit this link so that you can change your JamKazam password: reset password. \ No newline at end of file diff --git a/ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/scheduled_session_cancelled.html.erb b/ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/scheduled_session_cancelled.html.erb index 4fa8eb0f9..362565807 100644 --- a/ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/scheduled_session_cancelled.html.erb +++ b/ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/scheduled_session_cancelled.html.erb @@ -2,4 +2,4 @@

<%= @body %>

-

View Session Details

\ No newline at end of file +

View Session Details

\ No newline at end of file diff --git a/ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/scheduled_session_comment.html.erb b/ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/scheduled_session_comment.html.erb index af6bac519..865a0270a 100644 --- a/ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/scheduled_session_comment.html.erb +++ b/ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/scheduled_session_comment.html.erb @@ -7,5 +7,5 @@

<%= @session_name %>

<%= @session_date %>

-

View Session Details

+

View Session Details

<% end %> \ No newline at end of file diff --git a/ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/scheduled_session_daily.html.erb b/ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/scheduled_session_daily.html.erb index 221c06839..c4b476d45 100644 --- a/ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/scheduled_session_daily.html.erb +++ b/ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/scheduled_session_daily.html.erb @@ -68,7 +68,7 @@ <%= sess.genre.description %> <%= sess.name %>
- ">Details + ">Details <%= sess.description %> @@ -86,7 +86,7 @@ -

To see ALL the scheduled sessions that you might be interested in joining, view our Find Session page.

+

To see ALL the scheduled sessions that you might be interested in joining, view our Find Session page.

Best Regards,

diff --git a/ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/scheduled_session_invitation.html.erb b/ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/scheduled_session_invitation.html.erb index a3e774395..bfefadae2 100644 --- a/ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/scheduled_session_invitation.html.erb +++ b/ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/scheduled_session_invitation.html.erb @@ -7,4 +7,4 @@ <%= @session_date %>

-

View Session Details

\ No newline at end of file +

View Session Details

\ No newline at end of file diff --git a/ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/scheduled_session_reminder.html.erb b/ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/scheduled_session_reminder.html.erb index c8514b939..8582bfdbe 100644 --- a/ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/scheduled_session_reminder.html.erb +++ b/ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/scheduled_session_reminder.html.erb @@ -7,4 +7,4 @@ <%= @session_date %>

-

View Session Details

\ No newline at end of file +

View Session Details

\ No newline at end of file diff --git a/ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/scheduled_session_rescheduled.html.erb b/ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/scheduled_session_rescheduled.html.erb index 9331036ca..d79f53efe 100644 --- a/ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/scheduled_session_rescheduled.html.erb +++ b/ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/scheduled_session_rescheduled.html.erb @@ -7,4 +7,4 @@ <%= @session_date %>

-

View Session Details

\ No newline at end of file +

View Session Details

\ No newline at end of file diff --git a/ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/scheduled_session_rsvp.html.erb b/ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/scheduled_session_rsvp.html.erb index 046f1847f..af0a6ea98 100644 --- a/ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/scheduled_session_rsvp.html.erb +++ b/ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/scheduled_session_rsvp.html.erb @@ -7,4 +7,4 @@ <%= @session_date %>

-

View Session Details

\ No newline at end of file +

View Session Details

\ No newline at end of file diff --git a/ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/scheduled_session_rsvp_approved.html.erb b/ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/scheduled_session_rsvp_approved.html.erb index e12cab821..5e8e8a19b 100644 --- a/ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/scheduled_session_rsvp_approved.html.erb +++ b/ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/scheduled_session_rsvp_approved.html.erb @@ -7,4 +7,4 @@ <%= @session_date %>

-

View Session Details

\ No newline at end of file +

View Session Details

\ No newline at end of file diff --git a/ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/scheduled_session_rsvp_cancelled.html.erb b/ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/scheduled_session_rsvp_cancelled.html.erb index 0c996aa5d..36f24f86b 100644 --- a/ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/scheduled_session_rsvp_cancelled.html.erb +++ b/ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/scheduled_session_rsvp_cancelled.html.erb @@ -7,4 +7,4 @@ <%= @session_date %>

-

View Session Details

\ No newline at end of file +

View Session Details

\ No newline at end of file diff --git a/ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/scheduled_session_rsvp_cancelled_org.html.erb b/ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/scheduled_session_rsvp_cancelled_org.html.erb index 05ce13a7e..3f9917ab5 100644 --- a/ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/scheduled_session_rsvp_cancelled_org.html.erb +++ b/ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/scheduled_session_rsvp_cancelled_org.html.erb @@ -7,4 +7,4 @@ <%= @session_date %>

-

View Session Details

\ No newline at end of file +

View Session Details

\ No newline at end of file diff --git a/ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/text_message.html.erb b/ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/text_message.html.erb index 879c27c2c..6ca8962c3 100644 --- a/ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/text_message.html.erb +++ b/ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/text_message.html.erb @@ -4,5 +4,5 @@ <% content_for :note do %> <%= @note %> -

To reply to this message, click here.

+

To reply to this message, click here.

<% end %> diff --git a/ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/updating_email.html.erb b/ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/updating_email.html.erb index b0792e217..704636eaa 100644 --- a/ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/updating_email.html.erb +++ b/ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/updating_email.html.erb @@ -1,3 +1,3 @@ <% provide(:title, 'Please Confirm New JamKazam Email') %> -Please click the following link to confirm your change in email: confirm email. \ No newline at end of file +Please click the following link to confirm your change in email: confirm email. \ No newline at end of file diff --git a/ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/welcome_message.html.erb b/ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/welcome_message.html.erb index 5b663b7ee..6feeb3f66 100644 --- a/ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/welcome_message.html.erb +++ b/ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/welcome_message.html.erb @@ -11,31 +11,31 @@

Getting Started Video
We recommend watching this video before you jump into the service just to get oriented. It will really help you hit the ground running: -https://www.youtube.com/watch?v=VexH4834o9I +https://www.youtube.com/watch?v=VexH4834o9I

Other Great Tutorial Videos
There are several other very great videos that will help you understand how to find and connect with other musicians on the service, create your own sessions or find and join other musicians’ sessions, play in sessions, record and share your performances, and even live broadcast your sessions to family, friends, and fans. Check these helpful videos out here: -https://jamkazam.desk.com/customer/portal/articles/1304097-tutorial-videos +https://jamkazam.desk.com/customer/portal/articles/1304097-tutorial-videos

Knowledge Base Articles
You can find Getting Started knowledge base articles on things like frequently asked questions (FAQ), minimum system requirements for your Windows or Mac computer, how to troubleshoot audio problems in sessions, and more here: -https://jamkazam.desk.com/customer/portal/topics/564807-getting-started/articles +https://jamkazam.desk.com/customer/portal/topics/564807-getting-started/articles

JamKazam Support Portal
If you run into trouble and need help, please reach out to us. We will be glad to do everything we can to get you up and running. You can find our support portal here: -https://jamkazam.desk.com/ +https://jamkazam.desk.com/

JamKazam Community Forum
And if you just want to chat, share tips and war stories, and hang out with fellow JamKazamers, you can visit our community forum here: -http://forums.jamkazam.com/ +http://forums.jamkazam.com/

diff --git a/ruby/lib/jam_ruby/app/views/layouts/from_user_mailer.html.erb b/ruby/lib/jam_ruby/app/views/layouts/from_user_mailer.html.erb index aa1d520f8..6b10f7f66 100644 --- a/ruby/lib/jam_ruby/app/views/layouts/from_user_mailer.html.erb +++ b/ruby/lib/jam_ruby/app/views/layouts/from_user_mailer.html.erb @@ -51,7 +51,7 @@

-

This email was sent to you because you have an account at JamKazam. +

This email was sent to you because you have an account at JamKazam. diff --git a/ruby/lib/jam_ruby/app/views/layouts/user_mailer.html.erb b/ruby/lib/jam_ruby/app/views/layouts/user_mailer.html.erb index 7e411bbc9..3b11eebd1 100644 --- a/ruby/lib/jam_ruby/app/views/layouts/user_mailer.html.erb +++ b/ruby/lib/jam_ruby/app/views/layouts/user_mailer.html.erb @@ -39,7 +39,7 @@ -

This email was sent to you because you have an account at JamKazam.  Click here to unsubscribe and update your profile settings. +

This email was sent to you because you have an account at JamKazam.  Click here to unsubscribe and update your profile settings.

diff --git a/web/app/assets/javascripts/feedHelper.js b/web/app/assets/javascripts/feedHelper.js index ab7c8b14a..328dcdace 100644 --- a/web/app/assets/javascripts/feedHelper.js +++ b/web/app/assets/javascripts/feedHelper.js @@ -98,7 +98,9 @@ function populate() { if (isLoading || didLoadAllFeeds) return; - setLoading(true); + + setLoading(true); + rest.getFeeds(buildQuery()) .done(function(response) { handleFeedResponse(response); @@ -107,7 +109,7 @@ .fail(function(jqXHR) { setLoading(false); app.notifyServerError(jqXHR, 'Feed Unavailable') - }) + }); } function toggleSessionDetails() {