summary refs log tree commit diff
path: root/synapse/api (follow)
Commit message (Expand)AuthorAgeFilesLines
* Implement MSC3952: Intentional mentions (#14823)Patrick Cloke2023-01-271-0/+3
* Use an enum for direction. (#14927)Patrick Cloke2023-01-271-0/+7
* Merge account data streams (#14826)Erik Johnston2023-01-131-0/+1
* Calculate rooms changed for device lists to work. (#14810)Patrick Cloke2023-01-111-3/+0
* Improve /sync performance of when passing filters with empty arrays. (#14786)Patrick Cloke2023-01-091-5/+8
* Improve validation of field size limits in events. (#14664)reivilibre2022-12-133-17/+27
* Respond with proper error responses on unknown paths. (#14621)Patrick Cloke2022-12-081-4/+2
* Improve logging and opentracing for to-device message handling (#14598)Richard van der Hoff2022-12-061-0/+3
* Create MSC1767 (extensible events) room version; Implement MSC3932 (#14521)Travis Ralston2022-11-281-1/+28
* Initial support for MSC3931: Room version push rule feature flags (#14520)Travis Ralston2022-11-281-1/+20
* Remove redundant types from comments. (#14412)Patrick Cloke2022-11-161-1/+1
* Do not reject `/sync` requests with unrecognised filter fields (#14369)Sean Quah2022-11-071-4/+4
* Implement MSC3912: Relation-based redactions (#14260)Brendan Abolivier2022-11-031-0/+2
* Merge branch 'master' into developOlivier Wilkinson (reivilibre)2022-10-281-1/+7
|\
| * Fix room creation being rate limited too aggressively since Synapse v1.69.0. ...reivilibre2022-10-281-1/+7
* | Use servlets for /key/ endpoints. (#14229)Patrick Cloke2022-10-201-1/+1
* | Explain `SynapseError` and `FederationError` better (#14191)Eric Eastwood2022-10-191-3/+21
|/
* Support filtering the /messages API by relation type (MSC3874). (#14148)Patrick Cloke2022-10-171-3/+24
* Stop getting missing `prev_events` after we already know their signature is i...Eric Eastwood2022-10-151-0/+21
* Use stable identifiers for MSC3771 & MSC3773. (#14050)Patrick Cloke2022-10-071-4/+9
* Track notification counts per thread (implement MSC3773). (#13776)Patrick Cloke2022-10-042-0/+13
* Allow admins to require a manual approval process before new accounts can be ...Brendan Abolivier2022-09-292-0/+27
* Faster Remote Room Joins: tell remote homeservers that we are unable to autho...reivilibre2022-09-231-0/+6
* Remove unused method in `synapse.api.auth.Auth`. (#13795)Quentin Gliech2022-09-141-9/+0
* Tag trace with instance name (#13761)Eric Eastwood2022-09-091-0/+7
* Cancel the processing of key query requests when they time out. (#13680)reivilibre2022-09-071-0/+5
* Rename the `EventFormatVersions` enum values so that they line up with room v...reivilibre2022-09-071-20/+25
* Actually fix typechecking with latest types-jsonschema (#13724)David Robertson2022-09-061-4/+4
* Fix typechecking with latest `types-jsonschema` (#13712)David Robertson2022-09-051-4/+4
* Remove support for unstable private read receipts (#13653)Šimon Brandner2022-09-011-1/+0
* `synapse.api.auth.Auth` cleanup: make permission-related methods use `Request...Quentin Gliech2022-08-221-107/+95
* MSC2716v4 room version - remove namespace from MSC2716 event content fields (...Eric Eastwood2022-08-192-22/+22
* Support stable identifiers for MSC2285: private read receipts. (#13273)Šimon Brandner2022-08-051-1/+2
* Instrument `/messages` for understandable traces in Jaeger (#13368)Eric Eastwood2022-08-031-1/+7
* Rename `RateLimitConfig` to `RatelimitSettings` (#13442)Dirk Klimpel2022-08-031-3/+3
* Use stable prefixes for MSC3827: filtering of `/publicRooms` by room type (#1...Šimon Brandner2022-07-271-1/+1
* Implement MSC3848: Introduce errcodes for specific event sending failures (#1...Will Hunt2022-07-272-13/+56
* Allow rate limiters to passively record actions they cannot limit (#13253)David Robertson2022-07-131-12/+82
* Add support for room version 10 (#13220)Shay2022-07-131-0/+33
* Uniformize spam-checker API, part 5: expand other spam-checker callbacks to r...David Teller2022-07-111-2/+8
* Implement MSC3827: Filtering of `/publicRooms` by room type (#13031)Šimon Brandner2022-06-291-0/+10
* Fix a long-standing bug which meant that rate limiting was not restrictive en...reivilibre2022-06-151-1/+4
* Move the "email unsubscribe" resource, refactor the macaroon generator & simp...Quentin Gliech2022-06-141-148/+45
* Decouple `synapse.api.auth_blocking.AuthBlocking` from `synapse.api.auth.Auth...Quentin Gliech2022-06-141-14/+0
* Reduce the amount of state we pull from the DB (#12811)Erik Johnston2022-06-061-23/+22
* Remove remaining bits of groups code. (#12936)Patrick Cloke2022-06-011-1/+0
* Fix M_USER_ACCOUNT_SUSPENDED error code for spec compliance (#12923)Travis Ralston2022-05-311-1/+1
* Revert "Fix M_USER_ACCOUNT_SUSPENDED error code for spec compliance (#12922)"Travis Ralston2022-05-301-1/+1
* Fix M_USER_ACCOUNT_SUSPENDED error code for spec compliance (#12922)Travis Ralston2022-05-311-1/+1
* Uniformize spam-checker API, part 3: Expand check_event_for_spam with the abi...David Teller2022-05-301-10/+13
* Add code M_USER_ACCOUNT_SUSPENDED, as per MSC3823. (#12845)David Teller2022-05-271-0/+7
* Additional constants for EDU types. (#12884)Patrick Cloke2022-05-272-3/+9
* Remove user-visible groups/communities code (#12553)Patrick Cloke2022-05-251-5/+0
* Uniformize spam-checker API, part 2: check_event_for_spam (#12808)David Teller2022-05-231-3/+1
* Uniformize spam-checker API, part 1: the `Code` enum. (#12703)David Teller2022-05-201-2/+9
* Add a new room version for MSC3787's knock+restricted join rule (#12623)Travis Ralston2022-05-172-0/+34
* Fix incorrect type hint in filtering code. (#12695)Patrick Cloke2022-05-101-2/+3
* Improve comments and error messages around access tokens. (#12577)reivilibre2022-05-051-8/+11
* Use `getClientAddress` instead of `getClientIP`. (#12599)Patrick Cloke2022-05-041-2/+2
* Implement changes to MSC2285 (hidden read receipts) (#12168)Šimon Brandner2022-05-041-4/+2
* Implement MSC2815: allow room moderators to view redacted event content (#12427)Tulir Asokan2022-04-201-0/+18
* Remove references to unstable identifiers from MSC3440. (#12382)Patrick Cloke2022-04-122-14/+0
* Bump `black` and `click` versions (#12320)David Robertson2022-03-291-1/+1
* Support stable identifiers for MSC3440: Threading (#12151)Patrick Cloke2022-03-102-12/+15
* Fix `PushRuleEvaluator` and `Filter` to work on frozendicts (#12100)Richard van der Hoff2022-02-281-2/+3
* Remove `HomeServer.get_datastore()` (#12031)Richard van der Hoff2022-02-233-4/+4
* Fix M_WRONG_ROOM_KEYS_VERSION error not including `current_version` field (#1...Michael Telatynski2022-02-141-0/+3
* Stabilise MSC3231 (Token Based Registration) (#11867)Jonathan de Jong2022-02-041-1/+1
* Remove support for the webclient listener. (#11895)Patrick Cloke2022-02-031-1/+0
* Use auto_attribs/native type hints for attrs classes. (#11692)Patrick Cloke2022-01-131-15/+15
* Allow tracking puppeted users for MAU (#11561)Jason Robinson2022-01-121-0/+13
* Convert all namedtuples to attrs. (#11665)Patrick Cloke2021-12-301-2/+1
* Various opentracing enhancements (#11619)Richard van der Hoff2021-12-211-16/+37
* Add experimental support for MSC3202: allowing application services to masque...reivilibre2021-12-151-14/+72
* Add a constant for receipt types (m.read). (#11531)Patrick Cloke2021-12-081-0/+4
* Annotate string constants in `synapse.api.constants` with `Final` (#11356)Sean Quah2021-11-251-98/+100
* Add support for `/_matrix/media/v3` APIs (#11371)Aaron R2021-11-171-1/+2
* Support filtering by relations per MSC3440 (#11236)Patrick Cloke2021-11-091-31/+84
* Default value for `public_baseurl` (#11210)Richard van der Hoff2021-11-081-3/+0
* Make `check_event_allowed` module API callback not fail open (accept events) ...reivilibre2021-11-011-0/+7
* Refactor `Filter` to handle fields according to data being filtered. (#11194)Patrick Cloke2021-10-271-61/+78
* Add a thread relation type per MSC3440. (#11088)Patrick Cloke2021-10-211-0/+1
* Add missing type hints to synapse.api. (#11109)Patrick Cloke2021-10-186-94/+75
* Remove the deprecated BaseHandler. (#11005)Patrick Cloke2021-10-081-0/+86
* Add type hints to filtering classes. (#10958)Patrick Cloke2021-10-011-43/+74
* Strip "join_authorised_via_users_server" from join events which do not need i...Patrick Cloke2021-09-301-0/+3
* Fix AuthBlocking check when requester is appservice (#10881)Jason Robinson2021-09-241-1/+1
* Use direct references for configuration variables (part 4). (#10893)Patrick Cloke2021-09-231-2/+2
* Rename MSC2716 things from `chunk` to `batch` to match `/batch_send` endpoint...Eric Eastwood2021-09-212-24/+8
* Use direct references for some configuration variables (part 2) (#10812)Patrick Cloke2021-09-152-9/+11
* Use direct references for some configuration variables (#10798)Patrick Cloke2021-09-131-2/+2
* Add types to synapse.util. (#10601)reivilibre2021-09-101-4/+4
* Prefer room v9 for restricted rooms. (#10772)Patrick Cloke2021-09-091-1/+1
* Add a constant for m.federate. (#10775)Patrick Cloke2021-09-081-0/+3
* Merge tag 'v1.42.0rc2' into developBrendan Abolivier2021-09-061-0/+31
|\
| * Support MSC3375: room version 9. (#10747)Patrick Cloke2021-09-031-0/+31
* | Move `maybe_kick_guest_users` out of `BaseHandler` (#10744)Richard van der Hoff2021-09-061-0/+9
* | Populate `rooms.creator` field for easy lookup (#10697)Eric Eastwood2021-09-011-0/+3
|/
* Merge branch 'master' into developErik Johnston2021-08-241-1/+1
|\
| * Set room version 8 as preferred for restricted rooms. (#10571)Patrick Cloke2021-08-201-1/+1
* | Implement MSC3231: Token authenticated registration (#10142)Callum Brown2021-08-211-0/+1
* | Validate device_keys for C-S /keys/query requests (#10593)David Robertson2021-08-201-0/+8
|/
* When redacting, keep event fields around that maintain the historical event s...Eric Eastwood2021-08-091-5/+32
* Support MSC3289: Room version 8 (#10449)Patrick Cloke2021-08-092-15/+15
* Make historical events discoverable from backfill for servers without any scr...Eric Eastwood2021-07-282-3/+27
* Merge tag 'v1.39.0rc3' into developErik Johnston2021-07-281-0/+8
|\
| * Always communicate device OTK counts to clients (#10485)Andrew Morgan2021-07-271-0/+8
* | Support for MSC2285 (hidden read receipts) (#10413)Šimon Brandner2021-07-281-0/+4
* | Update the MSC3083 support to verify if joins are from an authorized server. ...Patrick Cloke2021-07-262-1/+4
* | Switch to `chunk` events so we can auth via power_levels (MSC2716) (#10432)Eric Eastwood2021-07-211-2/+4
* | MSC3244 room capabilities implementation (#10283)Michael Telatynski2021-07-201-2/+36
|/
* Add a module type for account validity (#9884)Brendan Abolivier2021-07-161-7/+10
* Use inline type hints in various other places (in `synapse/`) (#10380)Jonathan de Jong2021-07-155-10/+8
* Fix messages from multiple senders in historical chunk (MSC2716) (#10276)Eric Eastwood2021-07-131-4/+33
* Move methods involving event authentication to EventAuthHandler. (#10268)Patrick Cloke2021-07-011-73/+2
* Correct type hints for synapse.event_auth. (#10253)Patrick Cloke2021-06-301-2/+3
* Do not recurse into non-spaces in the spaces summary. (#10256)Patrick Cloke2021-06-291-0/+6
* MSC2918 Refresh tokens implementation (#9450)Quentin Gliech2021-06-241-0/+5
* Add endpoints for backfilling history (MSC2716) (#9247)Eric Eastwood2021-06-222-5/+17
* Update MSC3083 support per changes in the MSC. (#10189)Patrick Cloke2021-06-171-0/+6
* Make opentracing trace into event persistence (#10134)Richard van der Hoff2021-06-161-2/+2
* Remove support for unstable MSC1772 prefixes. (#10161)Patrick Cloke2021-06-151-3/+0
* Remove the experimental flag for knocking and use stable prefixes / endpoints...Patrick Cloke2021-06-152-5/+6
* Implement knock feature (#6739)Sorunome2021-06-093-4/+29
* Set opentracing priority before setting other tags (#10092)Richard van der Hoff2021-05-281-4/+4
* Remove the experimental spaces enabled flag. (#10063)Patrick Cloke2021-05-261-1/+1
* Support enabling opentracing by user (#9978)Richard van der Hoff2021-05-141-0/+5
* Correctly ratelimit invites when creating a room (#9968)Brendan Abolivier2021-05-121-5/+17
* Fix `m.room_key_request` to-device messages (#9961)Richard van der Hoff2021-05-111-1/+4
* Follow-up to #9915 to correct the identifier for room types.Patrick Cloke2021-05-051-1/+1
* Support stable MSC1772 spaces identifiers. (#9915)Patrick Cloke2021-05-051-0/+3
* Improved validation for received requests (#9817)Richard van der Hoff2021-04-231-0/+3
* Add type hints to auth and auth_blocking. (#9876)Patrick Cloke2021-04-232-42/+45
* Check for space membership during a remote join of a restricted room (#9814)Patrick Cloke2021-04-231-0/+1
* Port "Allow users to click account renewal links multiple times without hitti...Andrew Morgan2021-04-191-2/+4
* Remove redundant "coding: utf-8" lines (#9786)Jonathan de Jong2021-04-149-9/+0
* Require AppserviceRegistrationType (#9548)Will Hunt2021-04-121-0/+5
* Add an experimental room version to support restricted join rules. (#9717)Patrick Cloke2021-03-312-1/+25
* Make RateLimiter class check for ratelimit overrides (#9711)Erik Johnston2021-03-301-45/+55
* Make it possible to use dmypy (#9692)Erik Johnston2021-03-261-0/+5
* Merge branch 'develop' into babolivier/msc3026Brendan Abolivier2021-03-191-0/+6
|\
| * Initial spaces summary API (#9643)Richard van der Hoff2021-03-181-0/+6
* | Implement MSC3026: busy presence stateBrendan Abolivier2021-03-181-0/+1
|/
* Fix additional type hints from Twisted 21.2.0. (#9591)Patrick Cloke2021-03-121-1/+1
* Record the SSO Auth Provider in the login token (#9510)Richard van der Hoff2021-03-041-32/+9
* Ratelimit cross-user key sharing requests. (#8957)Patrick Cloke2021-02-192-6/+11
* Add type hints to groups code. (#9393)Patrick Cloke2021-02-171-0/+5
* Update black, and run auto formatting over the codebase (#9381)Eric Eastwood2021-02-164-19/+24
* Backout changes for automatically calculating the public baseurl. (#9313)Patrick Cloke2021-02-111-0/+2
* Give `public_baseurl` a default value (#9159)Richard van der Hoff2021-01-201-2/+0
* Kill off `HomeServer.get_ip_from_request()` (#9080)Richard van der Hoff2021-01-121-2/+2
* Remove SynapseRequest.get_user_agent (#9069)Richard van der Hoff2021-01-121-1/+2
* Implement MSC2176: Updated redaction rules (#8984)Patrick Cloke2021-01-051-6/+26
* Merge remote-tracking branch 'origin/erikj/as_mau_block' into developErik Johnston2020-12-181-0/+7
|\
| * Don't MAU limit AS ghost usersErik Johnston2020-12-171-0/+7
* | Try and drop stale extremities. (#8929)Erik Johnston2020-12-181-0/+2
* | Do not assume that the contents dictionary includes history_visibility. (#8945)Patrick Cloke2020-12-162-2/+10
* | Honour AS ratelimit settings for /login requests (#8920)Erik Johnston2020-12-111-1/+3
|/
* Add admin API for logging in as a user (#8617)Erik Johnston2020-11-171-4/+29
* Add ability for access tokens to belong to one user but grant access to anoth...Erik Johnston2020-10-291-67/+46
* Fix handling of User-Agent headers with bad utf-8. (#8632)Erik Johnston2020-10-231-3/+1
* type annotations for LruCacheRichard van der Hoff2020-10-161-1/+3
* Make LruCache register its own metrics (#8561)Richard van der Hoff2020-10-161-3/+1
* Do not assume that account data is of the correct form. (#8454)Patrick Cloke2020-10-051-0/+5
* Don't push if an user account has expired (#8353)Mathieu Velten2020-09-231-5/+1
* Simplify super() calls to Python 3 syntax. (#8344)Patrick Cloke2020-09-182-28/+24
* Show a confirmation page during user password reset (#8004)Andrew Morgan2020-09-101-0/+1
* Directly import json from the standard library. (#8259)Patrick Cloke2020-09-081-1/+1
* Stop sub-classing object (#8249)Patrick Cloke2020-09-048-26/+26
* Do not apply ratelimiting on joins to appservices (#8139)Will Hunt2020-08-211-0/+37
* Stop shadow-banned users from sending invites. (#8095)Patrick Cloke2020-08-201-0/+8
* Be stricter about JSON that is accepted by Synapse (#8106)Patrick Cloke2020-08-191-3/+3
* Convert stream database to async/await. (#8074)Patrick Cloke2020-08-172-1/+70
* Add a shadow-banned flag to users. (#8092)Patrick Cloke2020-08-141-1/+11
* Convert synapse.api to async/await (#8031)Patrick Cloke2020-08-063-80/+63
* Improve performance of the register endpoint (#8009)Patrick Cloke2020-08-061-1/+3
* Convert a synapse.events to async/await. (#7949)Patrick Cloke2020-07-271-1/+1
* Convert state resolution to async/await (#7942)Patrick Cloke2020-07-241-4/+8
* Ensure that calls to `json.dumps` are compatible with the standard library js...Patrick Cloke2020-07-151-1/+3
* Improve the type hints of synapse.api.errors. (#7820)Patrick Cloke2020-07-141-55/+73
* Do not use canonicaljson to magically handle decoding bytes from JSON. (#7802)Patrick Cloke2020-07-101-4/+2
* Fix some spelling mistakes / typos. (#7811)Patrick Cloke2020-07-091-1/+1
* isort 5 compatibility (#7786)Will Hunt2020-07-051-2/+1
* Replace all remaining six usage with native Python 3 equivalents (#7704)Dagfinn Ilmari Mannsåker2020-06-163-9/+5
* Replace iteritems/itervalues/iterkeys with native versions. (#7692)Patrick Cloke2020-06-152-5/+2
* Add option to enable encryption by default for new rooms (#7639)Andrew Morgan2020-06-101-0/+5
* Update to the stable SSO prefix for UI Auth. (#7630)Patrick Cloke2020-06-051-1/+1
* Fix type information on `assert_*_is_admin` methods (#7645)Richard van der Hoff2020-06-051-4/+4
* Remove some unused constants. (#7644)Richard van der Hoff2020-06-051-4/+0
* Performance improvements and refactor of Ratelimiter (#7595)Andrew Morgan2020-06-051-35/+118
* Implement room version 6 (MSC2240). (#7506)Patrick Cloke2020-05-151-26/+4
* Strictly enforce canonicaljson requirements in a new room version (#7381)Patrick Cloke2020-05-141-1/+23
* Enforce MSC2209: auth rules for notifications in power level event (#7502)Patrick Cloke2020-05-141-1/+21
* Allow expired accounts to logout (#7443)Andrew Morgan2020-05-141-17/+33
* Allow configuration of Synapse's cache without using synctl or environment va...Amber Brown2020-05-111-2/+2
* Stop Auth methods from polling the config on every req. (#7420)Andrew Morgan2020-05-062-73/+114
* async/await is_server_admin (#7363)Andrew Morgan2020-05-011-5/+4
* Stop the master relaying USER_SYNC for other workers (#7318)Richard van der Hoff2020-04-221-0/+2
* Convert http.HTTPStatus objects to their int equivalent (#7188)Andrew Morgan2020-04-031-1/+8
* Support SAML in the user interactive authentication workflow. (#7102)Patrick Cloke2020-04-011-0/+1
* Allow server admins to define and enforce a password policy (MSC2000). (#7118)Dirk Klimpel2020-03-261-0/+21
* Remove special auth and redaction rules for aliases events in experimental ro...Patrick Cloke2020-03-091-4/+5
* Allow deleting an alias if the user has sufficient power level (#6986)Patrick Cloke2020-03-041-7/+2
* Validate the alt_aliases property of canonical alias events (#6971)Patrick Cloke2020-03-031-0/+1
* Publishing/removing from the directory requires a power level greater than ca...Patrick Cloke2020-02-211-5/+5
* Add `allow_departed_users` param to `check_in_room_or_world_readable`Richard van der Hoff2020-02-191-3/+13
* Refactor the membership check methods in AuthRichard van der Hoff2020-02-181-43/+37
* Fix detecting unknown devices from remote encrypted events. (#6848)Erik Johnston2020-02-041-2/+1
* Add `get_room_version` methodRichard van der Hoff2020-01-311-4/+2
* Implement updated auth rules from MSC2260Richard van der Hoff2020-01-281-0/+16
* Pass room version object into event_auth.check and check_redaction (#6788)Richard van der Hoff2020-01-281-2/+5
* Fixup synapse.api to pass mypy (#6733)Erik Johnston2020-01-202-3/+8
* Add StateMap type alias (#6715)Erik Johnston2020-01-161-6/+2
* Implement RedirectException (#6687)Richard van der Hoff2020-01-151-1/+26
* Kill off RegistrationError (#6691)Richard van der Hoff2020-01-131-6/+0
* Remove unused, undocumented "content repo" resource (#6628)Richard van der Hoff2020-01-031-1/+0
* Change EventContext to use the Storage class (#6564)Erik Johnston2019-12-201-1/+1
* Add auth events as per spec. (#6556)Erik Johnston2019-12-161-67/+34
* Merge pull request #6329 from matrix-org/babolivier/context_filtersBrendan Abolivier2019-12-042-1/+5
|\
| * Merge branch 'develop' into babolivier/context_filtersBrendan Abolivier2019-12-042-1/+3
| |\
| * | Update copyrightsBrendan Abolivier2019-11-052-1/+5
* | | Add ephemeral messages support (MSC2228) (#6409)Brendan Abolivier2019-12-031-0/+4
| |/ |/|
* | Merge branch 'develop' into babolivier/message_retentionBrendan Abolivier2019-11-261-1/+1
|\ \
| * | Replace instance variations of homeserver with correct case/spacingAndrew Morgan2019-11-121-1/+1
| |/
* / Implement per-room message retention policiesBrendan Abolivier2019-11-041-0/+2
|/
* Merge pull request #6301 from matrix-org/babolivier/msc2326Brendan Abolivier2019-11-012-2/+20
|\
| * Incorporate reviewBrendan Abolivier2019-11-012-2/+2
| * LintBrendan Abolivier2019-11-011-0/+1
| * Incorporate reviewBrendan Abolivier2019-11-012-3/+8
| * Add unit testsBrendan Abolivier2019-10-301-1/+1
| * Implement filteringBrendan Abolivier2019-10-301-2/+11
| * Store labels for new eventsBrendan Abolivier2019-10-301-0/+3
* | Remove usage of deprecated logger.warn method from codebase (#6271)Andrew Morgan2019-10-311-1/+1
|/
* Option to suppress resource exceeded alerting (#6173)Neil Johnson2019-10-242-3/+16
* Remove Auth.check method (#6217)Richard van der Hoff2019-10-181-18/+1
* Merge branch 'uhoreg/e2e_cross-signing_merged' into developHubert Chathi2019-10-181-0/+1
|\
| * Merge branch 'develop' into uhoreg/e2e_cross-signing_mergedHubert Chathi2019-10-183-5/+18
| |\
| * \ Merge branch 'develop' into cross-signing_keysHubert Chathi2019-09-041-8/+7
| |\ \
| * \ \ Merge branch 'uhoreg/e2e_cross-signing_merged' into cross-signing_keysHubert Chathi2019-08-283-2/+8
| |\ \ \
| * \ \ \ Merge branch 'cross-signing_hidden' into cross-signing_keysHubert Chathi2019-08-012-48/+26
| |\ \ \ \
| * | | | | allow uploading keys for cross-signingHubert Chathi2019-07-251-0/+1
* | | | | | rip out some unreachable codeRichard van der Hoff2019-10-171-2/+0
| |_|_|_|/ |/| | | |
* | | | | Fix up some typechecking (#6150)Amber Brown2019-10-022-2/+6
* | | | | Add device and appservice tagsErik Johnston2019-09-251-0/+3
* | | | | Don't create new span for get_user_by_reqErik Johnston2019-09-251-1/+0
* | | | | Ensure support users can be registered even if MAU limit is reachedJason Robinson2019-09-111-2/+9
| |_|_|/ |/| | |
* | | | Remove double return statements (#5962)Andrew Morgan2019-09-031-1/+0
* | | | Remove unnecessary parentheses around return statements (#5931)Andrew Morgan2019-08-301-7/+7
| |_|/ |/| |
* | | Add bot typeHalf-Shot2019-08-231-1/+2
* | | Opentracing misc (#5856)Jorik Schellekens2019-08-161-0/+4
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-11-14 22:13:26 +0000