Matrix-Mirrors/anonymousland-synapse
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse.git synced 2025-05-06 14:14:58 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.0.1

Browse source
This commit is contained in:
Erik Johnston 2014-08-22 15:48:09 +01:00
commit 239622f80b
4 changed files with 95 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

2
webclient/login/login-controller.js
View file

@ -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
});