From 8fa88959443dbe164c9d218c0ae33f747403f539 Mon Sep 17 00:00:00 2001 From: Jonathan Kolyer Date: Sat, 21 Dec 2013 22:01:25 -0600 Subject: [PATCH 01/10] vrfs-743: dropped expire date for read to 20 years, as 25 years is too long for S3 --- web/app/controllers/api_music_sessions_controller.rb | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/web/app/controllers/api_music_sessions_controller.rb b/web/app/controllers/api_music_sessions_controller.rb index 9809d49d0..f4a2411c8 100644 --- a/web/app/controllers/api_music_sessions_controller.rb +++ b/web/app/controllers/api_music_sessions_controller.rb @@ -213,13 +213,15 @@ class ApiMusicSessionsController < ApiController :secret_access_key => SampleApp::Application.config.aws_secret_access_key) bucket = s3.buckets[SampleApp::Application.config.aws_bucket] + expire = Time.now + 20.years read_url = bucket.objects[uri].url_for(:read, - :expires => Time.now + 25.years, + :expires => expire, :'response_content_type' => 'text/csv').to_s @perfdata.update_attribute(:uri, read_url) + logger.debug("*** client can read url #{read_url}") write_url = bucket.objects[uri].url_for(:write, - :expires => SampleApp::Application.config.perf_data_signed_url_timeout, + :expires => expire, :'response_content_type' => 'text/csv').to_s logger.debug("*** client can upload to url #{write_url}") redirect_to write_url From fa05c3eb5d58d3f421c452e0d1b9d2c31d886264 Mon Sep 17 00:00:00 2001 From: Jonathan Kolyer Date: Sat, 21 Dec 2013 23:22:54 -0600 Subject: [PATCH 02/10] vrfs737: added user progression admin panel --- admin/app/admin/user_progression.rb | 86 +++++++++++++++++++++++++++++ 1 file changed, 86 insertions(+) create mode 100644 admin/app/admin/user_progression.rb diff --git a/admin/app/admin/user_progression.rb b/admin/app/admin/user_progression.rb new file mode 100644 index 000000000..5f6e12ec0 --- /dev/null +++ b/admin/app/admin/user_progression.rb @@ -0,0 +1,86 @@ +ActiveAdmin.register JamRuby::User, :as => 'User Progression' do + DATE_FORMAT = '%Y-%m-%d %H:%M' + + menu :label => 'User Progression' + + config.sort_order = 'updated_at DESC' + config.batch_actions = false + config.clear_action_items! + config.filters = false + + index do + column :email do |user| link_to(truncate(user.email, {:length => 12}), resource_path(user), {:title => "#{user.first_name} #{user.last_name} (#{user.email})"}) end + column :updated_at do |uu| uu.updated_at.strftime(DATE_FORMAT) end + column :created_at do |uu| uu.created_at.strftime(DATE_FORMAT) end + column :city + column :musician + column 'Client DL' do |uu| + if dd = uu.first_downloaded_client_at + dd.strftime(DATE_FORMAT) + else + '' + end + end + column 'Client Run' do |uu| + if dd = uu.first_ran_client_at + dd.strftime(DATE_FORMAT) + else + '' + end + end + column 'Certified Gear' do |uu| + if dd = uu.first_certified_gear_at + dd.strftime(DATE_FORMAT) + else + '' + end + end + column 'Any Session' do |uu| + if dd = uu.first_music_session_at + dd.strftime(DATE_FORMAT) + else + '' + end + end + column 'Real Session' do |uu| + if dd = uu.first_real_music_session_at + dd.strftime(DATE_FORMAT) + else + '' + end + end + column 'Good Session' do |uu| + if dd = uu.first_good_music_session_at + dd.strftime(DATE_FORMAT) + else + '' + end + end + column 'Invited' do |uu| + if dd = uu.first_invited_at + dd.strftime(DATE_FORMAT) + else + '' + end + end + column 'Friended' do |uu| + if dd = uu.first_friended_at + dd.strftime(DATE_FORMAT) + else + '' + end + end + column 'Promoted' do |uu| + if dd = uu.first_social_promoted_at + dd.strftime(DATE_FORMAT) + else + '' + end + end + column 'Recorded' do |uu| + uu.first_recording_at + end + + end + +end From fcd093f5a68c5b8c33fe9f915a94271f057ba2c2 Mon Sep 17 00:00:00 2001 From: Jonathan Kolyer Date: Sat, 21 Dec 2013 23:23:33 -0600 Subject: [PATCH 03/10] vrfs737: added first_recording_at --- ruby/lib/jam_ruby/models/user.rb | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ruby/lib/jam_ruby/models/user.rb b/ruby/lib/jam_ruby/models/user.rb index cc933e38f..c2b138aed 100644 --- a/ruby/lib/jam_ruby/models/user.rb +++ b/ruby/lib/jam_ruby/models/user.rb @@ -1006,6 +1006,10 @@ module JamRuby end end end + + def first_recording_at + Recording.where(:owner_id => self.id).order('created_at ASC').first.try(:created_at) + end # devise compatibility From 75b9b97c60341f44d725a131d58b40106f7e08ef Mon Sep 17 00:00:00 2001 From: Brian Smith Date: Fri, 27 Dec 2013 16:28:28 -0500 Subject: [PATCH 04/10] fix warning related to ruby- prefix in .ruby-version files --- db/.ruby-version | 2 +- pb/.ruby-version | 2 +- ruby/.ruby-version | 2 +- web/.ruby-version | 2 +- websocket-gateway/.ruby-version | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/db/.ruby-version b/db/.ruby-version index abf2ccea0..cb506813e 100644 --- a/db/.ruby-version +++ b/db/.ruby-version @@ -1 +1 @@ -ruby-2.0.0-p247 +2.0.0-p247 diff --git a/pb/.ruby-version b/pb/.ruby-version index abf2ccea0..cb506813e 100644 --- a/pb/.ruby-version +++ b/pb/.ruby-version @@ -1 +1 @@ -ruby-2.0.0-p247 +2.0.0-p247 diff --git a/ruby/.ruby-version b/ruby/.ruby-version index abf2ccea0..cb506813e 100644 --- a/ruby/.ruby-version +++ b/ruby/.ruby-version @@ -1 +1 @@ -ruby-2.0.0-p247 +2.0.0-p247 diff --git a/web/.ruby-version b/web/.ruby-version index abf2ccea0..cb506813e 100644 --- a/web/.ruby-version +++ b/web/.ruby-version @@ -1 +1 @@ -ruby-2.0.0-p247 +2.0.0-p247 diff --git a/websocket-gateway/.ruby-version b/websocket-gateway/.ruby-version index abf2ccea0..cb506813e 100644 --- a/websocket-gateway/.ruby-version +++ b/websocket-gateway/.ruby-version @@ -1 +1 @@ -ruby-2.0.0-p247 +2.0.0-p247 From 4a9ad7b733bf048e6c6302a949739ff02caf7b85 Mon Sep 17 00:00:00 2001 From: Anthony Davis Date: Sat, 28 Dec 2013 11:54:53 -0600 Subject: [PATCH 05/10] VRFS-937 - locking 'gon' to ~>4.1.0 to fix test failures --- web/Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/Gemfile b/web/Gemfile index 0f5f3066e..91f446324 100644 --- a/web/Gemfile +++ b/web/Gemfile @@ -32,7 +32,7 @@ gem 'ruby-protocol-buffers', '1.2.2' gem 'pg', '0.15.1' gem 'compass-rails' gem 'rabl' # for JSON API development -gem 'gon' # for passthrough of Ruby variables to Javascript variables +gem 'gon', '~>4.1.0' # for passthrough of Ruby variables to Javascript variables gem 'eventmachine', '1.0.3' gem 'amqp', '0.9.8' gem 'logging-rails', :require => 'logging/rails' From 7bb4b4a3c830128af40d386b8aa67d454fe4fc82 Mon Sep 17 00:00:00 2001 From: Daniel Weigh Date: Sun, 29 Dec 2013 13:14:50 -0500 Subject: [PATCH 06/10] VRFS-936 Session header bar missing --- web/app/views/clients/_session.html.erb | 190 ++++++++++++------------ 1 file changed, 96 insertions(+), 94 deletions(-) diff --git a/web/app/views/clients/_session.html.erb b/web/app/views/clients/_session.html.erb index 4c71c8349..6aca6d92f 100644 --- a/web/app/views/clients/_session.html.erb +++ b/web/app/views/clients/_session.html.erb @@ -7,116 +7,118 @@

