Merge pull request #3834 from cpennington/ok-merge-from-master

Merge master into opaque-keys
2014-05-23 11:36:52 -04:00
parent a0799f38bf 21ddc7db00
commit 9feff62857
217 changed files with 6154 additions and 4239 deletions
--- a/lms/static/coffee/src/main.coffee
+++ b/lms/static/coffee/src/main.coffee
@@ -32,12 +32,10 @@ $ ->

  $('#login').click ->
    $('#login_form input[name="email"]').focus()
-    _gaq.push(['_trackPageview', '/login'])
    false

  $('#signup').click ->
    $('#signup-modal input[name="email"]').focus()
-    _gaq.push(['_trackPageview', '/signup'])
    false

  # fix for ie