summary refs log tree commit diff
path: root/synapse/config (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge tag 'v1.64.0rc2' into developRichard van der Hoff2022-07-292-10/+50
|\
| * Revert "Drop support for delegating email validation (#13192)" (#13406)3nprob2022-07-292-10/+50
* | Use stable prefixes for MSC3827: filtering of `/publicRooms` by room type (#1...Šimon Brandner2022-07-271-3/+0
* | Implement MSC3848: Introduce errcodes for specific event sending failures (#1...Will Hunt2022-07-271-0/+3
|/
* Support Implicit TLS for sending emails (#13317)Jan Schär2022-07-251-1/+6
* Merge branch 'master' into developBrendan Abolivier2022-07-191-7/+7
|\
| * Remove 'anonymised' from the phone home stats documentation (#13321)Andrew Morgan2022-07-191-7/+7
* | Rate limit joins per-room (#13276)David Robertson2022-07-191-0/+7
* | Provide more info why we don't have any thumbnails to serve (#13038)Eric Eastwood2022-07-151-7/+28
* | Drop support for delegating email validation (#13192)Richard van der Hoff2022-07-122-41/+15
|/
* Allow dependency errors to pass through (#13113)Jacek Kuśnierz2022-06-307-58/+15
* Cleanup references to sample config in the docs and redirect users to configu...Shay2022-06-301-1/+1
* Rate limiting invites per issuer (#13125)David Teller2022-06-301-0/+5
* Implement MSC3827: Filtering of `/publicRooms` by room type (#13031)Šimon Brandner2022-06-291-0/+3
* Add custom well-known (#13035)Jacek Kuśnierz2022-06-161-0/+20
* Change default `sync_response_cache_duration` (#13042)Erik Johnston2022-06-151-1/+1
* Replace pyjwt with authlib in `org.matrix.login.jwt` (#13011)Hannes Lerchl2022-06-151-5/+5
* Remove code generating comments in configuration file (#12941)Shay2022-06-1438-2873/+53
* Move the "email unsubscribe" resource, refactor the macaroon generator & simp...Quentin Gliech2022-06-141-2/+4
* Move the (unstable) `dir` parameter for /relations behind an experimental fla...Patrick Cloke2022-06-081-0/+3
* Fix Synapse git info missing in version strings (#12973)David Robertson2022-06-071-2/+2
* Remove remaining bits of groups code. (#12936)Patrick Cloke2022-06-011-1/+0
* Add config options for media retention (#12732)Andrew Morgan2022-05-311-0/+16
* Add a background job to automatically delete stale devices (#12855)Brendan Abolivier2022-05-271-0/+11
* Merge tag 'v1.60.0rc2' into developSean Quah2022-05-271-2/+15
|\
| * Add an option allowing users to use their password to reauthenticate even tho...reivilibre2022-05-271-2/+15
* | Easy type hints in synapse.logging.opentracing (#12894)David Robertson2022-05-271-2/+4
* | Remove backing code for groups/communities (#12558)Patrick Cloke2022-05-263-31/+0
* | Remove user-visible groups/communities code (#12553)Patrick Cloke2022-05-252-15/+0
* | Experimental support for MSC3772 (#12740)Patrick Cloke2022-05-241-0/+3
|/
* Properly close providers.json file stream. (#12794)Petr Vaněk2022-05-191-3/+3
* Fix typo in listener config (#12742)Dirk Klimpel2022-05-161-1/+1
* Add config flags to allow for cache auto-tuning (#12701)Shay2022-05-131-0/+33
* add default_power_level_content_override config option. (#12618)Andy Balaam2022-05-121-0/+47
* Reload cache factors from disk on SIGHUP (#12673)David Robertson2022-05-113-26/+119
* Add the `update_user_directory_from_worker` configuration option (superseding...reivilibre2022-05-102-4/+7
* Implement MSC3786: Add a default push rule to ignore m.room.server_acl events...Šimon Brandner2022-05-101-0/+3
* Update mypy to 0.950 and fix complaints (#12650)David Robertson2022-05-061-1/+2
* Add the `notify_appservices_from_worker` configuration option (superseding `n...reivilibre2022-05-062-2/+108
* Use `private` instead of `hidden` in MSC2285 related code. (#12635)Šimon Brandner2022-05-051-1/+1
* Fix typo in some instances of enable_registration_token_3pid_bypass. (#12639)Will Hunt2022-05-051-2/+2
* Add `mau_appservice_trial_days` config (#12619)Will Hunt2022-05-041-0/+8
* Disable device name lookup over federation by default (#12616)Andrew Morgan2022-05-041-5/+5
* Remove special-case for `twisted` logger (#12589)Richard van der Hoff2022-04-291-7/+0
* Remove unused `# type: ignore`s (#12531)David Robertson2022-04-271-4/+2
* Add option to enable token registration without requiring 3pids (#12526)Will Hunt2022-04-271-0/+9
* Implement MSC2815: allow room moderators to view redacted event content (#12427)Tulir Asokan2022-04-201-0/+3
* Process device list updates asynchronously (#12365)Erik Johnston2022-04-121-8/+0
* Disable groups/communities by default. (#12344)Patrick Cloke2022-04-121-1/+1
* Remove references to unstable identifiers from MSC3440. (#12382)Patrick Cloke2022-04-121-3/+0
* Remove experimental configuration flag for MSC3666. (#12436)Patrick Cloke2022-04-111-2/+0
* Add missing type hints to config classes. (#12402)Patrick Cloke2022-04-1144-136/+233
* Track device list updates per room. (#12321)Erik Johnston2022-04-041-0/+8
* Move MSC2654 support behind an experimental configuration flag. (#12295)Patrick Cloke2022-03-311-0/+3
* Send device list updates to application services (MSC3202) - part 1 (#11881)Andrew Morgan2022-03-302-2/+4
* Add a configuration to exclude rooms from sync response (#12310)Brendan Abolivier2022-03-301-0/+13
* Fix typechecker problems exposed by signedjson 1.1.2 (#12326)David Robertson2022-03-291-5/+8
* Add restrictions by default to open registration in Synapse (#12091)Shay2022-03-251-1/+13
* Optionally include account validity in MSC3720 account status responses (#12266)Brendan Abolivier2022-03-241-0/+4
* Refuse to start if DB has an unsafe locale (#12262)Shay2022-03-231-0/+6
* Fix dead link in spam checker warning (#12231)David Robertson2022-03-161-2/+2
* Deprecate the groups/communities endpoints and add an experimental configurat...Patrick Cloke2022-03-121-0/+3
* Add config settings for background update parameters (#11980)Shay2022-03-113-0/+72
* Implement a Jinja2 filter to extract localparts from email addresses (#12212)Brendan Abolivier2022-03-111-1/+2
* Update the SSO username picker template to comply with SIWA guidelines (#12210)Brendan Abolivier2022-03-111-2/+7
* Move scripts directory inside synapse, exposing as setuptools entry_points (#...David Robertson2022-03-021-1/+1
* Use importlib.metadata to read requirements (#12088)David Robertson2022-03-017-7/+7
* Add support for MSC3202: sending one-time key counts and fallback key usage s...reivilibre2022-02-242-6/+23
* Implement account status endpoints (MSC3720) (#12001)Brendan Abolivier2022-02-221-0/+3
* Use room version 9 as the default room version (per MSC3589). (#12058)Patrick Cloke2022-02-221-1/+1
* Remove unstable MSC3283 flags (#12018)Erik Johnston2022-02-171-3/+0
* Faster joins: parse msc3706 fields in send_join response (#12011)Richard van der Hoff2022-02-171-0/+4
* Remove support for the legacy structured logging configuration. (#12008)Patrick Cloke2022-02-171-4/+8
* remove empty file, reword/rename newsfragment, and add line to upgrade docH. Shay2022-02-141-0/+0
* Use version string helper from matrix-common (#11979)David Robertson2022-02-141-3/+6
* Implement MSC3706: partial state in `/send_join` response (#11967)Richard van der Hoff2022-02-121-0/+3
* Enable cache time-based expiry by default (#11849)Shay2022-02-112-7/+33
* Experimental support to include bundled aggregations in search results (MSC36...Patrick Cloke2022-02-081-0/+2
* Remove support for the webclient listener. (#11895)Patrick Cloke2022-02-031-36/+12
* Add a ratelimiter for 3pid invite (#11892)Brendan Abolivier2022-02-031-0/+15
* Revert experimental push rules from #7997. (#11884)Patrick Cloke2022-02-021-13/+0
* Send to-device messages to application services (#11215)Andrew Morgan2022-02-011-0/+7
* Remove the obsolete MSC1849 configuration flag. (#11843)Patrick Cloke2022-01-311-2/+0
* Configurable limits on avatars (#11846)Brendan Abolivier2022-01-281-0/+27
* Fix some indentation inconsistencies in the sample config (modules) (#11838)Dirk Klimpel2022-01-271-5/+5
* Add a config flag to inhibit `M_USER_IN_USE` during registration (#11743)Brendan Abolivier2022-01-261-0/+12
* Add deprecation warnings for `webclient` listener and non-HTTP(S) `web_client...Patrick Cloke2022-01-201-14/+20
* Fix up docs for `track_puppeted_user_ips` (again) (#11757)Richard van der Hoff2022-01-171-4/+12
* Update documentation for configuring facebook login (#11755)Richard van der Hoff2022-01-171-3/+6
* Fix sample_config.yaml in regards track_puppeted_user_ips (#11749)Jason Robinson2022-01-141-5/+6
* update room spec url in config files (#11739)qwertyforce2022-01-131-1/+1
* 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
|\|