summary refs log tree commit diff
path: root/synapse/rest (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Renumber priority classes so we can use 0 for defaults.David Baker2015-01-291-5/+5
|
* Allow kind to be set to null to delete a pusher.David Baker2015-01-291-1/+10
|
* Code style fixes.Mark Haines2015-01-292-8/+23
|
* Change uses of get_user_by_req because it returns a tuple now.David Baker2015-01-282-4/+4
|
* Merge pull request #36 from matrix-org/device_id_from_access_tokenMark Haines2015-01-2810-41/+53
|\ | | | | Extract the device id and token id from the access token when autheniticating users
| * Extract the id token of the token when authing users, include the token and ↵Mark Haines2015-01-2810-41/+53
| | | | | | | | device_id in the internal meta data for the event along with the transaction id when sending events
| * Return the device_id from get_auth_by_reqMark Haines2015-01-2810-27/+27
| |
* | spacesDavid Baker2015-01-281-2/+2
| |
* | Unnecessary newlines.David Baker2015-01-281-5/+0
| |
* | Unnecessary newline.David Baker2015-01-281-1/+0
| |
* | Better styleDavid Baker2015-01-281-2/+5
| |
* | Another superfluous newlineDavid Baker2015-01-281-1/+0
| |
* | Ah, the comma of doom.David Baker2015-01-281-1/+1
| |
* | Brackets are nicerDavid Baker2015-01-281-2/+2
| |
* | Unnecessary new lineDavid Baker2015-01-281-1/+0
| |
* | Oops, bad merge: needed to change the base class of the rest servlets too.David Baker2015-01-282-4/+4
| |
* | Merge branch 'develop' into pushersDavid Baker2015-01-2814-104/+158
|\| | | | | | | | | | | Conflicts: synapse/handlers/events.py synapse/server.py
| * Pass the current time to serialize event, rather than passing anMark Haines2015-01-262-2/+15
| | | | | | | | | | | | HS and getting a clock from it and calling time_msec on the clock. Remove the serialize_event method from the HS since it is no longer needed.
| * Add client v2_alpha resource to synapse server resource treeMark Haines2015-01-232-0/+67
| |
| * Extract the client v1 base RestServlet to a separate classMark Haines2015-01-2311-72/+44
| |
| * Replace hs.parse_roomalias with RoomAlias.from_stringMark Haines2015-01-232-6/+7
| |
| * Replace hs.parse_roomid with RoomID.from_stringMark Haines2015-01-231-2/+2
| |
| * Replace hs.parse_userid with UserID.from_stringMark Haines2015-01-234-16/+21
| |
| * Merge rest servlets into the client json resource objectMark Haines2015-01-231-11/+7
| |
* | Add API to delete push rules.David Baker2015-01-231-1/+40
| |
* | Use push settings!David Baker2015-01-231-14/+29
| |
* | more pep8David Baker2015-01-231-2/+4
| |
* | Make string format tuple an actual tupleDavid Baker2015-01-231-1/+1
| |
* | redundant parensDavid Baker2015-01-231-1/+1
| |
* | stray spaceDavid Baker2015-01-231-1/+1
| |
* | make per-device rules workDavid Baker2015-01-231-5/+15
| |
* | Add slightly pedantic trailing slash error.David Baker2015-01-231-2/+13
| |
* | Fix adding rules without before/after & add the rule that we couldn't find ↵David Baker2015-01-231-2/+2
| | | | | | | | to the error
* | This really serves me right for ever making a map called 'map'.David Baker2015-01-231-1/+1
| |
* | As yet fairly untested GET API for push rulesDavid Baker2015-01-221-10/+128
| |
* | Merge branch 'develop' into pushersDavid Baker2015-01-2228-40/+1316
|\| | | | | | | | | Conflicts: synapse/rest/__init__.py
| * Move rest APIs back under the rest directoryMark Haines2015-01-2226-0/+3059
| |
| * Move client v1 api rest servlets into a "client/v1" directoryMark Haines2015-01-2213-1783/+0
| |
| * Have /join/:room_id return the room ID in response anyway, for consistency ↵Paul "LeoNerd" Evans2015-01-131-1/+1
| | | | | | | | of clients (SYN-234)
* | Oops: second part of commit dc938606David Baker2015-01-221-1/+2
| |
* | Add rest API & store for creating push rulesDavid Baker2015-01-221-0/+195
| | | | | | | | | | Also make unrecognised request error look more like synapse errors because it makes it easier to throw them from within rest classes.
* | add instance_handles to pushers so we have a way to refer to them even if ↵David Baker2015-01-201-1/+2
| | | | | | | | the push token changes.
* | Require device language when adding a pusher.David Baker2015-01-161-1/+2
| | | | | | | | | | Because this seems like it might be useful to do sooner rather than later.
* | Merge branch 'develop' into pushersDavid Baker2015-01-1313-16/+25
|\|
| * Add raw query param for scrollback.Kegan Dougal2015-01-081-1/+4
| |
| * Return the raw federation event rather than adding extra keys for federation ↵Kegan Dougal2015-01-082-4/+4
| | | | | | | | data.
| * Add 'raw' query parameter to expose the event graph and signatures to savvy ↵Kegan Dougal2015-01-082-2/+8
| | | | | | | | clients.
| * Update copyright noticesMark Haines2015-01-0613-13/+13
| |
* | Merge branch 'develop' into pushersDavid Baker2014-12-1810-112/+111
|\| | | | | | | | | | | | | Conflicts: synapse/api/errors.py synapse/server.py synapse/storage/__init__.py
| * clean up coding style a bitMark Haines2014-12-162-3/+6
| |
| * Kill off synapse.api.events.*Erik Johnston2014-12-163-8/+5
| |
| * Rename MessageHandler.handle_event. Add a few comments.Erik Johnston2014-12-151-5/+5
| |
| * Merge branch 'develop' of github.com:matrix-org/synapse into events_refactorErik Johnston2014-12-151-0/+32
| |\ | | | | | | | | | | | | Conflicts: tests/handlers/test_room.py
| | * Initial tiny hack at REST API for setting room typing notification statusPaul "LeoNerd" Evans2014-12-111-0/+32
| | |
| * | Remove unused importsErik Johnston2014-12-123-3/+0
| | |
| * | Consistently url decode and decode as utf 8 the URL partsErik Johnston2014-12-124-42/+24
| | |
| * | Actually fix bug when uploading state with empty state_keyErik Johnston2014-12-101-2/+2
| | |
| * | Fix bug when uploading state with empty state_keyErik Johnston2014-12-101-9/+11
| | |
| * | Merge branch 'develop' of github.com:matrix-org/synapse into events_refactorErik Johnston2014-12-101-1/+1
| |\|
| | * track replication destination health, and perform exponential back-off when ↵Matthew Hodgson2014-12-071-1/+1
| | | | | | | | | | | | sending transactions. does *not* yet retry transactions, but drops them on the floor if waiting for a server to recover.
| * | Fix registrationErik Johnston2014-12-081-1/+3
| | |
| * | Convert rest and handlers to use new event structureErik Johnston2014-12-042-65/+49
| | |
| * | Merge branch 'develop' of github.com:matrix-org/synapse into events_refactorErik Johnston2014-12-031-1/+3
| |\|
| * | Change DomainSpecificString so that it doesn't use a HomeServer objectErik Johnston2014-12-023-5/+5
| | |
* | | Merge branch 'master' into pushersDavid Baker2014-12-181-1/+3
|\ \ \ | | |/ | |/|
| * | Allow GET /room/:room_id/messages without 'limit' parameter to default to 10Paul "LeoNerd" Evans2014-12-021-1/+3
| |/
* | after a few rethinks, a working implementation of pushers.David Baker2014-12-181-7/+6
| |
* | Update to app_id / app_instance_id (partially) and mangle to be PEP8 compliant.David Baker2014-12-031-12/+20
| |
* | Merge branch 'develop' into pushersDavid Baker2014-12-021-1/+1
|\|
| * Don't double url-decode state event types.Kegan Dougal2014-11-251-1/+1
| |
* | Merge branch 'develop' into pushersDavid Baker2014-11-201-0/+5
|\|
| * Fix pep8 and pyflakes warningsMark Haines2014-11-201-1/+3
| |
| * Merge branch 'develop' into http_client_refactorDavid Baker2014-11-202-9/+6
| |\
| * | Separate out the matrix http client completely because just about all of its ↵David Baker2014-11-201-0/+3
| | | | | | | | | | | | code it now separate from the simple case we need for standard HTTP(S)
* | | Merge branch 'develop' into pushersDavid Baker2014-11-202-9/+6
|\ \ \ | | |/ | |/|
| * | Fix pep8 codestyle warningsMark Haines2014-11-201-1/+0
| | |
| * | Add a few missing yields, Move deferred lists inside PreserveLoggingContext ↵Mark Haines2014-11-201-8/+6
| |/ | | | | | | because they don't interact well with the logging contexts
* / Start creating a module to do generic notifications (just prints them to ↵David Baker2014-11-192-1/+73
|/ | | | stdout currently!)
* Remember also to UTF-8 decode bytes in room alias names in directory server URLsPaul "LeoNerd" Evans2014-11-181-3/+9
|
* Remember to URL decode the room_id in room initialSyncPaul "LeoNerd" Evans2014-11-181-1/+1
|
* Ensure to parse a real pagination config object out of room initialSync ↵Paul "LeoNerd" Evans2014-11-181-2/+4
| | | | request and pass it on
* Rename message handler's new snapshot_room to room_initial_sync() as that ↵Paul "LeoNerd" Evans2014-11-181-1/+1
| | | | better suits its purpose
* Merge remote-tracking branch 'origin/develop' into room-initial-syncPaul "LeoNerd" Evans2014-11-181-1/+3
|\
| * Split out sending the room alias events from creating the alias so that we ↵Mark Haines2014-11-181-1/+3
| | | | | | | | can do them in the right point when creating a room
* | Merge branch 'develop' into room-initial-syncPaul "LeoNerd" Evans2014-11-173-13/+43
|\| | | | | | | | | Conflicts: synapse/handlers/message.py
| * Add an EventValidator. Fix bugs in auth ++ storageErik Johnston2014-11-102-0/+15
| |
| * Merge branch 'develop' of github.com:matrix-org/synapse into ↵Erik Johnston2014-11-071-3/+3
| |\ | | | | | | | | | federation_authorization
| * | Implement new replace_state and changed prev_stateErik Johnston2014-11-061-1/+1
| | | | | | | | | | | | | | | `prev_state` is now a list of previous state ids, similiar to prev_events. `replace_state` now points to what we think was replaced.
| * | Merge branch 'develop' of github.com:matrix-org/synapse into ↵Erik Johnston2014-10-305-60/+84
| |\ \ | | | | | | | | | | | | federation_authorization
| * \ \ Merge branch 'event_signing' of github.com:matrix-org/synapse into ↵Erik Johnston2014-10-271-1/+1
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | federation_authorization Conflicts: synapse/storage/__init__.py
| * \ \ \ Merge branch 'develop' of github.com:matrix-org/synapse into ↵Erik Johnston2014-10-272-3/+3
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | federation_authorization Conflicts: synapse/federation/transport.py synapse/handlers/message.py
| * | | | | Use state groups to get current state. Make join dance actually work.Erik Johnston2014-10-172-12/+27
| | | | | |
* | | | | | Have room initialSync return the room's room_idPaul "LeoNerd" Evans2014-11-101-21/+6
| |_|_|_|/ |/| | | |
* | | | | Fix url decoding bugs with /redact and /send APIs.Kegan Dougal2014-11-051-2/+2
| | | | |
* | | | | Be sure to urlencode/decode event types correctly in both the web client and HS.Kegan Dougal2014-11-051-1/+1
| |_|_|/ |/| | |
* | | | Fix pep8 warningsMark Haines2014-10-305-60/+84
| |_|/ |/| |
* | | Fix pyflakes warningsMark Haines2014-10-271-1/+1
| |/ |/|
* | Coturn's timestamps are in seconds, not millisecondsDavid Baker2014-10-211-1/+1
| |
* | Make sure to return an empty JSON object ({}) from presence PUT/POST ↵Paul "LeoNerd" Evans2014-10-141-2/+2
|/ | | | requests rather than an empty string ("") because most deserialisers won't like the latter
* SYN-2: Allow server admins to delete room aliasesErik Johnston2014-09-301-1/+19
|
* SYN-48: Fix typo. Get the whois for requested user rather tahan the requesterErik Johnston2014-09-291-1/+1
|
* SYN-48: Implement WHOIS rest servletErik Johnston2014-09-292-1/+50
|
* Track the IP users connect with. Add an admin column to users table.Erik Johnston2014-09-261-7/+1
|
* Merge branch 'deletions' of github.com:matrix-org/synapse into developErik Johnston2014-09-251-1/+37
|\
| * Rename deletions to redactionsErik Johnston2014-09-241-6/+6
| |
| * Add m.room.deletion. If an event is deleted it will be returned to clients ↵Erik Johnston2014-09-231-1/+37
| | | | | | | | 'pruned', i.e. all client specified keys will be removed.
* | Merge branch 'turn' into developDavid Baker2014-09-252-1/+62
|\ \
| * | Make turn server endpoint return an empty object if no turn servers toDavid Baker2014-09-251-1/+1
| | | | | | | | | | | | | | | match the normal response. Don't break if the turn_uris option isn't present.
| * | The REST API spec only alows for returning a single server so name theDavid Baker2014-09-241-1/+1
| | | | | | | | | | | | endpoint appropriately.
| * | OopsDavid Baker2014-09-241-1/+1
| | |
| * | rename endpoint to better reflect what it is and allow specifying multiple urisDavid Baker2014-09-241-5/+3
| | |
| * | Use standard base64 encoding with padding to get the same result asDavid Baker2014-09-241-2/+5
| | | | | | | | | | | | coturn.
| * | The config is not hierarchicalDavid Baker2014-09-231-3/+3
| | |
| * | Add support for TURN servers as per the TURN REST API ↵David Baker2014-09-232-1/+61
| |/ | | | | | | (http://tools.ietf.org/html/draft-uberti-behave-turn-rest-00)
* | Bugfix for older Pythons that lack hmac.compare_digest()Paul "LeoNerd" Evans2014-09-231-1/+11
| |
* | Merge branch 'jira/SYN-60' into developPaul "LeoNerd" Evans2014-09-231-5/+38
|\ \
| * | Send an HMAC(SHA1) protecting the User ID for the ReCAPTCHA bypass, rather ↵Paul "LeoNerd" Evans2014-09-231-7/+26
| | | | | | | | | | | | than simply the secret itself, so it's useless if that HMAC leaks
| * | Config values are almost never 'None', but they might be empty string. ↵Paul "LeoNerd" Evans2014-09-231-1/+1
| | | | | | | | | | | | Detect their presence by truth
| * | Make sure the config actually /has/ a captcha_bypass_secret set before ↵Paul "LeoNerd" Evans2014-09-231-2/+3
| | | | | | | | | | | | trying to compare it
| * | Allow a (hidden undocumented) key to m.login.recaptcha to specify a shared ↵Paul "LeoNerd" Evans2014-09-231-5/+18
| |/ | | | | | | secret to allow bots to bypass the ReCAPTCHA test (SYN-60)
* / Implemented /rooms/$roomid/state API.Kegan Dougal2014-09-231-6/+7
|/
* Comment out password reset for now, until the mechanism is fully discussed ↵Kegan Dougal2014-09-161-1/+1
| | | | (IS token auth vs HS auth)
* Added PasswordResetRestServlet. Hit the IS to confirm the email/user. Need ↵Kegan Dougal2014-09-161-0/+22
| | | | to send email.
* More helpful 400 error messages.Kegan Dougal2014-09-151-1/+5
|
* Be consistent when associating keys with login types for registration/login.Kegan Dougal2014-09-151-1/+1
|
* Merge branch 'develop' of github.com:matrix-org/synapse into ↵Kegan Dougal2014-09-152-2/+2
|\ | | | | | | registration-api-changes in preparation for re-merge to develop.
| * Correctly handle the 'age' key in events and pdusErik Johnston2014-09-152-2/+2
| |
* | Make captcha work again with the new registration logic.Kegan Dougal2014-09-151-0/+1
| |
* | Split out password/captcha/email logic.Kegan Dougal2014-09-151-84/+153
| |
* | Added LoginType constants. Created general structure for processing ↵Kegan Dougal2014-09-151-20/+75
|/ | | | registrations.
* Added captcha support on both the HS and web client.Kegan Dougal2014-09-051-2/+34
|\ | | | | | | Merge branch 'captcha' of github.com:matrix-org/synapse into develop
| * 80 chars pleaseKegan Dougal2014-09-051-2/+4
| |
| * Add config opion for XFF headers when performing ReCaptcha auth.Kegan Dougal2014-09-051-2/+5
| |
| * Captchas now work on registration. Missing x-forwarded-for config arg ↵Kegan Dougal2014-09-051-3/+26
| | | | | | | | support. Missing reloading a new captcha on the web client / displaying a sensible error message.
| * Added a captcha config to the HS, to enable registration captcha checking ↵Kegan Dougal2014-09-051-1/+5
| | | | | | | | and for the recaptcha private key.
* | Generate m.room.aliases event when the HS creates a room aliasErik Johnston2014-09-051-1/+4
|/
* Empty string is not a valid JSON object, so don't return them in HTTP responses.Erik Johnston2014-09-053-7/+7
|
* Merge branch 'develop' of github.com:matrix-org/synapse into developDavid Baker2014-09-0311-29/+67
|\ | | | | | | | | Conflicts: synapse/http/client.py
| * Implement a kick apiErik Johnston2014-09-031-2/+5
| |
| * fix the copyright holder from matrix.org to OpenMarket Ltd, as matrix.org ↵Matthew Hodgson2014-09-0311-11/+11
| | | | | | | | hasn't been incorporated in time for launch.
| * Bubble up SynapseErrors so expected failures aren't masked.Kegan Dougal2014-09-031-0/+2
| |
| * Add exception handling to directory servlet, so we don't 500. Mark directory ↵Kegan Dougal2014-09-031-2/+16
| | | | | | | | API as volatile in the api docs.
| * Fix up directory server to not require uploading room hosts. Update the room ↵Erik Johnston2014-09-031-1/+1
| | | | | | | | hosts table with the current room hosts (if we have them) on GET.
| * Kill the statePaul "LeoNerd" Evans2014-09-031-5/+1
| | | | | | | | ... key from all the Presence messages
| * apidocs: mtime_age > last_active_ago. Presence REST: Sanity check values in ↵Kegan Dougal2014-09-031-0/+8
| | | | | | | | invite/drop arrays.
| * Edited /presence REST servlet to raise SynapseErrors to return a standard ↵Kegan Dougal2014-09-031-7/+12
| | | | | | | | error response, rather than a string.
| * Fixed /presence APIs to urldecode user IDs.Kegan Dougal2014-09-031-1/+5
| |
| * URL decode user IDs for /profile REST path segments.Kegan Dougal2014-09-031-0/+6
| |
* | Add support for registering with a threepid to the HS (get credentials from ↵David Baker2014-09-031-1/+6
|/ | | | the client and check them against an ID server).
* Add ban support: /rooms/$roomid/ban with { user_id : foo }Kegan Dougal2014-09-031-2/+2
|
* Order matters when adding REST servletsPaul "LeoNerd" Evans2014-09-021-21/+21
|
* Add rest endpoint for the whole user profileDavid Baker2014-09-021-0/+21
|
* Rename 'state' presence key to the much more obvious 'presence'; maintain a ↵Paul "LeoNerd" Evans2014-09-011-1/+5
| | | | legacy 'state' copy for now
* Support multiple login flows when deciding how to login. Updated cmdclient ↵Kegan Dougal2014-08-281-1/+1
| | | | and spec. Webclient doesn't need updating for this.
* Merge branch 'develop' of github.com:matrix-org/synapse into developErik Johnston2014-08-271-0/+46
|\
| * Added RestServlet for /rooms/$roomid/initialSyncKegan Dougal2014-08-271-0/+30
| |
| * Added RestServlet for /rooms/$roomid/stateKegan Dougal2014-08-271-0/+16
| |
* | Merge branch 'develop' of github.com:matrix-org/synapse into stream_refactorErik Johnston2014-08-274-37/+14
|\|
| * Renamed /ds to /directoryKegan Dougal2014-08-271-1/+1
| |
| * Renamed /public/rooms to /publicRoomsKegan Dougal2014-08-273-36/+13
| |
* | Merge branch 'develop' of github.com:matrix-org/synapse into stream_refactorErik Johnston2014-08-273-31/+81
|\| | | | | | | | | | | | | Conflicts: synapse/handlers/events.py synapse/rest/events.py synapse/rest/room.py
| * Final url modifications: renamed /presence_list to /presence/list to keep ↵Kegan Dougal2014-08-271-1/+1
| | | | | | | | the top-level namespace clean. Updated tests.
| * Renamed /rooms to /createRoom. Removed ability to PUT raw room IDs, and ↵Kegan Dougal2014-08-271-17/+14
| | | | | | | | removed tests which tested that. Updated cmdclient and webclient.
| * Added support for GET /events/$eventid with auth checks.Kegan Dougal2014-08-271-0/+17
| |
| * Modified /join/$identifier to support $identifier being a room ID in ↵Kegan Dougal2014-08-271-13/+50
| | | | | | | | addition to a room alias.
* | Merge branch 'develop' of github.com:matrix-org/synapse into stream_refactorErik Johnston2014-08-262-112/+47
|\|
| * Pepper UT TODOsKegan Dougal2014-08-262-0/+6
| |
| * Feedback: Removed FeedbackRestServlet. Modified keys on FeedbackEvent. ↵Kegan Dougal2014-08-261-70/+0
| | | | | | | | Expanded the feedback constants to fully explain what type of feedback they are.
| * Removed MessageRestServlet, use RoomSendEventRestServlet instead. Updated ↵Kegan Dougal2014-08-261-49/+0
| | | | | | | | cmdclient, tests and webclient. All appears to work.
| * Added RoomSendEventRestServlet to send generic non-state events. It even ↵Kegan Dougal2014-08-261-2/+50
| | | | | | | | appears to work..!
* | WIP: Completely change how event streaming and pagination work. This ↵Erik Johnston2014-08-263-3/+5
|/ | | | reflects the change in the underlying storage model.
* Renaming: /im/sync >> /initialSync. /rooms/$roomid/members/list >> ↵Kegan Dougal2014-08-263-7/+8
| | | | /rooms/$roomid/members. /rooms$roomid/messages/list >> /room/$roomid/messages. Updated cmdclient, tests and webclient.
* Fix pyflakes errorsMark Haines2014-08-261-1/+1
|
* Implemented /rooms/$roomid/[invite|join|leave] with POST / PUT (incl txn ids)Kegan Dougal2014-08-262-8/+35
|
* Added basic in-memory REST transaction storage. Only the latest transaction ↵Kegan Dougal2014-08-263-2/+103
| | | | for a given path/access_token combo is stored in order to prevent storing ALL request/response pairs.
* Added servlet for /rooms/$roomid/[invite|join|leave]Kegan Dougal2014-08-261-0/+40
|
* Adjusted webclient to use new state paths. Updated membership msg template ↵Kegan Dougal2014-08-261-1/+2
| | | | to actually show the person invited. Factored out common membership functions in matrix service.
* Merge branch 'develop' of github.com:matrix-org/synapse into ↵Kegan Dougal2014-08-261-2/+2
|\ | | | | | | client_server_url_rename
| * Encode unicode from json as utf-8. This was required to allow people to ↵Erik Johnston2014-08-241-2/+2
| | | | | | | | register on my laptop
* | Removed member list servlet: now using generic state paths.Kegan Dougal2014-08-261-81/+22
| |
* | Impl: /rooms/roomid/state/eventtype/state_key - Renamed RoomTopicRestServlet ↵Kegan Dougal2014-08-221-12/+35
|/ | | | to RoomStateEventRestServlet. Support generic state event sending.
* Kill the "_homeserver_" injected messages for room membership changesPaul "LeoNerd" Evans2014-08-201-2/+2
|
* Merge branch 'master' of github.com:matrix-org/synapse into sql_refactorErik Johnston2014-08-191-8/+10
|\ | | | | | | | | | | | | Conflicts: tests/rest/test_presence.py tests/rest/test_rooms.py tests/utils.py
| * More unquotes. Also, don't return the room_id on membership state changes, ↵Kegan Dougal2014-08-191-6/+8
| | | | | | | | they already know it.
| * Unquote sender IDs.Kegan Dougal2014-08-191-2/+2
| |
* | Add a 'backfill room' buttonErik Johnston2014-08-191-0/+16
| |
* | Merge branch 'master' of github.com:matrix-org/synapse into sql_refactorErik Johnston2014-08-182-5/+9
|\|
| * Update the default longpoll timeout time.Kegan Dougal2014-08-181-1/+1
| |
| * Precent lack of presence visiblity from causing room /members/list to failPaul "LeoNerd" Evans2014-08-181-4/+8
| |
* | We don't need to do a json.loads hereErik Johnston2014-08-181-2/+2
| |
* | Merge branch 'master' of github.com:matrix-org/synapse into sql_refactorErik Johnston2014-08-151-0/+7
|\|
| * Also include users' presence when responding to /rooms/:room_id/members/listPaul "LeoNerd" Evans2014-08-151-0/+7
| |
* | Merge branch 'master' of github.com:matrix-org/synapse into sql_refactorErik Johnston2014-08-154-62/+19
|\| | | | | | | | | Conflicts: synapse/storage/stream.py
| * Pass back the user_id in the response to /login in case it has changed. ↵Kegan Dougal2014-08-141-0/+6
| | | | | | | | Store and use that on the webclient rather than the input field.
| * Added a urls module for keeping client and federation prefixes.Kegan Dougal2014-08-141-2/+1
| |
| * Make federation use resource_for_federation as well.Kegan Dougal2014-08-142-47/+1
| |
| * Start phasing out HttpServer: we should be using Resources instead. Added ↵Kegan Dougal2014-08-142-15/+13
| | | | | | | | resource_for_client/federation/web_client to the HomeServer and hooked the C-S servlets to operate on resource_for_client. Dynamically construct the Resource tree.
* | Start fixing places that use the data store.Erik Johnston2014-08-141-18/+21
|/
* Implement directory service federation by Federation Queries; avoid ↵Paul "LeoNerd" Evans2014-08-131-7/+1
| | | | local_only hack; add unit tests
* Add a HomeServer.parse_roomalias() to avoid having to ↵Paul "LeoNerd" Evans2014-08-132-13/+6
| | | | RoomAlias.from_sring(..., hs=hs) - similar to parse_userid()
* Now that HS->HS Profile lookups use Federation Queries, we don't need the ↵Paul "LeoNerd" Evans2014-08-131-2/+0
| | | | 'local_only' antirecursion hack
* Added a -w flag which will host the web client if specified. Currently this ↵Kegan Dougal2014-08-133-43/+52
| | | | just delegates to the webclient RestServlet.
* add in whitespace after copyright statements to improve legibilityMatthew Hodgson2014-08-1311-0/+11
|
* actually register the login servlet (uncommitted code thinko?)Matthew Hodgson2014-08-131-3/+2
|
* Reference Matrix Home Servermatrix.org2014-08-1211-0/+1129