diff options
| author | Erik Johnston <erik@matrix.org> | 2014-10-31 17:48:05 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2014-10-31 17:48:05 +0000 |
| commit | b63691f6e205b4e2d2a990ff04318e4daf731e2c (patch) | |
| tree | aa7a80d740c7ba8f7f5ce9fe28dc32c523746d53 /webclient/login | |
| parent | Coturn's timestamps are in seconds, not milliseconds (diff) | |
| parent | Bump version numbers and change log (diff) | |
| download | synapse-b63691f6e205b4e2d2a990ff04318e4daf731e2c.tar.xz | |
Merge branch 'release-v0.4.2' of github.com:matrix-org/synapse v0.4.2
Diffstat (limited to 'webclient/login')
| -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."; |