diff options
| author | Erik Johnston <erik@matrix.org> | 2014-10-30 11:18:28 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2014-10-30 11:18:28 +0000 |
| commit | ef9c4476a0eb653637040f86dd900252cad30567 (patch) | |
| tree | ad14ecbbb2a03ceb47f8fba558994edd3d71b9df /webclient/login/register-controller.js | |
| parent | Fix SQL so that accepts we may want to persist events twice. (diff) | |
| parent | SYWEB-12: Add a 'Room Info' button which displays all state content. (diff) | |
| download | synapse-ef9c4476a0eb653637040f86dd900252cad30567.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into federation_authorization
Diffstat (limited to 'webclient/login/register-controller.js')
| -rw-r--r-- | webclient/login/register-controller.js | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/webclient/login/register-controller.js b/webclient/login/register-controller.js index b3c0c21335..be970ce1c3 100644 --- a/webclient/login/register-controller.js +++ b/webclient/login/register-controller.js @@ -140,6 +140,9 @@ angular.module('RegisterController', ['matrixService']) $scope.feedback = "Captcha is required on this home " + "server."; } + else if (error.data.error) { + $scope.feedback = error.data.error; + } } else if (error.status === 0) { $scope.feedback = "Unable to talk to the server."; |