diff options
| author | Mark Haines <mark.haines@matrix.org> | 2014-10-13 10:58:36 +0100 |
|---|---|---|
| committer | Mark Haines <mark.haines@matrix.org> | 2014-10-13 10:58:50 +0100 |
| commit | 984e207b5982df26bec37223cd07b4044dcacdd2 (patch) | |
| tree | 9b7cd2052ab91b4365bb43f46d2509b389bf1bab /jsfiddles | |
| parent | Merge branch 'develop' into server2server_signing (diff) | |
| parent | remove wishlist in favour of jira (diff) | |
| download | synapse-984e207b5982df26bec37223cd07b4044dcacdd2.tar.xz | |
Merge branch develop into server2server_signing
Conflicts: synapse/app/homeserver.py
Diffstat (limited to 'jsfiddles')
| -rw-r--r-- | jsfiddles/example_app/demo.js | 2 | ||||
| -rw-r--r-- | jsfiddles/register_login/demo.js | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/jsfiddles/example_app/demo.js b/jsfiddles/example_app/demo.js index ad79fcca26..13c9c2b339 100644 --- a/jsfiddles/example_app/demo.js +++ b/jsfiddles/example_app/demo.js @@ -110,7 +110,7 @@ $('.register').live('click', function() { url: "http://localhost:8008/_matrix/client/api/v1/register", type: "POST", contentType: "application/json; charset=utf-8", - data: JSON.stringify({ user_id: user, password: password }), + data: JSON.stringify({ user: user, password: password, type: "m.login.password" }), dataType: "json", success: function(data) { onLoggedIn(data); diff --git a/jsfiddles/register_login/demo.js b/jsfiddles/register_login/demo.js index fffa9e0551..2e6957b631 100644 --- a/jsfiddles/register_login/demo.js +++ b/jsfiddles/register_login/demo.js @@ -14,7 +14,7 @@ $('.register').live('click', function() { url: "http://localhost:8008/_matrix/client/api/v1/register", type: "POST", contentType: "application/json; charset=utf-8", - data: JSON.stringify({ user_id: user, password: password }), + data: JSON.stringify({ user: user, password: password, type: "m.login.password" }), dataType: "json", success: function(data) { showLoggedIn(data); |