seth
/
jam-cloud
mirror of https://bitbucket.org/jamkazam/jam-cloud.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop

This commit is contained in:
Brian Smith 2014-07-29 23:29:52 -04:00
parent e4a30c768a f3cc256293
commit 80d9d5ac28
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
admin/app/admin/score_history.rb
View File

@ -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

5
web/app/assets/stylesheets/web/main.css.scss
View File

@ -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;
}