diff options
| author | Erik Johnston <erik@matrix.org> | 2014-09-05 20:39:57 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2014-09-05 20:39:57 +0100 |
| commit | 1c7bb34ffd564dca9f0b761a75f7cda348fdefeb (patch) | |
| tree | 1e30e9277e212b288a5a1f30dcb953e7d947ba40 /webclient/login | |
| parent | Empty string is not a valid JSON object, so don't return them in HTTP responses. (diff) | |
| parent | BF: tab completion did not work with commands. $scope.input contained only th... (diff) | |
| download | synapse-1c7bb34ffd564dca9f0b761a75f7cda348fdefeb.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into develop
Diffstat (limited to 'webclient/login')
| -rw-r--r-- | webclient/login/login.html | 4 | ||||
| -rw-r--r-- | webclient/login/register-controller.js | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/webclient/login/login.html b/webclient/login/login.html index 18e7a02815..6297ec4d42 100644 --- a/webclient/login/login.html +++ b/webclient/login/login.html @@ -39,8 +39,8 @@ Only http://matrix.org:8090 currently exists.</div> <br/> <br/> - <a href="#/register" style="padding-right: 3em">Create account</a> - <a href="#/reset_password">Forgotten password?</a> + <a href="#/register" style="padding-right: 0em">Create account</a> + <a href="#/reset_password" style="display: none; ">Forgotten password?</a> </div> </div> </form> diff --git a/webclient/login/register-controller.js b/webclient/login/register-controller.js index b7584a7d33..5a14964248 100644 --- a/webclient/login/register-controller.js +++ b/webclient/login/register-controller.js @@ -82,7 +82,7 @@ angular.module('RegisterController', ['matrixService']) } ); } else { - registerWithMxidAndPassword($scope.account.desired_user_id, $scope.account.pwd1); + $scope.registerWithMxidAndPassword($scope.account.desired_user_id, $scope.account.pwd1); } }; |