session

+
-
- - <%= image_tag "content/icon_resync.png", {:align => "texttop", :height => 14, :width => 12} %> - RESYNC - - - <%= image_tag "content/icon_settings_sm.png", {:align => "texttop", :height => 12, :width => 12} %> - SETTINGS - - - <%= image_tag "content/icon_share.png", {:align => "texttop", :height => 12, :width => 12} %> - SHARE - +
+ + <%= image_tag "content/icon_resync.png", {:align => "texttop", :height => 14, :width => 12} %> + RESYNC + + + <%= image_tag "content/icon_settings_sm.png", {:align => "texttop", :height => 12, :width => 12} %> + SETTINGS + + + <%= image_tag "content/icon_share.png", {:align => "texttop", :height => 12, :width => 12} %> + SHARE + - -
-
VOLUME:
-
+ +
+
VOLUME:
+
+
+ + +
+
MIX:
+
others
+
+
me
+
+ + + X  LEAVE
+ - -
-
MIX:
-
others
-
-
me
-
+ +
+
- - X  LEAVE -
- + +
- -
-
+ +
+

my tracks

+
+ <%= image_tag "content/icon_settings_lg.png", {:width => 18, :height => 18} %>  Settings +
- -
- - -
-

my tracks

-
- <%= image_tag "content/icon_settings_lg.png", {:width => 18, :height => 18} %>  Settings -
- -
-
- -
- -
-

