From 9faf7807400c83e51f2be8ae1174e4401cb3c67e Mon Sep 17 00:00:00 2001 From: Emmanuel ROHEE Date: Thu, 4 Sep 2014 14:04:35 +0200 Subject: [PATCH 1/2] Fixed registration flow when registering with matrixID & password and no email --- webclient/login/register-controller.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webclient/login/register-controller.js b/webclient/login/register-controller.js index b7584a7d33..5a14964248 100644 --- a/webclient/login/register-controller.js +++ b/webclient/login/register-controller.js @@ -82,7 +82,7 @@ angular.module('RegisterController', ['matrixService']) } ); } else { - registerWithMxidAndPassword($scope.account.desired_user_id, $scope.account.pwd1); + $scope.registerWithMxidAndPassword($scope.account.desired_user_id, $scope.account.pwd1); } }; From 26efd6f151f801c41e0a0e42c6a51bc1d79444e6 Mon Sep 17 00:00:00 2001 From: Emmanuel ROHEE Date: Thu, 4 Sep 2014 15:10:43 +0200 Subject: [PATCH 2/2] BF: presence PUT requests stopped to work with old "state" param yesterday evening :( -https://github.com/matrix-org/synapse/commit/cda31fb7553ba3d880de09a464ae3b62ea6632fc?diff=unified --- webclient/components/matrix/matrix-service.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webclient/components/matrix/matrix-service.js b/webclient/components/matrix/matrix-service.js index 7c6d4ae50f..25222a9e9e 100644 --- a/webclient/components/matrix/matrix-service.js +++ b/webclient/components/matrix/matrix-service.js @@ -434,7 +434,7 @@ angular.module('matrixService', []) var path = "/presence/$user_id/status"; path = path.replace("$user_id", config.user_id); return doRequest("PUT", path, undefined, { - state: presence + presence: presence }); },