Merge branch 'master' into feature/disable_account

Conflicts:
	users/app/controllers/users_controller.rb
	users/app/helpers/users_helper.rb
	users/app/views/users/edit.html.haml
	users/app/views/users/show.html.haml
	users/config/locales/en.yml

1 files changed, 0 insertions, 46 deletions

diff --git a/users/app/assets/javascripts/users.js.coffee b/users/app/assets/javascripts/users.js.coffee
deleted file mode 100644
index 955556c..0000000
--- a/users/app/assets/javascripts/users.js.coffee
+++ /dev/null
@@ -1,46 +0,0 @@
-preventDefault = (event) ->
-  event.preventDefault()
-
-srp.session = new srp.Session()
-srp.signedUp = ->
-  srp.login()
-
-srp.loggedIn = ->
-  window.location = '/'
-
-#// TODO: not sure this is what we want.
-srp.updated = ->
-  window.location = '/'
-
-srp.error = (message) ->
-  if $.isPlainObject(message) && message.errors
-    for field, error of message.errors
-      element = $('form input[name$="['+field+']"]')
-      next unless element
-      element.trigger('element:validate:fail.ClientSideValidations', error).data('valid', false)
-  else
-    alert(message)
-
-pollUsers = (query, process) ->
-  $.get( "/users.json", query: query).done(process)
-
-followLocationHash = ->
-  location = window.location.hash
-  if location
-    href_select = 'a[href="' + location + '"]'
-    link = $(href_select)
-    link.tab('show') if link
-
-$(document).ready ->
-  followLocationHash()
-  $('#new_user').submit preventDefault
-  $('#new_user').submit srp.signup
-  $('#new_session').submit preventDefault
-  $('#new_session').submit srp.login
-  $('.user.form.update_login_and_password').submit srp.update
-  $('.user.form.update_login_and_password').submit preventDefault
-  $('.user.typeahead').typeahead({source: pollUsers});
-  $('a[data-toggle="tab"]').on('shown', ->
-    $(ClientSideValidations.selectors.forms).validate()
-    )
-