live tracks

-
- - <%= image_tag "content/icon_add.png", {:width => 19, :height => 19, :align => "texttop"} %>  Invite Musicians - + +
+

live tracks

+
+ + <%= image_tag "content/icon_add.png", {:width => 19, :height => 19, :align => "texttop"} %>  Invite Musicians + +
+
+
+

+ No Live Tracks:
+ Invite Other Musicians to
+ Add Live Tracks +

+
+
+ +
-
-
-

- No Live Tracks:
- Invite Other Musicians to
- Add Live Tracks + + +

+

recordings

+
+   +
+
+

+ No Recordings:
Open a Recording

-
- +
- - -
-

recordings

-
-   -
-
-

- No Recordings:
Open a Recording -

-
- - - -
-
-
-
From 144f97f470d2d7e8eccdb1b7c1f5eef1e781c7c5 Mon Sep 17 00:00:00 2001 From: Daniel Weigh Date: Sun, 29 Dec 2013 15:52:29 -0500 Subject: [PATCH 07/10] VRFS-935 Account identity screen borked. --- web/app/assets/stylesheets/client/account.css.scss | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/web/app/assets/stylesheets/client/account.css.scss b/web/app/assets/stylesheets/client/account.css.scss index a5981de62..d49ba33b9 100644 --- a/web/app/assets/stylesheets/client/account.css.scss +++ b/web/app/assets/stylesheets/client/account.css.scss @@ -1,9 +1,10 @@ @import 'common.css.scss'; -.account-content-scroller { +.account-content-scroller, +#account-identity-content-scroller { .content-wrapper { - padding:10px 35px; + padding:10px 30px; } .content-wrapper.account { @@ -114,6 +115,7 @@ .button-orange, .button-grey { line-height:14px; + margin-top:6px; margin-right:0; } @@ -122,7 +124,7 @@ } div.field { - margin-bottom:27px; + margin-bottom:21px; } div.profile-instrumentlist table { From 56bf44561023273642f3d4f9f9cf6785c66c228f Mon Sep 17 00:00:00 2001 From: Daniel Weigh Date: Sun, 29 Dec 2013 15:55:55 -0500 Subject: [PATCH 08/10] VRFS-935 Account identity screen borked. --- web/app/assets/stylesheets/client/account.css.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/web/app/assets/stylesheets/client/account.css.scss b/web/app/assets/stylesheets/client/account.css.scss index d49ba33b9..93967f182 100644 --- a/web/app/assets/stylesheets/client/account.css.scss +++ b/web/app/assets/stylesheets/client/account.css.scss @@ -17,6 +17,7 @@ } h4 { + margin-top:8px; margin-bottom: 10px; font-weight:bold; } From 90f81e0994c8e508780f8a826606e19446bd053d Mon Sep 17 00:00:00 2001 From: Daniel Weigh Date: Sun, 29 Dec 2013 16:42:18 -0500 Subject: [PATCH 09/10] VRFS-934 Remove extraneous scrollbar due to explicit height in markup --- web/app/views/clients/_profile.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/app/views/clients/_profile.html.erb b/web/app/views/clients/_profile.html.erb index 238d2cdd8..5a276fa1e 100644 --- a/web/app/views/clients/_profile.html.erb +++ b/web/app/views/clients/_profile.html.erb @@ -45,7 +45,7 @@
-
+
From e22784c6c38efe127327f84240947769b7a84d99 Mon Sep 17 00:00:00 2001 From: Daniel Weigh Date: Sun, 29 Dec 2013 21:04:07 -0500 Subject: [PATCH 10/10] VRFS-294 Adjustments to HTML/ CSS. Account Profile Avatar page --- .../clients/_account_profile_avatar.html.erb | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/web/app/views/clients/_account_profile_avatar.html.erb b/web/app/views/clients/_account_profile_avatar.html.erb index 49bf17f20..010ee663e 100644 --- a/web/app/views/clients/_account_profile_avatar.html.erb +++ b/web/app/views/clients/_account_profile_avatar.html.erb @@ -12,11 +12,13 @@
- -