Merge branch 'master' into discussions

2013-01-15 00:53:00 +01:00 · 2013-01-15 00:53:00 +01:00 · bda7fe38d0
commit bda7fe38d0
parent d28176b132 d8e697ac68
70 changed files with 571 additions and 311 deletions
--- a/app/assets/javascripts/dashboard.js.coffee
+++ b/app/assets/javascripts/dashboard.js.coffee
@ -1,7 +1,4 @@
-$ ->
-  dashboardPage()
-
-dashboardPage = ->
+window.dashboardPage = ->
  Pager.init 20, true
  $(".event_filter_link").bind "click", (event) ->
    event.preventDefault()