summary refs log tree commit diff
path: root/synapse/rest (follow)
Commit message (Expand)AuthorAgeFilesLines
* password -> account servlet and add start of an 'add 3pid' endpointDavid Baker2015-04-172-2/+17
* Return user ID in use error straight awayDavid Baker2015-04-161-2/+23
* Dummy login so we can do the first POST request to get login flows without it...David Baker2015-04-151-4/+14
* Regstration with email in v2David Baker2015-04-152-7/+7
* Add app service auth back in to v2 registerDavid Baker2015-04-021-2/+7
* Throw sensible errors on not-json when allowing empty bodyDavid Baker2015-04-021-1/+4
* pep8David Baker2015-04-021-0/+1
* Add shared secret auth into register v2 and switch the script over.David Baker2015-04-021-11/+58
* Completely replace fallback auth for C/S V2:David Baker2015-04-013-2/+193
* pep8David Baker2015-03-312-3/+4
* New registration for C/S API v2. Only ReCAPTCHA working currently.David Baker2015-03-303-1/+95
* Allow multiple pushers for a single app ID & pushkey, honouring the 'append' ...David Baker2015-03-251-1/+12
* 1) Pushers are now associated with an access tokenDavid Baker2015-03-242-2/+3
* Make deleting other access tokens when you change your password actually workDavid Baker2015-03-241-1/+4
* pep8 / pyflakesDavid Baker2015-03-231-2/+2
* Implement password changing (finally) along with a start on making client/ser...David Baker2015-03-233-1/+91
* Factor out user id validation checksErik Johnston2015-03-181-9/+5
* Do more validation of incoming requestErik Johnston2015-03-181-3/+3
* Use 403 instead of 400Erik Johnston2015-03-161-1/+1
* Implement registering with shared secret.Erik Johnston2015-03-131-2/+55
* bump dep on syweb 0.6.5Matthew Hodgson2015-03-121-2/+3
* Add the master push rule for the break-my-push button. Allow server default r...David Baker2015-03-101-1/+4
* Merge branch 'develop' into pushrules2David Baker2015-03-041-29/+6
|\
| * Convert expected format for AS regex to include exclusivity.Kegan Dougal2015-02-271-29/+6
* | s/user_name/user/ as per mjark's commentDavid Baker2015-03-021-3/+3
* | Oops, missed a replacement.David Baker2015-03-021-1/+1
* | Blank linesDavid Baker2015-03-021-0/+1
* | It's set_tweak now, not set_soundDavid Baker2015-02-271-1/+1
* | Add API for getting/setting enabled-ness of push rules.David Baker2015-02-261-5/+49
|/
* SYWEB-278 Don't allow rules with no rule_id.David Baker2015-02-251-1/+1
* Always allow AS to registerErik Johnston2015-02-201-3/+5
* Disable registration if config option was set.Erik Johnston2015-02-191-0/+4
* SYN-282: Don't log tracebacks for client errorsMark Haines2015-02-181-1/+1
* Merge pull request #50 from matrix-org/application-servicesMark Haines2015-02-136-14/+282
|\
| * Fix newline on __init__Kegan Dougal2015-02-111-1/+0
| * PEP8-ifyKegan Dougal2015-02-111-1/+1
| * Add newline to EOFKegan Dougal2015-02-111-0/+1
| * Notify ASes for events sent by other users in a room which an AS user is a pa...Kegan Dougal2015-02-111-2/+2
| * Merge branch 'develop' into application-servicesKegan Dougal2015-02-115-14/+23
| |\
| * \ Merge branch 'develop' into application-servicesKegan Dougal2015-02-095-28/+36
| |\ \
| * | | Grant ASes the ability to delete aliases in their own namespace.Kegan Dougal2015-02-061-2/+29
| * | | Grant ASes the ability to create alias in their own namespace.Kegan Dougal2015-02-061-11/+18
| * | | Add m.login.application_service registration procedure.Kegan Dougal2015-02-051-1/+23
| * | | Merge branch 'develop' into application-servicesKegan Dougal2015-02-051-4/+0
| |\ \ \
| * \ \ \ Merge branch 'develop' into application-servicesKegan Dougal2015-02-051-149/+150
| |\ \ \ \
| * \ \ \ \ Merge branch 'develop' into application-servicesKegan Dougal2015-02-052-20/+20
| |\ \ \ \ \
| * | | | | | Add hs_token column and generate a different token f.e application service.Kegan Dougal2015-02-051-2/+2
| * | | | | | Merge branch 'develop' into application-servicesKegan Dougal2015-02-042-0/+53
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'develop' into application-servicesKegan Dougal2015-02-0216-44/+868
| |\ \ \ \ \ \ \
| * | | | | | | | Add basic application_services SQL, and hook up parts of the appservice store...Kegan Dougal2015-01-281-2/+2
| * | | | | | | | Use ApplicationService when registering.Kegan Dougal2015-01-271-2/+6
| * | | | | | | | Add appservice handler and store. Glue together rest > handler > store.Kegan Dougal2015-01-272-3/+8
| * | | | | | | | Parse /register and /unregister request JSON.Kegan Dougal2015-01-271-2/+78
| * | | | | | | | Add stub application services REST API.Kegan Dougal2015-01-274-0/+127
* | | | | | | | | Blunty replace json with simplejsonErik Johnston2015-02-1110-10/+10
| |_|_|_|_|_|_|/ |/| | | | | | |
* | | | | | | | Fix code-styleMark Haines2015-02-103-4/+4
* | | | | | | | Code-style fixesMark Haines2015-02-103-10/+19
| |_|_|_|_|_|/ |/| | | | | |
* | | | | | | Log when we receive a request, when we send a response and how long it took t...Erik Johnston2015-02-092-2/+2
* | | | | | | ...and here's the actual impl. git fail.Matthew Hodgson2015-02-071-25/+32
* | | | | | | thou shalt specify a content-lengthMatthew Hodgson2015-02-071-0/+1
* | | | | | | i hate weakly typed languagesMatthew Hodgson2015-02-071-1/+1
| |_|_|_|_|/ |/| | | | |
* | | | | | priority class now dealt with in namespaced rule_idDavid Baker2015-02-051-4/+0
| |_|_|_|/ |/| | | |
* | | | | Give server default rules the 'default' attribute and fix various brokenness.David Baker2015-02-051-1/+3
* | | | | Server default rules now of all kinds rather than all being at lowest prio.David Baker2015-02-051-39/+32
* | | | | namespace rule IDs to be unique within their scope and rule type.David Baker2015-02-051-123/+129
| |_|_|/ |/| | |
* | | | More s/instance_handle/profile_tag/David Baker2015-02-041-5/+5
* | | | s/instance_handle/profile_tag/David Baker2015-02-032-16/+16
| |_|/ |/| |
* | | Add Cache-Control header to identiconMark Haines2015-02-021-0/+3
* | | Fix setting identicon width and heightMark Haines2015-02-021-2/+2
* | | Spell height more correctlyMark Haines2015-02-021-1/+1
* | | Add a media/v1/identicon resource for generating identicons using pydenticonMark Haines2015-02-022-0/+50
| |/ |/|
* | Spit out server default rules too.David Baker2015-01-301-4/+12
* | Merge pull request #41 from matrix-org/client_v2_syncMark Haines2015-01-302-2/+209
|\ \
| * | Pass client info to the sync_configMark Haines2015-01-301-1/+1
| * | Filter the recent events before applying the limit when doing an incremental ...Mark Haines2015-01-301-1/+1
| * | Add basic filtering supportMark Haines2015-01-291-5/+14
| * | Merge branch 'client_v2_filter' into client_v2_syncMark Haines2015-01-291-1/+1
| |\ \
| * | | Move typing notifs to an "emphermal" event list on the room objectMark Haines2015-01-291-2/+2
| * | | Merge branch 'client_v2_filter' into client_v2_syncMark Haines2015-01-292-8/+23
| |\ \ \
| * \ \ \ Merge branch 'client_v2_filter' into client_v2_syncMark Haines2015-01-291-2/+2
| |\ \ \ \
| * \ \ \ \ Merge branch 'client_v2_filter' into client_v2_syncMark Haines2015-01-294-5/+110
| |\ \ \ \ \
| * | | | | | Add typing notifications to syncMark Haines2015-01-291-10/+8
| * | | | | | Include transaction ids in unsigned section of events in the sync results for...Mark Haines2015-01-291-7/+16
| * | | | | | Add ports back to demo/start.shMark Haines2015-01-281-1/+1
| * | | | | | Merge branch 'develop' into client_v2_syncMark Haines2015-01-2814-44/+523
| |\ \ \ \ \ \
| * | | | | | | Fix FormattingMark Haines2015-01-271-3/+2
| * | | | | | | Start implementing the non-incremental sync portion of the v2 /sync APIMark Haines2015-01-261-28/+77
| * | | | | | | Merge branch 'develop' into client_v2_syncMark Haines2015-01-262-2/+15
| |\ \ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | |
| * | | | | | | Start implementing the v2_alpha sync APIMark Haines2015-01-233-0/+214
* | | | | | | | Add glob asterisks when running rules.David Baker2015-01-301-4/+1
* | | | | | | | Merge pull request #37 from matrix-org/client_v2_filterErik Johnston2015-01-302-1/+110
|\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | |
| * | | | | | | Create a separate filter object to do the actual filtering, so that we canMark Haines2015-01-291-1/+1
| | |_|_|_|_|/ | |/| | | | |
| * | | | | | Merge branch 'develop' into client_v2_filterMark Haines2015-01-292-8/+23
| |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| * | | | | | Merge in auth changes from developMark Haines2015-01-291-2/+2
| | |_|_|_|/ | |/| | | |
| * | | | | Merge changes from developMark Haines2015-01-2914-44/+523
| |\ \ \ \ \
| * | | | | | Add filter JSON sanity checks.Kegan Dougal2015-01-281-1/+1
| * | | | | | Have the Filtering API return Deferreds, so we can do the Datastore implement...Paul "LeoNerd" Evans2015-01-271-3/+5
| * | | | | | Initial trivial implementation of an actual 'Filtering' object; move storage ...Paul "LeoNerd" Evans2015-01-271-13/+12
| * | | | | | Merge branch 'develop' into client_v2_filterPaul "LeoNerd" Evans2015-01-272-2/+15
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | |
| * | | | | | Initial minimal attempt at /user/:user_id/filter API - in-memory storage, no ...Paul "LeoNerd" Evans2015-01-262-1/+109
* | | | | | | 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 id token of the token when authing users, include the token and d...Mark Haines2015-01-2810-41/+53
| * | | | 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
|\| | |
| * | | Pass the current time to serialize event, rather than passing anMark Haines2015-01-262-2/+15
| |/ /
| * / 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 to...David Baker2015-01-231-2/+2
* | 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
|\|
| * 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 of...Paul "LeoNerd" Evans2015-01-131-1/+1
* | Oops: second part of commit dc938606David Baker2015-01-221-1/+2
* | Add rest API & store for creating push rulesDavid Baker2015-01-221-0/+195
* | add instance_handles to pushers so we have a way to refer to them even if the...David Baker2015-01-201-1/+2
* | Require device language when adding a pusher.David Baker2015-01-161-1/+2
* | 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
| * Add 'raw' query parameter to expose the event graph and signatures to savvy c...Kegan Dougal2015-01-082-2/+8
| * Update copyright noticesMark Haines2015-01-0613-13/+13
* | Merge branch 'develop' into pushersDavid Baker2014-12-1810-112/+111
|\|
| * 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
| |\
| | * 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 s...Matthew Hodgson2014-12-071-1/+1
| * | 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
* | | 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 b...Mark Haines2014-11-201-8/+6
| |/
* / Start creating a module to do generic notifications (just prints them to stdo...David Baker2014-11-192-1/+73
|/
* 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 reque...Paul "LeoNerd" Evans2014-11-181-2/+4
* Rename message handler's new snapshot_room to room_initial_sync() as that bet...Paul "LeoNerd" Evans2014-11-181-1/+1
* 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 ca...Mark Haines2014-11-181-1/+3
* | Merge branch 'develop' into room-initial-syncPaul "LeoNerd" Evans2014-11-173-13/+43
|\|
| * Add an EventValidator. Fix bugs in auth ++ storageErik Johnston2014-11-102-0/+15
| * Merge branch 'develop' of github.com:matrix-org/synapse into federation_autho...Erik Johnston2014-11-071-3/+3
| |\
| * | Implement new replace_state and changed prev_stateErik Johnston2014-11-061-1/+1
| * | Merge branch 'develop' of github.com:matrix-org/synapse into federation_autho...Erik Johnston2014-10-305-60/+84
| |\ \
| * \ \ Merge branch 'event_signing' of github.com:matrix-org/synapse into federation...Erik Johnston2014-10-271-1/+1
| |\ \ \
| * \ \ \ Merge branch 'develop' of github.com:matrix-org/synapse into federation_autho...Erik Johnston2014-10-272-3/+3
| |\ \ \ \
| * | | | | 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 requests...Paul "LeoNerd" Evans2014-10-141-2/+2
|/
* 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 'p...Erik Johnston2014-09-231-1/+37
* | 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
| * | The REST API spec only alows for returning a single server so name theDavid Baker2014-09-241-1/+1
| * | 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
| * | The config is not hierarchicalDavid Baker2014-09-231-3/+3
| * | Add support for TURN servers as per the TURN REST API (http://tools.ietf.org/...David Baker2014-09-232-1/+61
| |/
* | 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 th...Paul "LeoNerd" Evans2014-09-231-7/+26
| * | Config values are almost never 'None', but they might be empty string. Detect...Paul "LeoNerd" Evans2014-09-231-1/+1
| * | Make sure the config actually /has/ a captcha_bypass_secret set before trying...Paul "LeoNerd" Evans2014-09-231-2/+3
| * | Allow a (hidden undocumented) key to m.login.recaptcha to specify a shared se...Paul "LeoNerd" Evans2014-09-231-5/+18
| |/
* / Implemented /rooms/$roomid/state API.Kegan Dougal2014-09-231-6/+7
|/
* Comment out password reset for now, until the mechanism is fully discussed (I...Kegan Dougal2014-09-161-1/+1
* Added PasswordResetRestServlet. Hit the IS to confirm the email/user. Need to...Kegan Dougal2014-09-161-0/+22
* 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 registration-api...Kegan Dougal2014-09-152-2/+2
|\
| * 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 registrat...Kegan Dougal2014-09-151-20/+75
|/
* Added captcha support on both the HS and web client.Kegan Dougal2014-09-051-2/+34
|\
| * 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 support...Kegan Dougal2014-09-051-3/+26
| * Added a captcha config to the HS, to enable registration captcha checking and...Kegan Dougal2014-09-051-1/+5
* | 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
|\
| * Implement a kick apiErik Johnston2014-09-031-2/+5
| * fix the copyright holder from matrix.org to OpenMarket Ltd, as matrix.org has...Matthew Hodgson2014-09-0311-11/+11
| * 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
| * Fix up directory server to not require uploading room hosts. Update the room ...Erik Johnston2014-09-031-1/+1
| * Kill the statePaul "LeoNerd" Evans2014-09-031-5/+1
| * apidocs: mtime_age > last_active_ago. Presence REST: Sanity check values in i...Kegan Dougal2014-09-031-0/+8
| * Edited /presence REST servlet to raise SynapseErrors to return a standard err...Kegan Dougal2014-09-031-7/+12
| * 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 t...David Baker2014-09-031-1/+6
|/
* Add ban support: /rooms/$roomid/ban with { user_id : foo }Kegan Dougal2014-09-031-2/+2