diff options
| author | Erik Johnston <erik@matrix.org> | 2014-08-27 14:13:06 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2014-08-27 14:13:06 +0100 |
| commit | 47519cd8c27c343405431c206660ba74fdea52f6 (patch) | |
| tree | 77b7a55778c42e256b99577226a6172f719e8416 /webclient/components | |
| parent | Implement presence event source. Change the way the notifier indexes listeners (diff) | |
| parent | fix joining rooms on webclient (diff) | |
| download | synapse-47519cd8c27c343405431c206660ba74fdea52f6.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into stream_refactor
Conflicts: synapse/handlers/events.py synapse/rest/events.py synapse/rest/room.py
Diffstat (limited to '')
| -rw-r--r-- | webclient/components/matrix/matrix-service.js | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/webclient/components/matrix/matrix-service.js b/webclient/components/matrix/matrix-service.js index 2286485605..e467ca40da 100644 --- a/webclient/components/matrix/matrix-service.js +++ b/webclient/components/matrix/matrix-service.js @@ -97,7 +97,7 @@ angular.module('matrixService', []) // Create a room create: function(room_id, visibility) { // The REST path spec - var path = "/rooms"; + var path = "/createRoom"; return doRequest("POST", path, undefined, { visibility: visibility, @@ -124,7 +124,8 @@ angular.module('matrixService', []) path = path.replace("$room_alias", room_alias); - return doRequest("PUT", path, undefined, {}); + // TODO: PUT with txn ID + return doRequest("POST", path, undefined, {}); }, // Invite a user to a room |