summary refs log tree commit diff
path: root/docs (follow)
Commit message (Expand)AuthorAgeFilesLines
* Add configs to make profile data more private (#9203)AndrewFerr2021-02-191-0/+14
* Parse ui_auth.session_timeout as a duration (instead of treating it as ms) (#...Rishabh Arya2021-02-181-3/+3
* Add http2 to the nginx example config (#9390)David Vo2021-02-181-4/+4
* Revert "Update workers.md"Richard van der Hoff2021-02-181-1/+1
* Add the shadow-banning status to the display user admin API. (#9400)Dirk Klimpel2021-02-171-3/+6
* Update workers.mdRichard van der Hoff2021-02-171-1/+2
* Update workers.mdRichard van der Hoff2021-02-171-1/+1
* Update black, and run auto formatting over the codebase (#9381)Eric Eastwood2021-02-161-12/+4
* Fix OIDC gitiea redirect URL. (#9404)Marcus2021-02-161-1/+1
* Document that pusher instances are shardable (#9407)Erik Johnston2021-02-161-1/+9
* Fix sample configAndrew Morgan2021-02-121-1/+1
* Merge tag 'v1.27.0rc2' into developPatrick Cloke2021-02-111-11/+9
|\
| * Backout changes for automatically calculating the public baseurl. (#9313)Patrick Cloke2021-02-111-11/+9
* | Add XWiki OIDC provider example. (#9324)Thomas Mortagne2021-02-091-0/+22
* | Merge pull request #9150 from Yoric/develop-contextDavid Teller2021-02-081-0/+119
|\ \
| * | FIXUP: Documenting /_synapse/admin/v1/rooms/<room_id>/context/<event_id>David Teller2021-01-281-0/+119
* | | Merge branch 'erikj/media_spam_checker' into developErik Johnston2021-02-041-0/+3
|\ \ \
| * | | Add check_media_file_for_spam spam checker hookErik Johnston2021-02-041-0/+3
| | |/ | |/|
* | | Correct `matrix-synapse.service` reference in TURN howto docs. (#9308)dykstranet2021-02-041-1/+1
* | | 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-031-0/+8
|/ /
* | Add an admin API to get the current room state (#9168)Travis Ralston2021-02-021-0/+30
* | Put SAML callback URI under /_synapse/client. (#9289)Richard van der Hoff2021-02-022-3/+3
* | Put OIDC callback URI under /_synapse/client. (#9288)Richard van der Hoff2021-02-012-10/+11
* | Add an OpenID example config for Gitea. (#9134)Oliver Hanikel2021-02-011-0/+34
* | Merge branch 'social_login' into developRichard van der Hoff2021-02-012-0/+38
|\ \
| * | Collect terms consent from the user during SSO registration (#9276)Richard van der Hoff2021-02-012-0/+23
| * | 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-012-10/+54
|\| |
| * | Replace username picker with a template (#9275)Richard van der Hoff2021-02-011-1/+31
| * | Improve styling and wording of SSO redirect confirm template (#9272)Richard van der Hoff2021-02-011-1/+13
| * | Fix SSO on workers (#9271)Richard van der Hoff2021-02-011-8/+10
* | | Ratelimit invites by room and target user (#9258)Erik Johnston2021-01-291-0/+10
* | | Merge branch 'social_login' into developRichard van der Hoff2021-01-282-7/+24
|\| |
| * | Add 'brand' field to MSC2858 response (#9242)Richard van der Hoff2021-01-272-4/+12
| * | 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-281-1/+5
| |/ |/|
* | Add notes on integrating with Facebook for SSO login. (#9244)Richard van der Hoff2021-01-271-5/+48
* | Add a note to changelog about redis usage (#9227)Erik Johnston2021-01-271-1/+4
* | Do not require the CAS service URL setting (use public_baseurl instead). (#9199)Patrick Cloke2021-01-261-4/+0
* | Merge branch 'develop' into jaywink/admin-forward-extremitiesJason Robinson2021-01-261-0/+30
|\ \
| * | Add an admin API for shadow-banning users. (#9209)Patrick Cloke2021-01-251-0/+30
| |/
* | Merge branch 'develop' into jaywink/admin-forward-extremitiesJason Robinson2021-01-2310-246/+480
|\|
| * Merge remote-tracking branch 'origin/release-v1.26.0' into developRichard van der Hoff2021-01-211-4/+9
| |\
| | * Prefix idp_id with "oidc-" (#9189)Richard van der Hoff2021-01-211-4/+9
| * | Merge tag 'v1.26.0rc1' into developPatrick Cloke2021-01-201-0/+4
| |\|
| | * Support icons for Identity Providers (#9154)Richard van der Hoff2021-01-201-0/+4
| * | docs: Add link to Matrix VoIP tester for turn-howto (#9135)rht2021-01-201-0/+6
| |/
| * Give `public_baseurl` a default value (#9159)Richard van der Hoff2021-01-201-14/+17
| * Quote pip install with brackets to avoid shell interpretation. (#9151)Patrick Cloke2021-01-182-2/+2
| * link to the scalability blog post from workers.mdMatthew Hodgson2021-01-181-0/+3
| * Land support for multiple OIDC providers (#9110)Richard van der Hoff2021-01-152-230/+245
| * Add an admin API endpoint to protect media. (#9086)Patrick Cloke2021-01-151-0/+24
| * Give the user a better error when they present bad SSO credsRichard van der Hoff2021-01-131-0/+8
| * Register the /devices endpoint on workers. (#9092)Patrick Cloke2021-01-131-0/+1
| * Remove user's avatar URL and displayname when deactivated. (#8932)Dirk Klimpel2021-01-121-0/+21
| * Also support remote users on the joined_rooms admin API. (#8948)David Teller2021-01-111-0/+4
| * Use a chain cover index to efficiently calculate auth chain difference (#8868)Erik Johnston2021-01-113-0/+140
* | Add depth and received_ts to forward_extremities admin API responseJason Robinson2021-01-231-1/+7
* | Address pr feedbackJason Robinson2021-01-111-9/+3
* | Clarify rooms.mdJason Robinson2021-01-111-1/+1
* | Add changelog and admin API docsJason Robinson2021-01-091-0/+53
|/
* Keycloak mapping_provider example (#9037) (#9057)Christopher Rücker2021-01-081-0/+4
* Fix typo in docs/systemd-with-workers/README.md (#9035)Emelie2021-01-071-1/+1
* Add initial support for a "pick your IdP" page (#9017)Richard van der Hoff2021-01-051-0/+25
* Update the value of group_creation_prefix in sample config. (#8992)Jerin J Titus2020-12-291-1/+1
* Allow redacting events on workers (#8994)Patrick Cloke2020-12-291-0/+1
* Refactor the CAS handler in prep for using the abstracted SSO code. (#8958)Patrick Cloke2020-12-181-3/+3
* Send the location of the web client to the IS when inviting via 3PIDs. (#8930)Patrick Cloke2020-12-181-0/+6
* Allow server admin to get admin bit in rooms where local user is an admin (#8...Erik Johnston2020-12-181-1/+19
* Implement a username picker for synapse (#8942)Richard van der Hoff2020-12-182-12/+21
* Allow re-using a UI auth validation for a period of time (#8970)Patrick Cloke2020-12-181-0/+15
* Make search statement in List Room and User Admin API case-insensitive (#8931)Dirk Klimpel2020-12-171-3/+6
* Fix the sample config location for the ip_range_whitelist setting. (#8954)Patrick Cloke2020-12-161-12/+12
* Allow spam-checker modules to be provide async methods. (#8890)David Teller2020-12-111-6/+13
* Add number of local devices to Room Details Admin API (#8886)Dirk Klimpel2020-12-111-11/+13
* Deprecate Shutdown Room and Purge Room Admin API (#8829)Dirk Klimpel2020-12-103-9/+47
* Default to blacklisting reserved IP ranges and add a whitelist. (#8870)Patrick Cloke2020-12-091-21/+45
* Combine related media admin API docs (#8839)Dirk Klimpel2020-12-092-50/+86
* Clarify config template comments (#8891)Richard van der Hoff2020-12-081-8/+4
* Add authentication to replication endpoints. (#8853)Patrick Cloke2020-12-042-1/+12
* Merge tag 'v1.24.0rc2' into developPatrick Cloke2020-12-041-0/+7
|\
| * Fix a regression that mapping providers should be able to redirect users. (#8...Patrick Cloke2020-12-041-0/+7
* | Fix a buglet in the SAML username mapping provider doc (#8873)Richard van der Hoff2020-12-041-1/+3
* | Apply an IP range blacklist to push and key revocation requests. (#8821)Patrick Cloke2020-12-021-6/+8
|/
* Fix typo in password_auth_providers docAndrew Morgan2020-12-011-0/+1
* Add a config option to change whether unread push notification counts are per...Andrew Morgan2020-11-301-0/+10
* Add `force_purge` option to delete-room admin api. (#8843)Richard van der Hoff2020-11-301-1/+5
* Improve documentation how to configure prometheus for workers (#8822)Dirk Klimpel2020-11-261-17/+57
* Remove deprecated `/_matrix/client/*/admin` endpoints (#8785)Dirk Klimpel2020-11-251-0/+7
* Fix the formatting of push config section (#8818)Andrew Morgan2020-11-251-14/+19
* Support trying multiple localparts for OpenID Connect. (#8801)Patrick Cloke2020-11-251-1/+10
* Clarify documentation of the admin list media API (#8795)Dirk Klimpel2020-11-241-0/+1
* Update turn-howto (#8779)Richard van der Hoff2020-11-241-8/+123
* Improve error checking for OIDC/SAML mapping providers (#8774)Patrick Cloke2020-11-191-1/+8
* SAML: Allow specifying the IdP entityid to use. (#8630)Ben Banfield-Zanin2020-11-191-0/+8
* SAML: Document allowing a clock/time difference from IdP (#8731)Marcus Schopen2020-11-181-0/+6
* a comma too much (#8771)chagai952020-11-171-1/+1
* Add admin API for logging in as a user (#8617)Erik Johnston2020-11-171-0/+35
* Clarify the usecase for an msisdn delegate (#8734)Adrian Wannenmacher2020-11-141-2/+3
* Migrate documentation `docs/admin_api/event_reports` to markdown (#8742)Dirk Klimpel2020-11-132-165/+172
* SAML: add <mdui:UIInfo> element examples (#8718)Marcus Schopen2020-11-131-0/+22
* Notes on SSO logins and media_repository worker (#8701)Marcus Schopen2020-11-061-0/+5
* Add an admin API for users' media statistics (#8700)Dirk Klimpel2020-11-051-0/+83
* Add `displayname` to Shared-Secret Registration for admins (#8722)Dirk Klimpel2020-11-051-1/+3
* Remove the "draft" status of the Room Details Admin API (#8702)Dirk Klimpel2020-11-031-3/+1
* Document how to set up multiple event persisters (#8706)Erik Johnston2020-11-031-0/+12
* grammarMatthew Hodgson2020-11-021-1/+1
* typoMatthew Hodgson2020-11-021-1/+1
* Fix typos in systemd-with-workers docAndrew Morgan2020-11-021-2/+2
* Fix typo in workers docAndrew Morgan2020-11-021-1/+1
* Improve the sample config for SSO (OIDC, SAML, and CAS). (#8635)Patrick Cloke2020-10-301-50/+76
* Support generating structured logs in addition to standard logs. (#8607)Patrick Cloke2020-10-292-43/+125
* Add an admin APIs to allow server admins to list users' pushers (#8610)Dirk Klimpel2020-10-281-0/+79
* Cross-link documentation to the prometheus recording rules. (#8667)Michael Kaye2020-10-271-0/+2
* Add admin API to list users' local media (#8647)Dirk Klimpel2020-10-271-0/+83
* Split admin API for reported events into a detail and a list view (#8539)Dirk Klimpel2020-10-261-54/+90
* Added basic instructions for Azure AD to OpenId documentation (#8582)Peter Krantz2020-10-261-0/+26
* Add an admin api to delete local media. (#8519)Dirk Klimpel2020-10-261-0/+79
* Fix filepath of Dex example config (#8657)Andrew Morgan2020-10-261-3/+2
* Correct the package name in OpenID Connect install instructions (#8634)Andrew Morgan2020-10-261-1/+1
|\
| * Correct the package name in authlib install instructionsAndrew Morgan2020-10-221-1/+1
* | Add field `total` to device list in admin API (#8644)Dirk Klimpel2020-10-261-1/+4
* | Fix typos and spelling errors. (#8639)Patrick Cloke2020-10-232-4/+4
|/
* Add note to manhole.md about bind_address when using with docker (#8526)Christopher May-Townsend2020-10-141-7/+39
* Update documentation on retention policies limits (#8529)Brendan Abolivier2020-10-141-12/+22
* Make event persisters periodically announce position over replication. (#8499)Erik Johnston2020-10-121-4/+9
* Increase default max_upload_size from 10M to 50M (#8502)Mateusz Przybyłowicz2020-10-092-2/+2
* Combine `SpamCheckerApi` with the more generic `ModuleApi`. (#8464)Richard van der Hoff2020-10-071-6/+3
* Remove docs/sphinx and related references (#8480)Andrew Morgan2020-10-0758-820/+0
* Update default room version to 6 (#8461)Richard van der Hoff2020-10-051-1/+1
* Update manhole documentation for async/await. (#8462)Patrick Cloke2020-10-051-2/+5
* Allow background tasks to be run on a separate worker. (#8369)Patrick Cloke2020-10-022-0/+22
* Add config option for always using "userinfo endpoint" for OIDC (#7658)BBBSnowball2020-10-012-9/+40
* Add prometheus metrics to track federation delays (#8430)Richard van der Hoff2020-10-011-0/+12
* Allow additional SSO properties to be passed to the client (#8413)Patrick Cloke2020-09-303-1/+37
* Update description of server_name config option (#8415)Aaron Raimist2020-09-291-4/+17
* Add checks for postgres sequence consistency (#8402)Erik Johnston2020-09-281-0/+11
* Allow existing users to login via OpenID Connect. (#8345)Tdxdxoz2020-09-251-0/+5
* Add note to reverse_proxy.md about disabling Apache's mod_security2 (#8375)Julian Fietkau2020-09-231-0/+8
* Admin API for reported events (#8217)Dirk Klimpel2020-09-221-0/+129
* Admin API for querying rooms where a user is a member (#8306)Dirk Klimpel2020-09-181-0/+37
* Add the topic and avatar to the room details admin API (#8305)Tulir Asokan2020-09-141-0/+4
* Improve SAML error messages (#8248)Patrick Cloke2020-09-141-26/+4
* Merge tag 'v1.20.0rc3' into developPatrick Cloke2020-09-111-1/+0
|\
| * Remove shared rooms info from upgrade/workers doc as it's still experimental ...Andrew Morgan2020-09-101-1/+0
* | Add /_synapse/client to the reverse proxy docs (#8227)Andrew Morgan2020-09-102-2/+22
* | Show a confirmation page during user password reset (#8004)Andrew Morgan2020-09-101-3/+7
* | Add a config option for validating 'next_link' parameters against a domain wh...Andrew Morgan2020-09-081-0/+18
|/
* Systemd docs: configure workers to start after main process. (#8276)Richard van der Hoff2020-09-081-0/+5
* Add /user/{user_id}/shared_rooms/ api (#7785)Will Hunt2020-09-021-0/+1
* Explain better what GDPR-erased means (#8189)Brendan Abolivier2020-09-011-3/+5
* Wording fixes to 'name' user admin api filter (#8163)Andrew Morgan2020-08-251-3/+4
* Fix missing double-backtick in RST documentAndrew Morgan2020-08-251-1/+1
* Search in columns 'name' and 'displayname' in the admin users endpoint (#7377)Manuel Stahl2020-08-251-2/+4
* Allow capping a room's retention policy (#8104)Brendan Abolivier2020-08-241-8/+14
* Updated docs: Added note about missing 308 redirect support. (#8120)Ryan Cole2020-08-191-0/+12
* Add a link to the matrix-synapse-rest-password-provider. (#8111)Patrick Cloke2020-08-181-0/+1
* Use the default templates when a custom template file cannot be found (#8037)Andrew Morgan2020-08-171-3/+1
* Move setting of Filter into code.Erik Johnston2020-08-111-7/+0
* 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-111-0/+11
* Clarify that undoing a shutdown might not be possible (#8010)Travis Ralston2020-08-071-3/+10
* Add health check endpoint (#8048)Erik Johnston2020-08-071-0/+7
* Fixup worker doc (again) (#8000)Erik Johnston2020-08-062-14/+42
* Rename database classes to make some sense (#8033)Erik Johnston2020-08-051-1/+1
* Merge branch 'develop' of github.com:matrix-org/synapse into erikj/add_rate_l...Erik Johnston2020-07-317-50/+95
|\
| * Add docs for undoing room shutdowns (#7998)Travis Ralston2020-07-311-1/+21
| * Update workers docs (#7990)Stuart Mumford2020-07-301-25/+34
| * Fix typo in docs/workers.md (#7992)Erik Johnston2020-07-301-1/+1
| * Merge branch 'master' into developOlivier Wilkinson (reivilibre)2020-07-303-213/+332
| |\
| * | Various improvements to the docs (#7899)Aaron Raimist2020-07-293-18/+25
| * | Add an option to disable purge in delete room admin API (#7964)Dirk Klimpel2020-07-281-4/+9
| * | Option to allow server admins to join complex rooms (#7902)lugino-emeritus2020-07-281-0/+4
| * | Fix typo in metrics docs (#7966)Erik Johnston2020-07-281-1/+1
* | | Add ratelimiting on joinsErik Johnston2020-07-311-0/+12
| |/ |/|
* | Update worker docs with recent enhancements (#7969)Erik Johnston2020-07-293-213/+332
|/
* Update the auth providers to be async. (#7935)Patrick Cloke2020-07-231-93/+94
* Update the dates for ACME v1 EOLBrendan Abolivier2020-07-221-2/+3
* Fix a typo in the sample config. (#7890)Adrian2020-07-201-1/+1
* Change sample config's postgres user to synapse_user (#7889)Andrew Morgan2020-07-201-1/+1
* Add a default limit (of 100) to get/sync operations. (#7858)Patrick Cloke2020-07-171-1/+3
* Add admin endpoint to get members in a room. (#7842)Michael Albert2020-07-161-1/+33
* Combine nginx federation server blocks (#7823)Luke Faraone2020-07-161-11/+5
* Allow accounts to be re-activated from the admin APIs. (#7847)Patrick Cloke2020-07-151-1/+5
* Return the proper 403 Forbidden error during errors with JWT logins. (#7844)Patrick Cloke2020-07-151-4/+1
* Allow email subjects to be customised through Synapse's configuration (#7846)Brendan Abolivier2020-07-141-2/+69
* Add delete room admin endpoint (#7613)Dirk Klimpel2020-07-143-0/+98
* Add the option to validate the `iss` and `aud` claims for JWT logins. (#7827)Patrick Cloke2020-07-142-3/+34
* Add ability to shard the federation sender (#7798)Erik Johnston2020-07-101-32/+33
* Change Caddy links (old is deprecated) (#7789)Nicolai Søborg2020-07-081-1/+1
* Add documentation for JWT login type and improve sample config. (#7776)Patrick Cloke2020-07-062-4/+121
* Additional configuration options for auto-join rooms (#7763)Patrick Cloke2020-06-301-2/+58
* Support running multiple media repos. (#7706)Erik Johnston2020-06-171-1/+6
* fix broken link in sample config (#7712)Richard van der Hoff2020-06-161-1/+1
* Add instructions for authing with Keycloak via OpenID (#7659)hungrymonkey2020-06-161-0/+44
* Increase the default SAML session expirary time to 15 minutes. (#7664)Patrick Cloke2020-06-111-1/+1
* fix typo in sample_config.yaml (#7652)wondratsch2020-06-111-1/+1
* Add option to enable encryption by default for new rooms (#7639)Andrew Morgan2020-06-101-0/+20
* Add an option to disable autojoin for guest accounts (#6637)Travis Ralston2020-06-051-0/+7
* Clarifications to the admin api documentation (#7647)Richard van der Hoff2020-06-057-89/+125
* Add device management to admin API (#7481)Dirk Klimpel2020-06-051-0/+209
* Cleanups to the OpenID Connect integration (#7628)Richard van der Hoff2020-06-033-241/+302
* Clean up exception handling in SAML2ResponseResource (#7614)Richard van der Hoff2020-06-031-1/+7
* allow emails to be passed through SAML (#7385)Christopher Cooper2020-05-271-0/+2
* Fix sample config docs error (#7581)Jason Robinson2020-05-271-1/+1
* Fix up commentsErik Johnston2020-05-271-1/+1
* Fix specifying cache factors via env vars with * in name. (#7580)Erik Johnston2020-05-271-0/+6
* Fix some DETECTED VIOLATIONS in the config file (#7550)Richard van der Hoff2020-05-221-26/+35
* Ensure worker config exists in systemd service (#7528)David Vo2020-05-211-1/+1
* Minor clarifications to the TURN docs (#7533)Richard van der Hoff2020-05-201-15/+42
* Improve API doc readability (#7527)Paul Tötterman2020-05-191-10/+11
* Formatting for reverse-proxy docs (#7514)Richard van der Hoff2020-05-151-68/+78
* Add Caddy 2 example (#7463)Jeff Peeler2020-05-151-1/+11
* Merge branch 'master' into developRichard van der Hoff2020-05-145-4/+152
|\
| * Notes on using git (#7496)Richard van der Hoff2020-05-144-0/+148
| * Update reverse_proxy.mdRichard van der Hoff2020-05-051-4/+4
| * Merge tag 'v1.12.4'Patrick Cloke2020-04-231-0/+2
| |\
* | | Update documentation about SSO mapping providers (#7458)Patrick Cloke2020-05-122-77/+146
* | | Allow configuration of Synapse's cache without using synctl or environment va...Amber Brown2020-05-111-4/+39
* | | Merge branch 'release-v1.13.0' into developAndrew Morgan2020-05-111-60/+107
|\ \ \
| * | | Documentation on setting up redis (#7446)Neil Johnson2020-05-111-60/+107
* | | | Extend spam checker to allow for multiple modules (#7435)Andrew Morgan2020-05-082-11/+23
* | | | Implement OpenID Connect-based login (#7256)Quentin Gliech2020-05-082-0/+270
* | | | Add room details admin endpoint (#7317)Manuel Stahl2020-05-071-0/+54
* | | | Merge branch 'release-v1.13.0' into developBrendan Abolivier2020-05-071-0/+12
|\| | |
| * | | Add a configuration setting for the dummy event threshold (#7422)Brendan Abolivier2020-05-071-0/+12
* | | | Support any process writing to cache invalidation stream. (#7436)Erik Johnston2020-05-071-4/+0
|/ / /
* | | Add instance name to RDATA/POSITION commands (#7364)Erik Johnston2020-04-291-17/+24
* | | Clean up admin api docs (#7361)Andrew Morgan2020-04-281-18/+42
* | | Return total number of users and profile attributes in admin users endpoint (...Manuel Stahl2020-04-281-3/+8
* | | Document monitoring workers (#7357)Brendan Abolivier2020-04-271-0/+25
* | | Add some explanation to application_services.md (#7091)lub2020-04-271-0/+4
* | | Add documentation to the sample config about the templates for SSO. (#7343)Patrick Cloke2020-04-241-0/+24
* | | Revert "Revert "Merge pull request #7315 from matrix-org/babolivier/request_t...Brendan Abolivier2020-04-231-0/+10
* | | Merge branch 'master' into developBrendan Abolivier2020-04-231-1/+1
|\| |
| * | Revert "Merge pull request #7315 from matrix-org/babolivier/request_token"Brendan Abolivier2020-04-231-10/+0
| * | Merge pull request #7315 from matrix-org/babolivier/request_tokenBrendan Abolivier2020-04-231-0/+10
| |\ \
| | * | Config option to inhibit 3PID errors on /requestTokenBrendan Abolivier2020-04-221-0/+10
| * | | Improve example TURN configuration in documentation (#7284)nataraj-hates-MS-for-stealing-github2020-04-171-1/+1
| * | | Revert "Merge pull request #7153 from matrix-org/babolivier/sso_whitelist_log...Richard van der Hoff2020-04-031-4/+0
| * | | Merge pull request #7153 from matrix-org/babolivier/sso_whitelist_login_fallbackBrendan Abolivier2020-03-271-0/+4
| |\ \ \
| | * | | Update the wording of the config commentBrendan Abolivier2020-03-271-3/+3
| | * | | Regenerate sample configBrendan Abolivier2020-03-261-1/+5
| | |/ /
* | | | Stop the master relaying USER_SYNC for other workers (#7318)Richard van der Hoff2020-04-221-5/+1
* | | | Extend room admin api with additional attributes (#7225)Dirk Klimpel2020-04-221-7/+100
* | | | Merge branch 'release-v1.12.4' into developRichard van der Hoff2020-04-221-0/+2
|\ \ \ \ | | |_|/ | |/| |