Merge branch 'settings-page' into develop

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

View file

@ -372,7 +372,7 @@ angular.module('RoomController', ['ngSanitize', 'mUtilities'])
matrixService.leave($scope.room_id).then(
function(response) {
console.log("Left room ");
$location.url("rooms");
$location.url("home");
},
function(error) {
$scope.feedback = "Failed to leave room: " + error.data.error;