summary refs log tree commit diff
path: root/synapse/rest/client (follow)
Commit message (Expand)AuthorAgeFilesLines
* Include bundled aggregations in the sync response cache. (#11659)Patrick Cloke2022-01-131-14/+3
* Merge branch 'release-v1.50' into developOlivier Wilkinson (reivilibre)2022-01-071-0/+3
|\
| * Include `io.element.thread` capability for MSC3440. (#11690)Patrick Cloke2022-01-051-0/+3
* | Bundle aggregations outside of the serialization method. (#11612)Patrick Cloke2022-01-075-34/+48
* | Remove the /send_relation endpoint. (#11682)Patrick Cloke2022-01-061-120/+5
|/
* Add type hints to event_push_actions. (#11594)Patrick Cloke2021-12-211-10/+10
* Various opentracing enhancements (#11619)Richard van der Hoff2021-12-211-0/+6
* Do not bundle aggregations for APIs which shouldn't include them. (#11592)Patrick Cloke2021-12-202-5/+9
* Merge remote-tracking branch 'origin/release-v1.49' into developRichard van der Hoff2021-12-201-1/+9
|\
| * Disable aggregation bundling on `/sync` responses (#11583)Richard van der Hoff2021-12-201-1/+9
* | Add MSC2716 and MSC3030 to `/versions` -> `unstable_features` (#11582)Eric Eastwood2021-12-161-0/+4
* | Make `get_device` return None if the device doesn't exist rather than raising...reivilibre2021-12-131-2/+4
* | Do not allow cross-room relations, per MSC2674. (#11516)Patrick Cloke2021-12-091-1/+6
* | Support unprefixed versions of fallback key property names. (#11541)Hubert Chathi2021-12-091-0/+3
* | Allow guests to send state events (#11378)Robert Long2021-12-091-1/+1
* | Add a constant for receipt types (m.read). (#11531)Patrick Cloke2021-12-083-6/+7
|/
* Stabilise support for MSC2918 refresh tokens as they have now been merged int...reivilibre2021-12-062-29/+23
* Save the OIDC session ID (sid) with the device on login (#11482)Quentin Gliech2021-12-061-2/+5
* Include bundled aggregations in /sync and related fixes (#11478)Patrick Cloke2021-12-063-12/+8
* Add MSC3030 experimental client and federation API endpoints to get the close...Eric Eastwood2021-12-021-0/+58
* Register the login redirect endpoint for v3. (#11451)Patrick Cloke2021-12-012-3/+3
* Bundle relations of relations into the `/relations` result. (#11284)Patrick Cloke2021-11-301-6/+3
* Support the stable /hierarchy endpoint from MSC2946 (#11329)Patrick Cloke2021-11-291-4/+4
* Update MSC2918 refresh token support to confirm with the latest revision: acc...reivilibre2021-11-262-8/+13
* Support expiry of refresh tokens and expiry of the overall session when refre...reivilibre2021-11-261-15/+37
* Rename unstable `access_token_lifetime` configuration option to `refreshable_...reivilibre2021-11-232-5/+13
* Refactor the code to inject bundled relations during serialization. (#11408)Patrick Cloke2021-11-233-5/+5
* Add config for customizing the claim used for JWT logins. (#11361)Kostas2021-11-221-1/+2
* Add support for `/_matrix/client/v3` APIs (#11318)Aaron R2021-11-162-3/+3
* Add support for the stable version of MSC2778 (#11335)Tulir Asokan2021-11-151-2/+7
* Support filtering by relations per MSC3440 (#11236)Patrick Cloke2021-11-092-5/+11
* Fix typo in `RelationAggregationPaginationServlet` error response (#11278)Andrew Morgan2021-11-091-1/+3
* Require body for read receipts with user-agent exceptions (#11157)rogersheu2021-11-091-1/+11
* Rename to more clear `get_insertion_event_id_by_batch_id` (MSC2716) (#11244)Eric Eastwood2021-11-081-1/+1
* Enable passing typing stream writers as a list. (#11237)Nick Barrett2021-11-031-1/+1
* Support sending no `state_events_at_start` in the MSC2716 `/batch_send` endpo...Eric Eastwood2021-11-031-12/+17
* Add remaining type hints to `synapse.events`. (#11098)Patrick Cloke2021-11-021-1/+1
* Support Client-Server API r0.6.1 (#11097)Aaron R2021-11-011-0/+1
* Add a thread relation type per MSC3440. (#11088)Patrick Cloke2021-10-211-1/+2
* Resolve and share `state_groups` for all historical events in batch (MSC2716)...Eric Eastwood2021-10-131-9/+6
* Add type hints to synapse.events.*. (#11066)Patrick Cloke2021-10-131-4/+4
* Refactor MSC2716 `/batch_send` endpoint into separate handler functions (#10974)Eric Eastwood2021-10-081-283/+56
* Require direct references to configuration variables. (#10985)Patrick Cloke2021-10-062-2/+4
* Use direct references for configuration variables (part 7). (#10959)Patrick Cloke2021-10-045-32/+34
* Fix getTurnServer response: return an integer ttl (#10922)Lukas Lihotzki2021-09-301-1/+1
* Use direct references for configuration variables (part 6). (#10916)Patrick Cloke2021-09-298-17/+17
* Implement MSC3069: Guest support on whoami (#9655)Travis Ralston2021-09-291-2/+6
* Ensure `(room_id, next_batch_id)` is unique to avoid cross-talk/conflicts bet...Eric Eastwood2021-09-281-2/+4
* Use direct references for configuration variables (part 5). (#10897)Patrick Cloke2021-09-244-11/+11
* Use direct references for configuration variables (part 4). (#10893)Patrick Cloke2021-09-231-6/+6
* Use direct references for some configuration variables (part 3) (#10885)Patrick Cloke2021-09-235-43/+45
* Remove unnecessary parentheses around tuples returned from methods (#10889)Andrew Morgan2021-09-232-4/+4
* Rename MSC2716 things from `chunk` to `batch` to match `/batch_send` endpoint...Eric Eastwood2021-09-211-43/+43
* Rename `/batch_send` query parameter from `?prev_event` to more obvious usage...Eric Eastwood2021-09-211-7/+9
* Verify `?chunk_id` actually corresponds to an insertion event that exists (MS...Eric Eastwood2021-09-151-1/+12
* Split out `/batch_send` meta events to their own fields (MSC2716) (#10777)Eric Eastwood2021-09-151-11/+18
* Use direct references for some configuration variables (#10798)Patrick Cloke2021-09-135-11/+14
* Add types to synapse.util. (#10601)reivilibre2021-09-101-4/+7
* Remove unstable MSC2858 API, including `experimental.msc2858_enabled` config ...Sean2021-09-091-46/+11
* Additional type hints for client REST servlets (part 5) (#10736)Patrick Cloke2021-09-034-66/+119
* Additional type hints for client REST servlets (part 4) (#10728)Patrick Cloke2021-09-018-100/+144
* Additional type hints for the client REST servlets (part 3). (#10707)Patrick Cloke2021-08-316-150/+305
* Remove unused `compare_digest` function. (#10706)Patrick Cloke2021-08-271-13/+0
* Additional type hints for REST servlets (part 2). (#10674)Patrick Cloke2021-08-2615-138/+210
* Correctly initialise the `synapse_user_logins` metric. (#10677)Richard van der Hoff2021-08-241-6/+23
* Additional type hints for the sync REST servlet. (#10666)Patrick Cloke2021-08-231-51/+81
* Addtional type hints for the REST servlets. (#10665)Patrick Cloke2021-08-2313-107/+203
* Implement MSC3231: Token authenticated registration (#10142)Callum Brown2021-08-212-0/+96
* Validate device_keys for C-S /keys/query requests (#10593)David Robertson2021-08-201-1/+15
* Support MSC3283: Expose `enable_set_displayname` in capabilities (#10452)Dirk Klimpel2021-08-191-0/+11
* Merge branch 'release-v1.41' into developErik Johnston2021-08-181-1/+1
|\
| * Allow /createRoom to be run on workers (#10564)Andrew Morgan2021-08-171-1/+1
* | Display an error page during failure of fallback UIA. (#10561)Callum Brown2021-08-181-15/+24
|/
* Flatten the synapse.rest.client package (#10600)reivilibre2021-08-1743-40/+14
* Always list fallback key types in /sync (#10623)Andrew Morgan2021-08-171-4/+5
* Validate the max_rooms_per_space parameter to ensure it is non-negative. (#10...Patrick Cloke2021-08-161-5/+20
* Experimental support for MSC3266 Room Summary API. (#10394)Michael Telatynski2021-08-161-33/+57
* Move /batch_send to /v2_alpha directory (MSC2716) (#10576)Eric Eastwood2021-08-132-409/+442
* Only return state events that the AS passed in via `state_events_at_start` (M...Eric Eastwood2021-08-101-1/+3
* Add local support for the new spaces summary endpoint (MSC2946) (#10549)Patrick Cloke2021-08-101-0/+41
* Fix exceptions in logs when failing to get remote room list (#10541)Erik Johnston2021-08-061-18/+12
* Mark all MSC2716 events as historical (#10537)Eric Eastwood2021-08-051-5/+10
* Don't fail on empty bodies when sending out read receipts (#10531)Brendan Abolivier2021-08-041-1/+1
* Make historical events discoverable from backfill for servers without any scr...Eric Eastwood2021-07-281-1/+6
* Support for MSC2285 (hidden read receipts) (#10413)Å imon Brandner2021-07-283-4/+34
* Support MSC2033: Device ID on whoami (#9918)Travis Ralston2021-07-271-1/+8
* Merge branch 'master' into developErik Johnston2021-07-231-4/+7
|\
| * Always send device_one_time_keys_count (#10457)David Baker2021-07-221-4/+7
* | Add type hints to additional servlet functions (#10437)Patrick Cloke2021-07-211-1/+1
* | Add a return type to parse_string. (#10438)Patrick Cloke2021-07-214-24/+30
* | Switch to `chunk` events so we can auth via power_levels (MSC2716) (#10432)Eric Eastwood2021-07-211-4/+13
* | MSC3244 room capabilities implementation (#10283)Michael Telatynski2021-07-201-1/+7
* | [pyupgrade] `synapse/` (#10348)Jonathan de Jong2021-07-191-16/+9
* | Use inline type hints in `handlers/` and `rest/`. (#10382)Jonathan de Jong2021-07-163-12/+8
* | Add a module type for account validity (#9884)Brendan Abolivier2021-07-161-6/+1
* | Fix messages from multiple senders in historical chunk (MSC2716) (#10276)Eric Eastwood2021-07-131-7/+42
* | Add base starting insertion event when no chunk ID is provided (MSC2716) (#10...Eric Eastwood2021-07-081-23/+89
|/
* MSC2918 Refresh tokens implementation (#9450)Quentin Gliech2021-06-242-41/+218
* Re-introduce "Leave out optional keys from /sync" change (#10214)Andrew Morgan2021-06-231-23/+46
* Add endpoints for backfilling history (MSC2716) (#9247)Eric Eastwood2021-06-221-1/+287
* Always require users to re-authenticate for dangerous operations. (#10184)Patrick Cloke2021-06-162-0/+9
* Fix requestOpenIdToken response: integer expires_in (#10175)Lukas Lihotzki2021-06-161-1/+1
* Remove the experimental flag for knocking and use stable prefixes / endpoints...Patrick Cloke2021-06-151-4/+2
* Implement knock feature (#6739)Sorunome2021-06-093-21/+198
* Limit the number of in-flight /keys/query requests from a single device. (#10...Patrick Cloke2021-06-091-1/+4
* Correct type hints for parse_string(s)_from_args. (#10137)Patrick Cloke2021-06-082-6/+6
* r0.6.1 support: /rooms/:roomId/aliases endpoint (#9224)Travis Ralston2021-06-031-1/+1
* Move some more endpoints off master (#10084)Erik Johnston2021-05-271-4/+4
* Make reason and score optional for report_event (#10077)Callum Brown2021-05-271-9/+4
* Remove the experimental spaces enabled flag. (#10063)Patrick Cloke2021-05-261-3/+1
* Support fetching the spaces summary via GET over federation. (#9947)Patrick Cloke2021-05-111-0/+1
* Revert "Leave out optional keys from /sync (#9919)" (#9940)Erik Johnston2021-05-061-44/+18
* Leave out optional keys from /sync (#9919)DeepBlueV7.X2021-05-051-18/+44
* Split presence out of master (#9820)Erik Johnston2021-04-231-1/+6
* Limit length of accepted email addresses (#9855)Erik Johnston2021-04-222-6/+10
* Rename handler and config modules which end in handler/config. (#9816)Patrick Cloke2021-04-201-1/+1
* Port "Allow users to click account renewal links multiple times without hitti...Andrew Morgan2021-04-191-7/+25
* Remove redundant "coding: utf-8" lines (#9786)Jonathan de Jong2021-04-1443-43/+0
* Require AppserviceRegistrationType (#9548)Will Hunt2021-04-121-7/+16
* Make RateLimiter class check for ratelimit overrides (#9711)Erik Johnston2021-03-303-11/+21
* Make it possible to use dmypy (#9692)Erik Johnston2021-03-261-0/+3
* Add a type hints for service notices to the HomeServer object. (#9675)Patrick Cloke2021-03-241-3/+8
* Import HomeServer from the proper module. (#9665)Patrick Cloke2021-03-233-3/+3
* Incorporate reviewBrendan Abolivier2021-03-191-1/+1
* Merge branch 'develop' into babolivier/msc3026Brendan Abolivier2021-03-191-3/+66
|\
| * fix mypyRichard van der Hoff2021-03-191-4/+7
| * Fix type-hints from bad merge.Patrick Cloke2021-03-181-2/+2
| * Initial spaces summary API (#9643)Richard van der Hoff2021-03-181-3/+63
* | Implement MSC3026: busy presence stateBrendan Abolivier2021-03-181-0/+2
|/
* Fix up types for the typing handler. (#9638)Patrick Cloke2021-03-171-6/+9
* Return m.change_password.enabled=false if local database is disabled (#9588)Dirk Klimpel2021-03-161-11/+12
* Add support for stable MSC2858 API (#9617)Richard van der Hoff2021-03-161-5/+34
* Prevent bundling aggregations for state events (#9619)Andrew Morgan2021-03-161-1/+4
* Fix additional type hints from Twisted 21.2.0. (#9591)Patrick Cloke2021-03-121-32/+73
* Prometheus metrics for logins and registrations (#9511)Richard van der Hoff2021-03-041-2/+8
* Record the SSO Auth Provider in the login token (#9510)Richard van der Hoff2021-03-041-4/+2
* Use the proper Request in type hints. (#9515)Patrick Cloke2021-03-011-1/+1
* SSO: redirect to public URL before setting cookies (#9436)Richard van der Hoff2021-02-261-0/+28
* Ratelimit cross-user key sharing requests. (#8957)Patrick Cloke2021-02-191-3/+1
* Add type hints to groups code. (#9393)Patrick Cloke2021-02-171-23/+120
* Update black, and run auto formatting over the codebase (#9381)Eric Eastwood2021-02-1610-63/+86
* Fix some typos.Patrick Cloke2021-02-121-1/+1
* Type hints and validation improvements. (#9321)Patrick Cloke2021-02-082-60/+121
* Merge pull request #9150 from Yoric/develop-contextDavid Teller2021-02-081-1/+1
|\
| * FIXUP: Making get_event_context a bit more paranoidDavid Teller2021-01-281-1/+1
* | Merge branch 'social_login' into developRichard van der Hoff2021-01-281-0/+2
|\ \
| * | Add 'brand' field to MSC2858 response (#9242)Richard van der Hoff2021-01-271-0/+2
| |/
* / Ratelimit 3PID /requestToken API (#9238)Erik Johnston2021-01-282-2/+16
|/
* Implement MSC2858 support (#9183)Richard van der Hoff2021-01-271-6/+49
* Support icons for Identity Providers (#9154)Richard van der Hoff2021-01-201-2/+1
* Validate the server name for the /publicRooms endpoint. (#9161)Patrick Cloke2021-01-191-2/+17
* Allow moving account data and receipts streams off master (#9104)Erik Johnston2021-01-182-26/+7
* Remove user's avatar URL and displayname when deactivated. (#8932)Dirk Klimpel2021-01-121-2/+5
* UI Auth via SSO: redirect the user to an appropriate SSO. (#9081)Richard van der Hoff2021-01-123-42/+22
* Kill off `HomeServer.get_ip_from_request()` (#9080)Richard van der Hoff2021-01-125-39/+10
* Add some tests for the IDP picker flowRichard van der Hoff2021-01-071-2/+2
* Combine the SSO Redirect Servlets (#9015)Richard van der Hoff2021-01-042-89/+34
* Check if group IDs are valid before using them. (#8977)Patrick Cloke2020-12-301-3/+45
* Validate input parameters for the sendToDevice API. (#8975)Patrick Cloke2020-12-291-1/+2
* Allow redacting events on workers (#8994)Patrick Cloke2020-12-291-7/+10
* Allow re-using a UI auth validation for a period of time (#8970)Patrick Cloke2020-12-181-3/+7
* Merge remote-tracking branch 'origin/erikj/as_mau_block' into developErik Johnston2020-12-181-3/+11
|\
| * Correctly handle AS registerations and add testErik Johnston2020-12-171-3/+11
* | Convert internal pusher dicts to attrs classes. (#8940)Patrick Cloke2020-12-161-14/+1
* | Honour AS ratelimit settings for /login requests (#8920)Erik Johnston2020-12-111-6/+19
* | Fix errorcode for disabled registration (#8867)Richard van der Hoff2020-12-031-1/+1
|/
* Support "identifier" dicts in UIA (#8848)Richard van der Hoff2020-12-011-105/+2
* Simplify appservice login code (#8847)Richard van der Hoff2020-11-301-6/+21
* Simplify the way the `HomeServer` object caches its internal attributes. (#8...Jonathan de Jong2020-11-302-5/+5
* Use TYPE_CHECKING instead of magic MYPY variable. (#8770)Patrick Cloke2020-11-171-3/+2
* Add admin API for logging in as a user (#8617)Erik Johnston2020-11-171-0/+1
* Add metrics for tracking 3PID /requestToken requests. (#8712)Erik Johnston2020-11-132-0/+22
* Remove unused OPTIONS handlers. (#8621)Patrick Cloke2020-10-2212-62/+0
* Expose the experimental appservice login flow to clients. (#8504)Patrick Cloke2020-10-191-0/+2
* Add correct M_BAD_JSON error code to /profile/{userId}/displayname (#8517)Aaron Raimist2020-10-141-1/+3
* Remove the deprecated Handlers object (#8494)Patrick Cloke2020-10-095-32/+26
* Add support for MSC2697: Dehydrated devices (#8380)Hubert Chathi2020-10-072-15/+156
* Add support for MSC2732: olm fallback keys (#8312)Hubert Chathi2020-10-061-0/+1
* Convert additional templates to Jinja (#8444)Patrick Cloke2020-10-021-110/+26
* Do not expose the experimental appservice login flow to clients. (#8440)Patrick Cloke2020-10-011-2/+0
* Make token serializing/deserializing async (#8427)Erik Johnston2020-09-305-11/+19
* Allow additional SSO properties to be passed to the client (#8413)Patrick Cloke2020-09-301-7/+15
* Merge branch 'develop' of github.com:matrix-org/synapse into anoa/info-mainli...Andrew Morgan2020-09-291-6/+9
|\
| * Only assert valid next_link params when provided (#8417)Andrew Morgan2020-09-291-6/+9
* | Don't check whether a 3pid is allowed to register during password resetAndrew Morgan2020-09-281-7/+0
|/
* Merge tag 'v1.20.0rc5' into developPatrick Cloke2020-09-181-0/+19
|\
| * Add flags to /versions about whether new rooms are encrypted by default. (#8343)Patrick Cloke2020-09-181-0/+19
* | Simplify super() calls to Python 3 syntax. (#8344)Patrick Cloke2020-09-1838-121/+121
* | Allow appservice users to /login (#8320)Will Hunt2020-09-181-10/+39
* | Fix a potential bug of UnboundLocalError (#8329)Jonathan de Jong2020-09-171-5/+8
* | Fix typos in comments.Patrick Cloke2020-09-141-1/+1
* | Show a confirmation page during user password reset (#8004)Andrew Morgan2020-09-101-76/+0
* | Don't remember `enabled` of deleted push rules and properly return 404 for mi...reivilibre2020-09-091-2/+13
* | Add a config option for validating 'next_link' parameters against a domain wh...Andrew Morgan2020-09-081-9/+57
|/
* Stop sub-classing object (#8249)Patrick Cloke2020-09-042-2/+2
* Re-implement unread counts (again) (#8059)Brendan Abolivier2020-09-021-0/+1
* Add /user/{user_id}/shared_rooms/ api (#7785)Will Hunt2020-09-022-0/+70
* Move and refactor LoginRestServlet helper methods (#8182)Andrew Morgan2020-08-281-54/+6
* Do not propagate typing notifications from shadow-banned users. (#8176)Patrick Cloke2020-08-261-11/+15
* Remove unused parameter from, and add safeguard in, get_room_data (#8174)Andrew Morgan2020-08-261-1/+0
* Stop shadow-banned users from sending non-member events. (#8142)Patrick Cloke2020-08-243-40/+66
* Don't fail /submit_token requests on incorrect session ID if request_token_in...Brendan Abolivier2020-08-242-0/+17
* Allow denying or shadow banning registrations via the spam checker (#8034)Patrick Cloke2020-08-201-0/+5
* Stop shadow-banned users from sending invites. (#8095)Patrick Cloke2020-08-201-27/+40
* Ensure a group ID is valid before trying to get rooms for it. (#8129)Patrick Cloke2020-08-201-0/+4
* Remove `ChainedIdGenerator`. (#8123)Erik Johnston2020-08-191-1/+1
* Be stricter about JSON that is accepted by Synapse (#8106)Patrick Cloke2020-08-192-7/+9
* Use the default templates when a custom template file cannot be found (#8037)Andrew Morgan2020-08-172-57/+18
* Convert pusher databases to async/await. (#8075)Patrick Cloke2020-08-141-4/+5
* Implement new experimental push rules (#7997)Brendan Abolivier2020-08-101-2/+9
|\
| * Merge branch 'develop' of github.com:matrix-org/synapse into babolivier/new_p...Brendan Abolivier2020-08-061-1/+1
| |\
| * | Incorporate reviewBrendan Abolivier2020-08-061-2/+2
| * | Fix PUT /pushrules to use the right rule IDsBrendan Abolivier2020-08-031-2/+9
* | | Remove unnecessary maybeDeferred calls (#8044)Patrick Cloke2020-08-071-1/+1
* | | Revert #7736 (#8039)Brendan Abolivier2020-08-061-1/+0
* | | Convert synapse.api to async/await (#8031)Patrick Cloke2020-08-062-2/+2
* | | Improve performance of the register endpoint (#8009)Patrick Cloke2020-08-062-65/+129
| |/ |/|
* | Allow guests to operate in encrypted rooms (#7314)Michael Albert2020-08-031-1/+1
|/
* Re-implement unread counts (#7736)Brendan Abolivier2020-07-291-0/+1
* Do not convert async functions to Deferreds in the interactive_auth_handler (...Patrick Cloke2020-07-241-26/+21
* Skip serializing /sync response if client has disconnected (#7927)Richard van der Hoff2020-07-221-0/+6
* Add debugging to sync response generation (#7929)Richard van der Hoff2020-07-221-0/+3
* Add a default limit (of 100) to get/sync operations. (#7858)Patrick Cloke2020-07-171-1/+10
* Allow moving typing off master (#7869)Erik Johnston2020-07-161-0/+9
* Ensure that calls to `json.dumps` are compatible with the standard library js...Patrick Cloke2020-07-151-6/+7
* Return the proper 403 Forbidden error during errors with JWT logins. (#7844)Patrick Cloke2020-07-151-5/+3
* Add the option to validate the `iss` and `aud` claims for JWT logins. (#7827)Patrick Cloke2020-07-141-6/+19
* `update_membership` declaration: now always returns an event id. (#7809)Richard van der Hoff2020-07-091-4/+2
* Stop passing bytes when dumping JSON (#7799)Patrick Cloke2020-07-081-1/+1
* Add documentation for JWT login type and improve sample config. (#7776)Patrick Cloke2020-07-061-21/+27
* Fix inconsistent handling of upper and lower cases of email addresses. (#7021)Dirk Klimpel2020-07-033-16/+58
* Merge branch 'master' into developPatrick Cloke2020-07-025-46/+19
|\
| * Ensure that HTML pages served from Synapse include headers to avoid embedding.Patrick Cloke2020-07-025-46/+19
* | Back out MSC2625 implementation (#7761)Brendan Abolivier2020-07-011-2/+2
* | add org.matrix.login.jwt so that m.login.jwt can be deprecated (#7675)Sorunome2020-06-241-1/+4
* | Implement unread counter (MSC2625) (#7673)Brendan Abolivier2020-06-171-2/+2
|\ \
| * \ Merge branch 'develop' into babolivier/mark_unreadBrendan Abolivier2020-06-151-1/+3
| |\ \
| * | | Use temporary prefixes as per the MSCBrendan Abolivier2020-06-101-1/+1
| * | | Rename dont_push into mark_unreadBrendan Abolivier2020-06-101-2/+2
* | | | Replace all remaining six usage with native Python 3 equivalents (#7704)Dagfinn Ilmari Mannsåker2020-06-165-22/+11
* | | | Merge branch 'master' into developBrendan Abolivier2020-06-161-3/+3
|\ \ \ \ | | |_|/ | |/| |
| * | | Enable 3PID add/bind/unbind endpoints on r0 routesBrendan Abolivier2020-06-151-3/+3
| |/ /
* | / Update m.id.phone to use 'phone' instead of 'number' (#7687)Andrew Morgan2020-06-151-2/+10
| |/ |/|
* | Remove "user_id" from GET /presence. (#7606)Will Hunt2020-06-111-1/+3
|/
* Support CS API v0.6.0 (#6585)Andrew Morgan2020-06-051-15/+1
* Performance improvements and refactor of Ratelimiter (#7595)Andrew Morgan2020-06-052-59/+22
* Fix encryption algorithm typos in tests/comments (#7637)Andrew Morgan2020-06-041-4/+4
* Advertise the token login type when OpenID Connect is enabled. (#7631)Patrick Cloke2020-06-041-8/+3
* Fix a bug in automatic user creation with m.login.jwt. (#7585)Olof Johansson2020-06-011-7/+8
* Add ability to wait for replication streams (#7542)Erik Johnston2020-05-222-9/+13