From 209b6f2d7e65384db7b8b889027a89ba5ba9134d Mon Sep 17 00:00:00 2001 From: Seth Call Date: Tue, 29 Jul 2014 22:13:38 -0500 Subject: [PATCH 1/2] * sort score histories by date desc --- admin/app/admin/score_history.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/admin/app/admin/score_history.rb b/admin/app/admin/score_history.rb index 02306ec43..85ed34393 100644 --- a/admin/app/admin/score_history.rb +++ b/admin/app/admin/score_history.rb @@ -2,6 +2,7 @@ ActiveAdmin.register JamRuby::ScoreHistory, :as => 'Score History' do menu :parent => 'Score' config.batch_actions = false + config.sort_order = 'score_dt_desc' config.clear_action_items! config.filters = true config.per_page = 100 From 210510a5a4bae750c9fcefd65f5e9024a94aae04 Mon Sep 17 00:00:00 2001 From: Seth Call Date: Tue, 29 Jul 2014 22:25:04 -0500 Subject: [PATCH 2/2] * VRFS-1964 - any 'web' layout page does not show websocket coneciton wo --- web/app/assets/stylesheets/web/main.css.scss | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/web/app/assets/stylesheets/web/main.css.scss b/web/app/assets/stylesheets/web/main.css.scss index d3725237e..ab7a08f43 100644 --- a/web/app/assets/stylesheets/web/main.css.scss +++ b/web/app/assets/stylesheets/web/main.css.scss @@ -599,9 +599,6 @@ strong { } } -body.jam.web.welcome .no-websocket-connection { - display:none; -} -body.jam.web.register .no-websocket-connection { +body.jam.web .no-websocket-connection { display:none; } \ No newline at end of file