summary refs log tree commit diff
path: root/synapse/config (follow)
Commit message (Expand)AuthorAgeFilesLines
* Use auto_attribs/native type hints for attrs classes. (#11692)Patrick Cloke2022-01-133-29/+23
* Allow tracking puppeted users for MAU (#11561)Jason Robinson2022-01-121-0/+10
* Fix link from generated configuration file to documentation (#11678)Philipp Matthias SchÀfer2022-01-051-1/+1
* Re-apply: Move glob_to_regex and re_word_boundary to matrix-python-common #11...reivilibre2022-01-052-2/+4
* Include the topic event in the prejoin state, per MSC3173. (#11666)Patrick Cloke2022-01-041-0/+2
* Convert all namedtuples to attrs. (#11665)Patrick Cloke2021-12-301-16/+18
* Add MSC2716 and MSC3030 to `/versions` -> `unstable_features` (#11582)Eric Eastwood2021-12-161-1/+1
* Add experimental support for MSC3202: allowing application services to masque...reivilibre2021-12-151-0/+5
* Add missing type hints to `synapse.appservice` (#11360)Patrick Cloke2021-12-141-2/+1
* Additional type hints for the config module, part 2. (#11480)Patrick Cloke2021-12-094-19/+27
* Revert "Move `glob_to_regex` and `re_word_boundary` to `matrix-python-common`...Sean Quah2021-12-072-4/+2
* Stabilise support for MSC2918 refresh tokens as they have now been merged int...reivilibre2021-12-061-0/+38
* Move `glob_to_regex` and `re_word_boundary` to `matrix-python-common` (#11505)Sean Quah2021-12-062-2/+4
* Support configuring the lifetime of non-refreshable access tokens separately ...reivilibre2021-12-031-0/+49
* Add MSC3030 experimental client and federation API endpoints to get the close...Eric Eastwood2021-12-021-0/+3
* Additional type hints for config module. (#11465)Patrick Cloke2021-12-0113-98/+126
* Add type annotations to some of the configuration surrounding refresh tokens....reivilibre2021-11-291-2/+5
* Support expiry of refresh tokens and expiry of the overall session when refre...reivilibre2021-11-261-17/+7
* Rename unstable `access_token_lifetime` configuration option to `refreshable_...reivilibre2021-11-231-8/+15
* Add missing type hints to config base classes (#11377)Patrick Cloke2021-11-237-99/+162
* Add config for customizing the claim used for JWT logins. (#11361)Kostas2021-11-221-0/+9
* Add an admin API to run background jobs. (#11352)Dirk Klimpel2021-11-191-2/+2
* Fix checking whether a room can be published on creation. (#11392)Patrick Cloke2021-11-191-22/+28
* Remove dead code from acme support. (#11393)Patrick Cloke2021-11-191-50/+0
* Remove legacy code related to deprecated `trust_identity_server_for_password_...Shay2021-11-182-29/+8
* Docs: Quote wildcard `federation_certificate_verification_whitelist` (#11381)Nicolai SĂžborg2021-11-181-2/+2
* Default value for `public_baseurl` (#11210)Richard van der Hoff2021-11-088-54/+53
* Enable passing typing stream writers as a list. (#11237)Nick Barrett2021-11-031-3/+15
* Support for serving server well-known files (#11211)Richard van der Hoff2021-11-011-0/+19
* Add type hints for most `HomeServer` parameters (#11095)Sean Quah2021-10-221-1/+8
* Fix synapse.config module "read" command (#11145)Jason Robinson2021-10-221-13/+33
* Add a thread relation type per MSC3440. (#11088)Patrick Cloke2021-10-211-0/+2
* Move experimental & retention config out of the server module. (#11070)Patrick Cloke2021-10-155-201/+233
* Port the Password Auth Providers module interface to the new generic interfac...Azrenbeth2021-10-131-30/+23
* Relax `ignore-missing-imports` for modules that have stubs now and update myp...David Robertson2021-10-081-3/+6
* Require direct references to configuration variables. (#10985)Patrick Cloke2021-10-0611-73/+33
* Use direct references for configuration variables (part 6). (#10916)Patrick Cloke2021-09-292-4/+2
* Clean-up type hints in server config (#10915)Patrick Cloke2021-09-281-51/+49
* Fix race conditions when creating media store and config directories (#10913)Sean Quah2021-09-271-7/+2
* Use direct references for configuration variables (part 5). (#10897)Patrick Cloke2021-09-241-1/+3
* Use direct references for configuration variables (part 4). (#10893)Patrick Cloke2021-09-231-1/+1
* Use direct references for some configuration variables (part 3) (#10885)Patrick Cloke2021-09-231-3/+6
* Remove unnecessary parentheses around tuples returned from methods (#10889)Andrew Morgan2021-09-231-1/+1
* Always add local users to the user directory (#10796)David Robertson2021-09-211-5/+9
* Require type hints in the handlers module. (#10831)Patrick Cloke2021-09-201-2/+2
* Use direct references for some configuration variables (#10798)Patrick Cloke2021-09-131-2/+2
* Fix copy-paste error in the password section of the sample-config. (#10804)BramvdnHeuvel2021-09-131-1/+1
* Add types to synapse.util. (#10601)reivilibre2021-09-101-16/+17
* Remove unstable MSC2858 API, including `experimental.msc2858_enabled` config ...Sean2021-09-092-13/+0
* Request JSON for oEmbed requests (and ignore XML only providers). (#10759)Patrick Cloke2021-09-081-4/+20
* Merge tag 'v1.42.0rc2' into developBrendan Abolivier2021-09-063-0/+41
|\
| * Add a warning when using deprecated template_dir settings (#10768)Brendan Abolivier2021-09-063-0/+41
* | Add config option to use non-default manhole password and keys (#10643)Azrenbeth2021-09-061-2/+85
* | Allow configuration of the oEmbed URLs. (#10714)Patrick Cloke2021-08-312-0/+182
|/
* 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-212-0/+26
* | Support MSC3283: Expose `enable_set_displayname` in capabilities (#10452)Dirk Klimpel2021-08-191-0/+3
* | Merge branch 'release-v1.41' into developErik Johnston2021-08-185-218/+85
|\|
| * Centralise the custom template directory (#10596)Brendan Abolivier2021-08-174-211/+65
| * Make `PeriodicallyFlushingMemoryHandler` the default logging handler. (#10518)reivilibre2021-08-171-7/+20
* | Port the PresenceRouter module interface to the new generic interface (#10524)Azrenbeth2021-08-171-14/+1
|/
* Allow using several custom template directories (#10587)Brendan Abolivier2021-08-174-23/+32
* Experimental support for MSC3266 Room Summary API. (#10394)Michael Telatynski2021-08-161-0/+3
* Add a setting to disable TLS for sending email (#10546)Richard van der Hoff2021-08-061-0/+14
* Add warnings to ip_range_blacklist usage with proxies (#10129)Kento Okamoto2021-08-032-5/+21
* Make sync response cache time configurable. (#10513)Richard van der Hoff2021-08-031-0/+13
* Revert use of PeriodicallyFlushingMemoryHandler by default (#10515)reivilibre2021-08-031-4/+1
* Allow setting transaction limit for db connections (#10440)Toni Spets2021-08-021-0/+4
* Support for MSC2285 (hidden read receipts) (#10413)Ć imon Brandner2021-07-281-0/+3
* Add a PeriodicallyFlushingMemoryHandler to prevent logging silence (#10407)reivilibre2021-07-271-1/+4
* Update the notification email subject when invited to a space. (#10426)Patrick Cloke2021-07-211-1/+3
* MSC3244 room capabilities implementation (#10283)Michael Telatynski2021-07-201-0/+3
* Port the ThirdPartyEventRules module interface to the new generic interface (...Brendan Abolivier2021-07-201-15/+0
* [pyupgrade] `synapse/` (#10348)Jonathan de Jong2021-07-192-5/+3
* Add a module type for account validity (#9884)Brendan Abolivier2021-07-161-87/+15
* Use inline type hints in various other places (in `synapse/`) (#10380)Jonathan de Jong2021-07-1512-28/+26
* Remove functionality associated with unused historical stats tables (#9721)Cristina2021-07-081-9/+0
* Update links to documentation in sample config (#10287)Dirk Klimpel2021-07-0713-24/+26
* Add support for evicting cache entries based on last access time. (#10205)Erik Johnston2021-07-052-29/+43
* MSC2918 Refresh tokens implementation (#9450)Quentin Gliech2021-06-241-0/+21
* Warn users trying to use the deprecated spam checker interface (#10210)Brendan Abolivier2021-06-221-0/+15
* Add endpoints for backfilling history (MSC2716) (#9247)Eric Eastwood2021-06-221-0/+3
* Implement config option `sso.update_profile_information` (#10108)jkanefendt2021-06-211-0/+15
* Fix performance of responding to user key requests over federation (#10221)Erik Johnston2021-06-211-0/+2
* Ensure that errors during startup are written to the logs and the console. (#...Richard van der Hoff2021-06-211-3/+1
* Standardise the module interface (#10062)Brendan Abolivier2021-06-184-17/+54
* Remove support for ACME v1 (#10194)Brendan Abolivier2021-06-173-151/+6
* Always require users to re-authenticate for dangerous operations. (#10184)Patrick Cloke2021-06-161-0/+4
* Remove the experimental flag for knocking and use stable prefixes / endpoints...Patrick Cloke2021-06-151-7/+0
* Fix 'ip_range_whitelist' not working for federation servers (#10115)Michael Kutzner2021-06-151-12/+15
* Mention that you need to configure max upload size in reverse proxy as well (...Aaron Raimist2021-06-101-0/+4
* Implement knock feature (#6739)Sorunome2021-06-092-1/+7
* Remove redundant code to reload tls cert (#10054)Richard van der Hoff2021-05-271-19/+3
* Remove the experimental spaces enabled flag. (#10063)Patrick Cloke2021-05-261-23/+0
* Add missing type hints to synapse.util (#9982)Patrick Cloke2021-05-241-1/+7
* Remove tls_fingerprints option (#9280)Jerin J Titus2021-05-241-50/+0
* Enable experimental spaces by default. (#10011)Patrick Cloke2021-05-242-2/+19
* Remove superfluous call to bool() (#9986)Dan Callahan2021-05-141-1/+1
* Support enabling opentracing by user (#9978)Richard van der Hoff2021-05-141-6/+31
* Send the `m.room.create` stripped event with invites (support MSC1772). (#9966)Patrick Cloke2021-05-111-4/+2
* Merge branch 'master' into developBrendan Abolivier2021-05-111-2/+2
|\
| * Merge pull request from GHSA-x345-32rc-8h85Richard van der Hoff2021-05-111-2/+2
* | Add config option to hide device names over federation (#9945)Aaron Raimist2021-05-111-0/+10
* | Optionally track memory usage of each LruCache (#9881)Erik Johnston2021-05-051-0/+11
* | Limit how often GC happens by time. (#9902)Erik Johnston2021-05-051-1/+30
* | Add port parameter to the sample config for psycopg2 args (#9911)Andrew Morgan2021-05-041-0/+1
|/
* Improved validation for received requests (#9817)Richard van der Hoff2021-04-231-1/+2
* Allow OIDC cookies to work on non-root public baseurls (#9726)Andrew Morgan2021-04-231-4/+4
* Split presence out of master (#9820)Erik Johnston2021-04-231-1/+26
* Remove `synapse.types.Collection` (#9856)Richard van der Hoff2021-04-221-2/+2
* Rename handler and config modules which end in handler/config. (#9816)Patrick Cloke2021-04-207-17/+27
* Port "Allow users to click account renewal links multiple times without hitti...Andrew Morgan2021-04-195-131/+170
* More robust handling of the Content-Type header for thumbnail generation (#9788)rkfg2021-04-141-0/+1
* Remove redundant "coding: utf-8" lines (#9786)Jonathan de Jong2021-04-1437-37/+0
* Bump black configuration to target py36 (#9781)Dan Callahan2021-04-131-1/+1
* Bugbear: Add Mutable Parameter fixes (#9682)Jonathan de Jong2021-04-081-2/+4
* Add a Synapse Module for configuring presence update routing (#9491)Andrew Morgan2021-04-061-3/+36
* Add an experimental room version to support restricted join rules. (#9717)Patrick Cloke2021-03-311-1/+6
* Make sample config allowed_local_3pids regex stricter. (#9719)Denis Kasak2021-03-311-2/+2
* Include m.room.create in invite_room_state for Spaces (#9710)Richard van der Hoff2021-03-301-0/+4
* Replace `room_invite_state_types` with `room_prejoin_state` (#9700)Richard van der Hoff2021-03-301-23/+112
* Update the OIDC sample config (#9695)Richard van der Hoff2021-03-291-31/+3
* Make it possible to use dmypy (#9692)Erik Johnston2021-03-261-2/+4
* Increase default join burst ratelimiting (#9674)Erik Johnston2021-03-231-4/+4
* Merge branch 'develop' into babolivier/msc3026Brendan Abolivier2021-03-191-0/+2
|\
| * Initial spaces summary API (#9643)Richard van der Hoff2021-03-181-0/+3
* | Move support for MSC3026 behind an experimental flagBrendan Abolivier2021-03-181-0/+2
|/
* Enable flake8-bugbear, but disable most checks. (#9499)Jonathan de Jong2021-03-166-6/+20
* Add SSO attribute requirements for OIDC providers (#9609)Hubbe2021-03-161-1/+39
* Add support for stable MSC2858 API (#9617)Richard van der Hoff2021-03-161-2/+11
* Clean up config settings for stats (#9604)Richard van der Hoff2021-03-161-17/+28
* JWT OIDC secrets for Sign in with Apple (#9549)Richard van der Hoff2021-03-093-11/+118
* Fix additional type hints. (#9543)Patrick Cloke2021-03-091-1/+4
* quick config comment tweak to clarify allow_profile_lookup_over_federationMatthew Hodgson2021-03-081-2/+1
* Clean up `ShardedWorkerHandlingConfig` (#9466)Erik Johnston2021-02-245-21/+116
* Remove vestiges of uploads_path config (#9462)Richard van der Hoff2021-02-221-1/+0
* Clean up the user directory sample config section (#9385)Andrew Morgan2021-02-221-32/+37
* Ratelimit cross-user key sharing requests. (#8957)Patrick Cloke2021-02-191-0/+10
* Add documentation and type hints to parse_duration. (#9432)Patrick Cloke2021-02-191-2/+15
* Add a config option to prioritise local users in user directory search result...Andrew Morgan2021-02-191-0/+9
* Add configs to make profile data more private (#9203)AndrewFerr2021-02-192-0/+24
* Parse ui_auth.session_timeout as a duration (instead of treating it as ms) (#...Rishabh Arya2021-02-181-4/+6
* Update black, and run auto formatting over the codebase (#9381)Eric Eastwood2021-02-1610-28/+55
* Fix some typos.Patrick Cloke2021-02-122-2/+2
* Merge tag 'v1.27.0rc2' into developPatrick Cloke2021-02-117-26/+52
|\
| * Backout changes for automatically calculating the public baseurl. (#9313)Patrick Cloke2021-02-117-26/+52
* | Combine the CAS & SAML implementations for required attributes. (#9326)Patrick Cloke2021-02-113-23/+53
* | Fix escaping of braces in OIDC sample config. (#9317)Patrick Cloke2021-02-041-5/+5
* | Merge branch 'social_login_hotfixes' into developRichard van der Hoff2021-02-031-10/+4
|\|
| * Clarify documentation about escaping URLs in templates. (#9310)Patrick Cloke2021-02-031-10/+4
* | config: Add detail to auto_join_rooms comment (#9291)dykstranet2021-02-031-0/+2
* | Convert blacklisted IPv4 addresses to compatible IPv6 addresses. (#9240)Patrick Cloke2021-02-032-27/+91
|/
* Put SAML callback URI under /_synapse/client. (#9289)Richard van der Hoff2021-02-021-4/+4
* Put OIDC callback URI under /_synapse/client. (#9288)Richard van der Hoff2021-02-011-1/+1
* Merge branch 'social_login' into developRichard van der Hoff2021-02-011-0/+37
|\
| * Collect terms consent from the user during SSO registration (#9276)Richard van der Hoff2021-02-011-0/+22
| * Improve styling and wording of SSO UIA templates (#9286)Richard van der Hoff2021-02-011-0/+15
* | Merge branch 'social_login' into developRichard van der Hoff2021-02-013-39/+50
|\|
| * Replace username picker with a template (#9275)Richard van der Hoff2021-02-013-38/+37
| * Improve styling and wording of SSO redirect confirm template (#9272)Richard van der Hoff2021-02-011-1/+13
* | Ratelimit invites by room and target user (#9258)Erik Johnston2021-01-291-0/+19
* | Merge branch 'social_login' into developRichard van der Hoff2021-01-281-28/+39
|\|
| * Add 'brand' field to MSC2858 response (#9242)Richard van der Hoff2021-01-271-25/+27
| * Support for scraping email addresses from OIDC providers (#9245)Richard van der Hoff2021-01-271-3/+12
* | Ratelimit 3PID /requestToken API (#9238)Erik Johnston2021-01-282-3/+12
* | Merge branch 'social_login' into developRichard van der Hoff2021-01-273-0/+33
|\|
| * Implement MSC2858 support (#9183)Richard van der Hoff2021-01-273-0/+33
* | Clean-up the template loading code. (#9200)Patrick Cloke2021-01-274-23/+29
* | Do not require the CAS service URL setting (use public_baseurl instead). (#9199)Patrick Cloke2021-01-262-7/+8
* | Precompute joined hosts and store in Redis (#9198)Erik Johnston2021-01-261-0/+2
|/
* Add a check for duplicate IdP ids (#9184)Richard van der Hoff2021-01-211-0/+11
* Prefix idp_id with "oidc-" (#9189)Richard van der Hoff2021-01-211-4/+24
* Tighten the restrictions on `idp_id` (#9177)Richard van der Hoff2021-01-201-3/+9
* Support icons for Identity Providers (#9154)Richard van der Hoff2021-01-202-1/+21
* Give `public_baseurl` a default value (#9159)Richard van der Hoff2021-01-207-51/+30
* Fix error messages from OIDC config parsing (#9153)Richard van der Hoff2021-01-191-10/+15
* Allow moving account data and receipts streams off master (#9104)Erik Johnston2021-01-181-1/+17
* Land support for multiple OIDC providers (#9110)Richard van der Hoff2021-01-152-143/+188
* Remote dependency on distutils (#9125)Richard van der Hoff2021-01-151-6/+5
* Store an IdP ID in the OIDC session (#9109)Richard van der Hoff2021-01-151-3/+23
* Give the user a better error when they present bad SSO credsRichard van der Hoff2021-01-131-0/+10
* Add jsonschema verification for the oidc provider configRichard van der Hoff2021-01-131-0/+50
* Extract OIDCProviderConfig objectRichard van der Hoff2021-01-131-45/+120
* Fix validate_config on nested objects (#9054)Richard van der Hoff2021-01-081-1/+1
* Allow running sendToDevice on workers (#9044)Erik Johnston2021-01-071-1/+9
* Add initial support for a "pick your IdP" page (#9017)Richard van der Hoff2021-01-051-0/+27
* Update the value of group_creation_prefix in sample config. (#8992)Jerin J Titus2020-12-291-1/+1
* Send the location of the web client to the IS when inviting via 3PIDs. (#8930)Patrick Cloke2020-12-181-0/+22
* Implement a username picker for synapse (#8942)Richard van der Hoff2020-12-181-2/+3
* Allow re-using a UI auth validation for a period of time (#8970)Patrick Cloke2020-12-183-7/+27
* Fix the sample config location for the ip_range_whitelist setting. (#8954)Patrick Cloke2020-12-162-12/+12
* Various clean-ups to the logging context code (#8935)Patrick Cloke2020-12-141-1/+1
* Default to blacklisting reserved IP ranges and add a whitelist. (#8870)Patrick Cloke2020-12-093-61/+98
* Better formatting for config errors from modules (#8874)Richard van der Hoff2020-12-0810-27/+59
* Clarify config template comments (#8891)Richard van der Hoff2020-12-082-8/+4
* Add authentication to replication endpoints. (#8853)Patrick Cloke2020-12-041-0/+10
* Apply an IP range blacklist to push and key revocation requests. (#8821)Patrick Cloke2020-12-021-15/+25
* Add a config option to change whether unread push notification counts are per...Andrew Morgan2020-11-301-0/+13
* Fix the formatting of push config section (#8818)Andrew Morgan2020-11-251-15/+20
* SAML: Allow specifying the IdP entityid to use. (#8630)Ben Banfield-Zanin2020-11-191-0/+10
* SAML: Document allowing a clock/time difference from IdP (#8731)Marcus Schopen2020-11-181-0/+6
* Clarify the usecase for an msisdn delegate (#8734)Adrian Wannenmacher2020-11-141-2/+3
* SAML: add <mdui:UIInfo> element examples (#8718)Marcus Schopen2020-11-131-0/+22
* Improve the sample config for SSO (OIDC, SAML, and CAS). (#8635)Patrick Cloke2020-10-303-54/+80
* Support generating structured logs in addition to standard logs. (#8607)Patrick Cloke2020-10-291-48/+48
* Fix typos and spelling errors. (#8639)Patrick Cloke2020-10-235-5/+5
* Send some ephemeral events to appservices (#8437)Will Hunt2020-10-151-0/+3
* Increase default max_upload_size from 10M to 50M (#8502)Mateusz PrzybyƂowicz2020-10-091-2/+2
* Update default room version to 6 (#8461)Richard van der Hoff2020-10-051-1/+1
* Allow background tasks to be run on a separate worker. (#8369)Patrick Cloke2020-10-021-0/+18
* Merge tag 'v1.21.0rc2' into developRichard van der Hoff2020-10-024-6/+15
|\
| * Convert additional templates to Jinja (#8444)Patrick Cloke2020-10-024-6/+15
* | Add config option for always using "userinfo endpoint" for OIDC (#7658)BBBSnowball2020-10-011-0/+9
* | Enable mypy checking for unreachable code and fix instances. (#8432)Patrick Cloke2020-10-011-9/+9
|/
* Add prometheus metrics to track federation delays (#8430)Richard van der Hoff2020-10-014-5/+30
* Allow additional SSO properties to be passed to the client (#8413)Patrick Cloke2020-09-301-0/+8
* Update description of server_name config option (#8415)Aaron Raimist2020-09-291-4/+17
* Allow existing users to login via OpenID Connect. (#8345)Tdxdxoz2020-09-251-0/+6
* Merge branch 'master' into developAndrew Morgan2020-09-241-2/+8
|\
| * Hotfix: disable autoescape by default when rendering Jinja2 templates (#8394)Andrew Morgan2020-09-242-3/+11
* | Simplify super() calls to Python 3 syntax. (#8344)Patrick Cloke2020-09-183-3/+3
* | Remove obsolete __future__ imports (#8337)Jonathan de Jong2020-09-172-3/+0
* | Improve SAML error messages (#8248)Patrick Cloke2020-09-141-30/+4
* | Add experimental support for sharding event persister. Again. (#8294)Erik Johnston2020-09-143-13/+46
* | Show a confirmation page during user password reset (#8004)Andrew Morgan2020-09-101-3/+9
* | Add a config option for validating 'next_link' parameters against a domain wh...Andrew Morgan2020-09-081-1/+32
* | Fix stack overflow when logging system encounters an error (#8268)Richard van der Hoff2020-09-071-2/+23
|/
* Fix a regression from calling read_templates. (#8252)Patrick Cloke2020-09-041-1/+1
* Stop sub-classing object (#8249)Patrick Cloke2020-09-048-10/+10
* Revert "Add experimental support for sharding event persister. (#8170)" (#8242)Brendan Abolivier2020-09-043-46/+13
* Add experimental support for sharding event persister. (#8170)Erik Johnston2020-09-023-13/+46
* Allow capping a room's retention policy (#8104)Brendan Abolivier2020-08-241-8/+14
* Add resources.consent conditional dependency back (#8107)Andrew Morgan2020-08-181-20/+0
* Use the default templates when a custom template file cannot be found (#8037)Andrew Morgan2020-08-174-105/+191
* Move setting of Filter into code.Erik Johnston2020-08-111-8/+16
* Change the default log config to reduce disk I/O and storage (#8040)Erik Johnston2020-08-111-5/+36
* Implement login blocking based on SAML attributes (#8052)Richard van der Hoff2020-08-112-0/+99
* TypoBrendan Abolivier2020-08-101-1/+1
* LintBrendan Abolivier2020-08-101-2/+2
* why mypy whyBrendan Abolivier2020-08-101-1/+3
* LintBrendan Abolivier2020-08-061-1/+1
* Incorporate reviewBrendan Abolivier2020-08-061-2/+2
* Merge branch 'develop' of github.com:matrix-org/synapse into babolivier/new_p...Brendan Abolivier2020-08-062-1/+25
|\
| * Rename database classes to make some sense (#8033)Erik Johnston2020-08-051-1/+4
| * Merge branch 'develop' of github.com:matrix-org/synapse into erikj/add_rate_l...Erik Johnston2020-07-312-18/+7
| |\
| * | Add ratelimiting on joinsErik Johnston2020-07-311-0/+21
* | | Incorporate reviewBrendan Abolivier2020-08-061-0/+3
* | | Back out the database hack and replace it with a temporary config settingBrendan Abolivier2020-08-031-0/+10
| |/ |/|
* | Merge branch 'master' into developOlivier Wilkinson (reivilibre)2020-07-305-15/+73
|\|