summary refs log tree commit diff
path: root/webclient
diff options
context:
space:
mode:
authorMark Haines <mark.haines@matrix.org>2014-08-26 16:20:50 +0100
committerMark Haines <mark.haines@matrix.org>2014-08-26 16:20:50 +0100
commit66a4d3352447f170afcddd1270c1a743273d19e6 (patch)
tree49ee0260dd816d6f7c640f742c4895c6b5cb10fb /webclient
parentMerge branch 'develop' into storage_transactions (diff)
parentMerge branch 'client_server_url_rename' into develop (diff)
downloadsynapse-66a4d3352447f170afcddd1270c1a743273d19e6.tar.xz
Merge branch 'develop' into storage_transactions
Diffstat (limited to 'webclient')
-rw-r--r--webclient/components/matrix/matrix-service.js6
1 files changed, 3 insertions, 3 deletions
diff --git a/webclient/components/matrix/matrix-service.js b/webclient/components/matrix/matrix-service.js

index 237dd6d8a0..fe5f120aaf 100644 --- a/webclient/components/matrix/matrix-service.js +++ b/webclient/components/matrix/matrix-service.js
@@ -108,7 +108,7 @@ angular.module('matrixService', []) // List all rooms joined or been invited to rooms: function(from, to, limit) { // The REST path spec - var path = "/im/sync"; + var path = "/initialSync"; return doRequest("GET", path); }, @@ -217,13 +217,13 @@ angular.module('matrixService', []) // Like the cmd client, escape room ids room_id = encodeURIComponent(room_id); - var path = "/rooms/$room_id/members/list"; + var path = "/rooms/$room_id/members"; path = path.replace("$room_id", room_id); return doRequest("GET", path); }, paginateBackMessages: function(room_id, from_token, limit) { - var path = "/rooms/$room_id/messages/list"; + var path = "/rooms/$room_id/messages"; path = path.replace("$room_id", room_id); var params = { from: from_token,