summary refs log tree commit diff
path: root/webclient/components
diff options
context:
space:
mode:
authorKegan Dougal <kegan@matrix.org>2014-09-15 15:38:29 +0100
committerKegan Dougal <kegan@matrix.org>2014-09-15 15:38:29 +0100
commit2c00e1ecd9774463d687559d5df38b2a76340b32 (patch)
tree2da20ea3c6a7b030568244ec8d876f9389b601fb /webclient/components
parentMerge branch 'develop' of github.com:matrix-org/synapse into registration-api... (diff)
downloadsynapse-2c00e1ecd9774463d687559d5df38b2a76340b32.tar.xz
Be consistent when associating keys with login types for registration/login.
Diffstat (limited to 'webclient/components')
-rw-r--r--webclient/components/matrix/matrix-service.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/webclient/components/matrix/matrix-service.js b/webclient/components/matrix/matrix-service.js

index 35ebca961c..069e02e939 100644 --- a/webclient/components/matrix/matrix-service.js +++ b/webclient/components/matrix/matrix-service.js
@@ -100,7 +100,7 @@ angular.module('matrixService', []) } else if (loginType === "m.login.password") { data = { - user_id: userName, + user: userName, password: password }; }