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

Merge branch 'settings-page' into develop

Browse source
This commit is contained in:
Emmanuel ROHEE 2014-08-22 18:18:27 +02:00
commit 41d1db2d4a
15 changed files with 503 additions and 452 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -53,7 +53,7 @@ angular.module('LoginController', ['matrixService'])
matrixService.saveConfig();
eventStreamService.resume();
// Go to the user's rooms list page
$location.url("rooms");
$location.url("home");
},
function(error) {
if (error.data) {
@ -86,7 +86,7 @@ angular.module('LoginController', ['matrixService'])
});
matrixService.saveConfig();
eventStreamService.resume();
$location.url("rooms");
$location.url("home");
}
else {
$scope.feedback = "Failed to login: " + JSON.stringify(response.data);