diff options
| author | Erik Johnston <erik@matrix.org> | 2014-08-15 11:50:14 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2014-08-15 11:50:14 +0100 |
| commit | d72f897f078fa72548522440149369293f0d12b2 (patch) | |
| tree | 4e8d692713f73389b89dea4fdba719b696c9f3af /webclient/login/login.html | |
| parent | Reimplement the get public rooms api to work with new DB schema (diff) | |
| parent | Add a check to make sure that during state conflict res we only request a PDU... (diff) | |
| download | synapse-d72f897f078fa72548522440149369293f0d12b2.tar.xz | |
Merge branch 'master' of github.com:matrix-org/synapse into sql_refactor
Conflicts: synapse/storage/stream.py
Diffstat (limited to 'webclient/login/login.html')
| -rw-r--r-- | webclient/login/login.html | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/webclient/login/login.html b/webclient/login/login.html index 508ff5e4bf..a8b2b1f12d 100644 --- a/webclient/login/login.html +++ b/webclient/login/login.html @@ -15,15 +15,16 @@ <!-- New user registration --> <div> <br/> - <button ng-click="register()" ng-disabled="!account.desired_user_name || !account.homeserver || !account.identityServer || !account.pwd1 || !account.pwd2">Register</button> + <button ng-click="register()" ng-disabled="!account.desired_user_name || !account.homeserver || !account.identityServer || !account.pwd1 || !account.pwd2 || account.pwd1 !== account.pwd2">Register</button> </div> </form> <h3>Got an account?</h3> <form novalidate> <!-- Login with an registered user --> + <div>{{ login_error_msg }} </div> <div> - <input id="user_id" size="70" type="text" auto-focus ng-model="account.user_id" placeholder="User ID (ex:@bob:localhost)"/> + <input id="user_id" size="70" type="text" auto-focus ng-model="account.user_id" placeholder="User ID (ex:@bob:localhost or bob)"/> <br /> <input id="password" size="70" type="password" ng-model="account.password" placeholder="Password"/><br /> <br/> |