Merge branch 'release/v9'

nastachku · Feb 27, 2013 · 50bf218 · 50bf218
2 parents 66c4c0f + 306051a
commit 50bf218
Show file tree

Hide file tree

Showing 57 changed files with 792 additions and 2,634 deletions.
diff --git a/.gitignore b/.gitignore
@@ -15,6 +15,7 @@
 
 # Ignore all logfiles and tempfiles.
 /log/*.log
+/log/untranslated.*.yml
 /tmp
 
 /coverage

diff --git a/Capfile b/Capfile
@@ -1,7 +1,7 @@
 load 'deploy'
 require 'bundler/capistrano'
 require 'rvm/capistrano'
-load 'deploy/assets'
+# load 'deploy/assets'
 Dir['vendor/gems/*/recipes/*.rb','vendor/plugins/*/recipes/*.rb'].each { |plugin| load(plugin) }
 load 'config/deploy' # remove this line to skip loading any of the default tasks
 

diff --git a/app/assets/javascripts/custom.js.coffee b/app/assets/javascripts/custom.js.coffee
@@ -0,0 +1,4 @@
+window.onload = ->
+  delay = (ms, func) -> setTimeout func, ms
+  delay 4000, -> $('.alert').fadeOut('slow')
+
diff --git a/app/assets/javascripts/mania-js/bootstrap-old.js b/app/assets/javascripts/mania-js/bootstrap-old.js