summary refs log tree commit diff
path: root/webclient/components
diff options
context:
space:
mode:
authorKegan Dougal <kegan@matrix.org>2014-08-26 16:19:44 +0100
committerKegan Dougal <kegan@matrix.org>2014-08-26 16:19:44 +0100
commitd0103400b556138fca36160fd0273c0141ca94c4 (patch)
tree0a66e58777d171743b72cf0e93240f747c6a5825 /webclient/components
parentUse state_key rather than target_user_id (diff)
parentRenaming: /im/sync >> /initialSync. /rooms/$roomid/members/list >> /rooms/$ro... (diff)
downloadsynapse-d0103400b556138fca36160fd0273c0141ca94c4.tar.xz
Merge branch 'client_server_url_rename' into develop
Diffstat (limited to 'webclient/components')
-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,