summary refs log tree commit diff
path: root/webclient/login/login-controller.js
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2014-08-22 15:48:09 +0100
committerErik Johnston <erik@matrix.org>2014-08-22 15:48:09 +0100
commit239622f80b7576770aea2b5e0cdd30975f8977fe (patch)
tree02fbd576e039e6d1b88e7b9c424231ee96f78249 /webclient/login/login-controller.js
parentMove the 'Upgrade' section to just below the 'Installation' section (diff)
parentUpdater command line client to new IS API (diff)
downloadsynapse-239622f80b7576770aea2b5e0cdd30975f8977fe.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.0.1
Diffstat (limited to 'webclient/login/login-controller.js')
-rw-r--r--webclient/login/login-controller.js2
1 files changed, 2 insertions, 0 deletions
diff --git a/webclient/login/login-controller.js b/webclient/login/login-controller.js
index 2f1f224a94..e3d0eca946 100644
--- a/webclient/login/login-controller.js
+++ b/webclient/login/login-controller.js
@@ -70,6 +70,7 @@ angular.module('LoginController', ['matrixService'])
     $scope.login = function() {
         matrixService.setConfig({
             homeserver: $scope.account.homeserver,
+            identityServer: $scope.account.identityServer,
             user_id: $scope.account.user_id
         });
         // try to login
@@ -79,6 +80,7 @@ angular.module('LoginController', ['matrixService'])
                     $scope.feedback = "Login successful.";
                     matrixService.setConfig({
                         homeserver: $scope.account.homeserver,
+                        identityServer: $scope.account.identityServer,
                         user_id: response.data.user_id,
                         access_token: response.data.access_token
                     });