From 8a7c1d6a00db7e22f0c7678fa4647589a0dcdc31 Mon Sep 17 00:00:00 2001 From: Matthew Hodgson Date: Wed, 3 Sep 2014 17:29:13 +0100 Subject: fix the copyright holder from matrix.org to OpenMarket Ltd, as matrix.org hasn't been incorporated in time for launch. --- webclient/home/home-controller.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'webclient/home') diff --git a/webclient/home/home-controller.js b/webclient/home/home-controller.js index f4ce3053ea..11b3682d34 100644 --- a/webclient/home/home-controller.js +++ b/webclient/home/home-controller.js @@ -1,5 +1,5 @@ /* -Copyright 2014 matrix.org +Copyright 2014 OpenMarket Ltd Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. -- cgit 1.5.1 From 7f01d1d8c8a41e79814741e07e618638120712d8 Mon Sep 17 00:00:00 2001 From: Matthew Hodgson Date: Wed, 3 Sep 2014 18:38:55 +0100 Subject: better error msgs --- webclient/home/home-controller.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'webclient/home') diff --git a/webclient/home/home-controller.js b/webclient/home/home-controller.js index 11b3682d34..85e8990c29 100644 --- a/webclient/home/home-controller.js +++ b/webclient/home/home-controller.js @@ -74,7 +74,7 @@ angular.module('HomeController', ['matrixService', 'eventHandlerService', 'Recen response.data.room_id, response.data.room_alias); }, function(error) { - $scope.feedback = "Failure: " + error.data; + $scope.feedback = "Failure: " + JSON.stringify(error.data); }); }; @@ -94,7 +94,7 @@ angular.module('HomeController', ['matrixService', 'eventHandlerService', 'Recen $location.url("room/" + room_id); }, function(error) { - $scope.feedback = "Can't join room: " + error.data; + $scope.feedback = "Can't join room: " + JSON.stringify(error.data); } ); }; @@ -106,7 +106,7 @@ angular.module('HomeController', ['matrixService', 'eventHandlerService', 'Recen $location.url("room/" + room_alias); }, function(error) { - $scope.feedback = "Can't join room: " + error.data; + $scope.feedback = "Can't join room: " + JSON.stringify(error.data); } ); }; -- cgit 1.5.1