summaryrefslogtreecommitdiff
path: root/users/app/assets
diff options
context:
space:
mode:
authorjessib <jessib@riseup.net>2012-10-31 12:56:18 -0700
committerjessib <jessib@riseup.net>2012-10-31 12:56:18 -0700
commit73a4e9f06840a85225d93734c1f4fb2ebb3b5a93 (patch)
treed754b695fed020a0a24c61f160abf04b8049a882 /users/app/assets
parent6eaecdd10be3974871583e1fed8c5d4e7e307bd8 (diff)
parentfc625a54eb5c54cecb5331811ff482df12b7c059 (diff)
Merge branch 'develop' into help_develop
Diffstat (limited to 'users/app/assets')
m---------users/app/assets/javascripts/srp0
-rw-r--r--users/app/assets/javascripts/users.js.coffee3
2 files changed, 2 insertions, 1 deletions
diff --git a/users/app/assets/javascripts/srp b/users/app/assets/javascripts/srp
-Subproject 5a0ceeb1ca0055719a9b8977a79936216395576
+Subproject 23350b54ec2723e1b2e333626567c9fe9d1e264
diff --git a/users/app/assets/javascripts/users.js.coffee b/users/app/assets/javascripts/users.js.coffee
index 1c00663..24302fe 100644
--- a/users/app/assets/javascripts/users.js.coffee
+++ b/users/app/assets/javascripts/users.js.coffee
@@ -27,7 +27,8 @@ validate_password = (event) ->
signup = (event) ->
srp = new SRP(jqueryRest())
- srp.register()
+ srp.register ->
+ window.location = '/'
false
login = (event) ->