summary refs log tree commit diff
Commit message (Expand)AuthorAgeFilesLines
* Fix get forward extremities queryJason Robinson2021-01-261-1/+1
* Merge branch 'develop' into jaywink/admin-forward-extremitiesJason Robinson2021-01-2610-8/+168
|\
| * Don't error if deleting a non-existent pusher. (#9121)Patrick Cloke2021-01-252-1/+4
| * Add an admin API for shadow-banning users. (#9209)Patrick Cloke2021-01-258-7/+164
* | Make natural join inner joinJason Robinson2021-01-261-2/+2
* | Merge remote-tracking branch 'origin/develop' into jaywink/admin-forward-extr...Patrick Cloke2021-01-253-8/+11
|\|
| * Fix Python 3.5 old deps build by using a compatible pip version. (#9217)Patrick Cloke2021-01-253-8/+11
* | Merge remote-tracking branch 'origin/develop' into jaywink/admin-forward-extr...Jason Robinson2021-01-2513-24/+276
|\|
| * Merge tag 'v1.26.0rc2' into developPatrick Cloke2021-01-259-8/+34
| |\
| | * Tweak changes. v1.26.0rc2Patrick Cloke2021-01-251-2/+2
| | * 1.26.0rc2Patrick Cloke2021-01-257-6/+18
| | * Fix chain cover update to handle events with duplicate auth events (#9210)Erik Johnston2021-01-223-1/+14
| | * Bump psycopg2 version (#9204)Erik Johnston2021-01-223-3/+4
| * | Handle missing content keys when calculating presentable names. (#9165)Patrick Cloke2021-01-254-16/+242
* | | Merge branch 'develop' into jaywink/admin-forward-extremitiesJason Robinson2021-01-23209-2405/+7802
|\| |
| * | Return a 404 if no valid thumbnail is found. (#9163)Patrick Cloke2021-01-214-82/+183
| * | Align the directories linted in CI with the defaults in scripts-dev/lint.sh (...Andrew Morgan2021-01-213-2/+5
| * | Speed up chain cover calculation (#9176)Erik Johnston2021-01-213-55/+161
| * | Increase perf of handling concurrent use of StreamIDGenerators. (#9190)Erik Johnston2021-01-212-8/+14
| * | Merge remote-tracking branch 'origin/release-v1.26.0' into developErik Johnston2021-01-213-1/+20
| |\|
| | * Add schema update to fix existing DBs affected by #9193 (#9195)Erik Johnston2021-01-213-1/+20
| * | Merge remote-tracking branch 'origin/release-v1.26.0' into developErik Johnston2021-01-215-7/+62
| |\|
| | * Fix receipts or account data not being sent down sync (#9193)Erik Johnston2021-01-215-7/+62
| * | Use execute_batch in more places (#9188)Erik Johnston2021-01-2112-31/+26
| * | Add tests for List Users Admin API (#9045)Dirk Klimpel2021-01-213-30/+215
| * | Add a check for duplicate IdP ids (#9184)Richard van der Hoff2021-01-212-0/+12
| * | Merge remote-tracking branch 'origin/release-v1.26.0' into developRichard van der Hoff2021-01-215-10/+36
| |\|
| | * Prefix idp_id with "oidc-" (#9189)Richard van der Hoff2021-01-214-9/+35
| | * Fix a typo in the release notes.Patrick Cloke2021-01-201-1/+1
| * | Use execute_batch instead of executemany in places (#9181)Erik Johnston2021-01-213-12/+12
| * | Specify that the long description is rST in the package metadata. (#9180)Patrick Cloke2021-01-202-0/+2
| * | Merge branch 'release-v1.26.0' into developPatrick Cloke2021-01-201-1/+1
| |\|
| | * Fix reStructuredText formatting.Patrick Cloke2021-01-201-1/+1
| * | Merge tag 'v1.26.0rc1' into developPatrick Cloke2021-01-2021-96/+210
| |\|
| | * Point people to the upgrade notes. v1.26.0rc1Patrick Cloke2021-01-201-0/+4
| | * Formatting.Patrick Cloke2021-01-201-1/+1
| | * SQL formatting in UPGRADE.Patrick Cloke2021-01-201-0/+4
| | * Add upgrade notes about chain cover.Patrick Cloke2021-01-201-8/+12
| | * Include upgrade notes.Patrick Cloke2021-01-201-0/+42
| | * Re-run towncrier.Patrick Cloke2021-01-204-4/+2
| | * Tighten the restrictions on `idp_id` (#9177)Richard van der Hoff2021-01-202-3/+10
| | * Support icons for Identity Providers (#9154)Richard van der Hoff2021-01-2019-91/+146
| * | Various improvements to the federation client. (#9129)Patrick Cloke2021-01-202-58/+68
| * | docs: Add link to Matrix VoIP tester for turn-howto (#9135)rht2021-01-202-0/+7
| |/
| * Merge remote-tracking branch 'origin/develop' into release-v1.26.0Richard van der Hoff2021-01-2014-83/+48
| |\
| | * Give `public_baseurl` a default value (#9159)Richard van der Hoff2021-01-2014-83/+48
| * | Reword confusing sentence in CHANGES.Patrick Cloke2021-01-201-1/+1
| * | Fix tenses in CHANGES.Patrick Cloke2021-01-201-5/+5
| * | Re-arrange CHANGES.md.Patrick Cloke2021-01-201-10/+10
| * | 1.26.0rc1Patrick Cloke2021-01-2076-75/+83
| |/
| * Use the account handler in additional places. (#9166)Patrick Cloke2021-01-203-2/+5
| * Validate the server name for the /publicRooms endpoint. (#9161)Patrick Cloke2021-01-192-2/+18
| * Replace 'perspectives' config block with 'trusted_key_servers' in docker home...Andrew Morgan2021-01-192-6/+5
| * Fix error messages from OIDC config parsing (#9153)Richard van der Hoff2021-01-192-10/+16
| * Quote pip install with brackets to avoid shell interpretation. (#9151)Patrick Cloke2021-01-183-2/+3
| * Allow moving account data and receipts streams off master (#9104)Erik Johnston2021-01-1827-280/+855
| * Enforce all replication HTTP clients calls use kwargs (#9144)Erik Johnston2021-01-182-1/+2
| * Properly raise an exception when the body exceeds the max size. (#9145)Patrick Cloke2021-01-183-2/+3
| * Fix bugs in handling clientRedirectUrl, and improve OIDC tests (#9127, #9128)Richard van der Hoff2021-01-189-86/+189
| * Fix the Python 3.5 old-deps build. (#9146)Patrick Cloke2021-01-182-0/+4
| * Ensure the user ID is serialized in the payload instead of used as an instanc...Patrick Cloke2021-01-182-1/+2
| * link to the scalability blog post from workers.mdMatthew Hodgson2021-01-181-0/+3
| * Fix test failure due to bad mergeRichard van der Hoff2021-01-151-1/+3
| * Make chain cover index bg update go faster (#9124)Erik Johnston2021-01-153-181/+366
| * Ensure we store pusher data as text (#9117)Richard van der Hoff2021-01-152-3/+3
| * Land support for multiple OIDC providers (#9110)Richard van der Hoff2021-01-157-382/+456
| * Add an admin API endpoint to protect media. (#9086)Patrick Cloke2021-01-154-18/+79
| * Avoid raising the body exceeded error multiple times. (#9108)Patrick Cloke2021-01-154-3/+115
| * Remote dependency on distutils (#9125)Richard van der Hoff2021-01-156-8/+33
| * Add type hints to media rest resources. (#9093)Patrick Cloke2021-01-1513-165/+286
| * Improve UsernamePickerTestCase (#9112)Richard van der Hoff2021-01-155-125/+114
| * Store an IdP ID in the OIDC session (#9109)Richard van der Hoff2021-01-154-10/+42
| * Add some extra notes for getting Synapse running on macOS. (#8997)Eric Eastwood2021-01-154-1/+25
| * Merge pull request #9091 from matrix-org/rav/error_on_bad_ssoRichard van der Hoff2021-01-157-31/+103
| |\
| | * Add a test for wrong user returned by SSORichard van der Hoff2021-01-131-0/+27
| | * Move `complete_sso_ui_auth` into SSOHandlerRichard van der Hoff2021-01-132-28/+13
| | * Give the user a better error when they present bad SSO credsRichard van der Hoff2021-01-135-5/+65
| * | Fix event chain bg update. (#9118)Erik Johnston2021-01-143-1/+10
| * | Fix perf of get_cross_signing_keys (#9116)Erik Johnston2021-01-143-14/+30
| * | Fix chain cover background update to work with split out event persisters (#9...Erik Johnston2021-01-145-29/+38
| * | Fix get destinations to catch up query. (#9114)Erik Johnston2021-01-142-13/+12
| * | Add background update for add chain cover index (#9029)Erik Johnston2021-01-147-18/+360
| * | Split OidcProvider out of OidcHandler (#9107)Richard van der Hoff2021-01-144-144/+197
| * | Fix wrong arguments being passed to BlacklistingAgentWrapper (#9098)Tim Leung2021-01-142-1/+1
| |/
| * Add a test for UI-Auth-via-SSO (#9082)Richard van der Hoff2021-01-134-42/+227
| * Merge pull request #9105 from matrix-org/rav/multi_idp/oidc_provider_configRichard van der Hoff2021-01-133-62/+191
| |\
| | * changelogRichard van der Hoff2021-01-131-0/+1
| | * Add jsonschema verification for the oidc provider configRichard van der Hoff2021-01-131-0/+50
| | * Extract OIDCProviderConfig objectRichard van der Hoff2021-01-132-62/+140
| * | Reduce scope of exception handler. (#9106)Patrick Cloke2021-01-132-5/+6
| * | Register the /devices endpoint on workers. (#9092)Patrick Cloke2021-01-134-11/+34
| |/
| * Add basic domain validation for `DomainSpecificString.is_valid`. (#9071)Patrick Cloke2021-01-133-1/+12
| * Merge branch 'master' into developErik Johnston2021-01-139-11/+229
| |\
| | * Move removal warning up changelog v1.25.0 release-v1.25.0Erik Johnston2021-01-131-9/+9
| | * Link to GH profile and fix tenseErik Johnston2021-01-131-1/+1
| | * Fix link in changelogErik Johnston2021-01-131-1/+1
| | * Fixup changelogErik Johnston2021-01-131-9/+6
| | * 1.25.0Erik Johnston2021-01-134-4/+16
| | * Announce Python / PostgreSQL deprecation policies (#9085)Dan Callahan2021-01-122-0/+50
| | * Don't apply the IP range blacklist to proxy connections (#9084)Marcus2021-01-124-3/+145
| | * Fix failures in Debian packaging (#9079)Dan Callahan2021-01-123-4/+21
| * | Preparatory refactors of OidcHandler (#9067)Richard van der Hoff2021-01-133-165/+201
| * | Remove user's avatar URL and displayname when deactivated. (#8932)Dirk Klimpel2021-01-1213-17/+351
| * | UI Auth via SSO: redirect the user to an appropriate SSO. (#9081)Richard van der Hoff2021-01-127-60/+133
| * | Handle bad JSON data being returned from the federation API. (#9070)Patrick Cloke2021-01-123-1/+12
| * | Kill off `HomeServer.get_ip_from_request()` (#9080)Richard van der Hoff2021-01-129-52/+15
| * | Remove SynapseRequest.get_user_agent (#9069)Richard van der Hoff2021-01-129-26/+29
| * | Also support remote users on the joined_rooms admin API. (#8948)David Teller2021-01-114-13/+57
| * | Move more encryption endpoints off master (#9068)Erik Johnston2021-01-113-46/+55
| * | Removes unnecessary declarations in the tests for the admin API. (#9063)Dirk Klimpel2021-01-117-17/+1
| * | Use a chain cover index to efficiently calculate auth chain difference (#8868)Erik Johnston2021-01-1114-48/+1769
| * | Clean up exception handling in the startup code (#9059)Richard van der Hoff2021-01-114-100/+120
| * | Remove old tables after schema version bump (#9055)Erik Johnston2021-01-116-59/+37
| * | Ensure rejected events get added to some metadata tables (#9016)Erik Johnston2021-01-114-24/+167
| * | Fix a typo in the install docs. (#9040)0xflotus2021-01-112-1/+2
| * | Remove unused SynapseService (#9058)Richard van der Hoff2021-01-112-22/+1
| * | Drop last_used column from access_tokens (#9025)Jerin J Titus2021-01-113-0/+79
| * | fix spurious MD in README.rstMatthew Hodgson2021-01-101-1/+1
* | | Add depth and received_ts to forward_extremities admin API responseJason Robinson2021-01-232-2/+9
* | | Remove trailing whitespace to appease the linterJason Robinson2021-01-111-2/+2
* | | Simplify delete_forward_extremities_for_room_txn SQLJason Robinson2021-01-111-10/+4
* | | Address pr feedbackJason Robinson2021-01-115-36/+46
* | | Clarify rooms.mdJason Robinson2021-01-111-1/+1
* | | Don't try to use f-stringsJason Robinson2021-01-111-1/+1
* | | Add changelog and admin API docsJason Robinson2021-01-092-0/+54
* | | Merge branch 'develop' into jaywink/admin-forward-extremitiesJason Robinson2021-01-0923-167/+384
|\| |
| * | Keycloak mapping_provider example (#9037) (#9057)Christopher Rücker2021-01-082-0/+5
| * | Fix "Starting metrics collection from sentinel context" errors (#9053)Erik Johnston2021-01-083-21/+22
| * | Merge pull request #9036 from matrix-org/rav/multi_idp/testsRichard van der Hoff2021-01-085-38/+253
| |\ \
| | * | changelogRichard van der Hoff2021-01-071-0/+1
| | * | Add some tests for the IDP picker flowRichard van der Hoff2021-01-073-5/+193
| | * | Fix type hints in test_login.pyRichard van der Hoff2021-01-072-24/+55
| | * | black-format tests/rest/client/v1/test_login.pyRichard van der Hoff2021-01-071-11/+6
| * | | Fix validate_config on nested objects (#9054)Richard van der Hoff2021-01-083-1/+55
| * | | Fix error handling during insertion of client IPs (#9051)Erik Johnston2021-01-082-31/+24
| * | | Remove broken and unmaintained 'webserver.py' script (#9039)Richard van der Hoff2021-01-082-59/+1
| * | | Run the linters on a consistent list of files (#9038)Richard van der Hoff2021-01-086-17/+24
* | | | Implement clearing cache after deleting forward extremitiesJason Robinson2021-01-092-20/+42
* | | | Add Rooms admin forward extremities DELETE endpointJason Robinson2021-01-082-1/+53
* | | | Move unknown room ID error into resolve_room_idJason Robinson2021-01-071-7/+9
* | | | Add forward extremities endpoint to rooms admin APIJason Robinson2021-01-074-0/+77
|/ / /
* | | Allow running sendToDevice on workers (#9044)Erik Johnston2021-01-0711-105/+231
* | | Support routing edu's to multiple instances (#9042)Erik Johnston2021-01-072-5/+17
* | | Ensure that remote users' device list resyncing always happens on master (#9043)Erik Johnston2021-01-072-4/+14
* | | Some cleanups to device inbox store. (#9041)Erik Johnston2021-01-073-57/+59
* | | Fix typo in docs/systemd-with-workers/README.md (#9035)Emelie2021-01-072-1/+2
* | | Improve the performance of calculating ignored users in large rooms (#9024)Patrick Cloke2021-01-076-34/+304
|/ /
* | tox: Add a -noextras factor (#9030)Richard van der Hoff2021-01-072-2/+7
* | Skip unit tests which require optional dependencies (#9031)Richard van der Hoff2021-01-077-13/+90
* | Handle updating schema version without any deltas. (#9033)Erik Johnston2021-01-072-7/+11
* | Empty iterables should count towards cache usage. (#9028)Patrick Cloke2021-01-063-24/+52
* | Merge tag 'v1.25.0rc1' into developPatrick Cloke2021-01-0683-94/+96
|\|
| * More updates to changes for consistency. v1.25.0rc1Patrick Cloke2021-01-061-1/+1
| * A few more tweaks to changes.Patrick Cloke2021-01-061-2/+2
| * Some manual tweaks to the changes file.Patrick Cloke2021-01-061-23/+18
| * 1.25.0rc1Patrick Cloke2021-01-0680-79/+92
| * Fix-up assertions about last stream token in push (#9020)Patrick Cloke2021-01-055-14/+8
* | Handle a display name / avatar URL not included in a federation request. (#9023)Patrick Cloke2021-01-062-2/+3
* | Ignore date-rotated logs (#9018)Eric Eastwood2021-01-052-0/+2
* | Add type hints to the logging context code. (#8939)Patrick Cloke2021-01-054-22/+47
* | Implement MSC2176: Updated redaction rules (#8984)Patrick Cloke2021-01-055-30/+206
* | Add initial support for a "pick your IdP" page (#9017)Richard van der Hoff2021-01-0511-3/+194
* | Combine the SSO Redirect Servlets (#9015)Richard van der Hoff2021-01-048-113/+174
|/
* Add type hints to the receipts and user directory handlers. (#8976)Patrick Cloke2021-01-044-32/+64
* Add type hints to the crypto module. (#8999)Patrick Cloke2021-01-049-113/+158
* Add link to Synapse dev room to the relevant README section (#9002)Eric Eastwood2021-01-042-0/+3
* Use the SSO handler helpers for CAS registration/login. (#8856)Patrick Cloke2021-01-034-39/+199
* Fix RoomDirectoryFederationTests and make them actually run (#8998)Andrew Morgan2020-12-303-21/+19
* Check if group IDs are valid before using them. (#8977)Patrick Cloke2020-12-303-4/+47
* Add additional type hints to the storage module. (#8980)Patrick Cloke2020-12-3012-148/+224
* Doc/move database setup instructions in install md (#8987)Shashank Sabniveesu2020-12-302-121/+141
* Add type hints to admin and room list handlers. (#8973)Patrick Cloke2020-12-295-70/+100
* Validate input parameters for the sendToDevice API. (#8975)Patrick Cloke2020-12-292-1/+3
* Update the value of group_creation_prefix in sample config. (#8992)Jerin J Titus2020-12-293-2/+3
* Allow redacting events on workers (#8994)Patrick Cloke2020-12-294-34/+16
* Drop the unused local_invites table. (#8979)Patrick Cloke2020-12-293-1/+19
* Support PyJWT v2.0.0. (#8986)Patrick Cloke2020-12-222-4/+13
* Refactor the CAS handler in prep for using the abstracted SSO code. (#8958)Patrick Cloke2020-12-184-69/+162
* Send the location of the web client to the IS when inviting via 3PIDs. (#8930)Patrick Cloke2020-12-184-0/+34
* Allow server admin to get admin bit in rooms where local user is an admin (#8...Erik Johnston2020-12-185-3/+294
* Fix mainline ordering in state res v2 (#8971)Erik Johnston2020-12-183-2/+58
* Implement a username picker for synapse (#8942)Richard van der Hoff2020-12-1814-59/+683
* Allow re-using a UI auth validation for a period of time (#8970)Patrick Cloke2020-12-1810-49/+193
* Ensure that a URL exists in the content during push. (#8965)Patrick Cloke2020-12-183-2/+7
* Merge remote-tracking branch 'origin/erikj/as_mau_block' into developErik Johnston2020-12-187-9/+86
|\
| * Update tests/test_mau.pyErik Johnston2020-12-171-1/+2
| * Correctly handle AS registerations and add testErik Johnston2020-12-175-9/+77
| * NewsfileErik Johnston2020-12-171-0/+1
| * Don't MAU limit AS ghost usersErik Johnston2020-12-171-0/+7
* | Try and drop stale extremities. (#8929)Erik Johnston2020-12-186-18/+523
* | Clean up tox.ini (#8963)Richard van der Hoff2020-12-173-19/+34
* | Fix `UsersListTestCase` (#8964)Richard van der Hoff2020-12-172-6/+5
* | Use the simple dictionary in full text search for the user directory (#8959)Brendan Abolivier2020-12-173-12/+36
* | Fix a bug that deactivated users appear in the directory (#8933)Dirk Klimpel2020-12-174-4/+95
* | Make search statement in List Room and User Admin API case-insensitive (#8931)Dirk Klimpel2020-12-177-11/+125
* | Add a maximum size for well-known lookups. (#8950)Patrick Cloke2020-12-165-18/+80
* | Push login completion down into SsoHandler (#8941)Richard van der Hoff2020-12-165-86/+80
* | Fix the sample config location for the ip_range_whitelist setting. (#8954)Patrick Cloke2020-12-164-24/+25
* | Convert internal pusher dicts to attrs classes. (#8940)Patrick Cloke2020-12-1617-204/+266
* | Merge pull request #8951 from matrix-org/rav/username_picker_2Richard van der Hoff2020-12-163-82/+106
|\ \
| * | changelogRichard van der Hoff2020-12-151-0/+1
| * | Make `_make_callback_with_userinfo` asyncRichard van der Hoff2020-12-151-68/+83
| * | Remove spurious mocking of complete_sso_loginRichard van der Hoff2020-12-151-2/+0
| * | Test `get_extra_attributes` fallbackRichard van der Hoff2020-12-152-12/+22
* | | Merge pull request #8946 from matrix-org/rav/refactor_send_requestRichard van der Hoff2020-12-1660-1028/+776
|\ \ \
| * | | lintRichard van der Hoff2020-12-155-7/+3
| * | | changelogRichard van der Hoff2020-12-151-0/+1
| * | | Remove spurious "SynapseRequest" result from `make_request"Richard van der Hoff2020-12-1559-983/+742
| * | | Remove redundant reading of SynapseRequest.argsRichard van der Hoff2020-12-151-9/+1
| * | | Skip redundant check on `request.args`Richard van der Hoff2020-12-151-2/+1
| * | | remove 'response' result from `_get_shared_rooms`Richard van der Hoff2020-12-151-8/+9
| * | | Replace `request.code` with `channel.code`Richard van der Hoff2020-12-158-22/+22
| |/ /
* | | Fix generate_log_config script (#8952)Richard van der Hoff2020-12-162-1/+4
* | | Do not assume that the contents dictionary includes history_visibility. (#8945)Patrick Cloke2020-12-169-28/+58
|/ /
* | Preparatory refactoring of the SamlHandlerTestCase (#8938)Richard van der Hoff2020-12-155-54/+126
* | Fix handling of stream tokens for push. (#8943)Patrick Cloke2020-12-156-50/+18
* | Fix startup failure with localdb_enabled: False (#8937)Richard van der Hoff2020-12-143-14/+36
* | Various clean-ups to the logging context code (#8935)Patrick Cloke2020-12-1411-39/+20
* | Preparatory refactoring of the OidcHandlerTestCase (#8911)Richard van der Hoff2020-12-142-141/+146
* | Allow spam-checker modules to be provide async methods. (#8890)David Teller2020-12-1119-73/+98
* | Add type hints to the push module. (#8901)Patrick Cloke2020-12-119-86/+159
* | Honour AS ratelimit settings for /login requests (#8920)Erik Johnston2020-12-114-10/+27
* | Improve tests for structured logging. (#8916)Patrick Cloke2020-12-112-27/+47
* | Add number of local devices to Room Details Admin API (#8886)Dirk Klimpel2020-12-116-27/+138
* | Don't ratelimit autojoining of rooms (#8921)Erik Johnston2020-12-114-11/+34
* | Don't publish `latest` docker image until all archs are built (#8909)Richard van der Hoff2020-12-102-3/+5
* | Fix deadlock on SIGHUP (#8918)Erik Johnston2020-12-102-1/+6
* | Refactor `SsoHandler.get_mxid_from_sso` (#8900)Richard van der Hoff2020-12-103-28/+51
* | Fix buglet in DirectRenderJsonResource (#8897)Richard van der Hoff2020-12-102-3/+6
* | Deprecate Shutdown Room and Purge Room Admin API (#8829)Dirk Klimpel2020-12-105-11/+63
* | Default to blacklisting reserved IP ranges and add a whitelist. (#8870)Patrick Cloke2020-12-0910-89/+172
* | Skip the SAML tests if xmlsec1 isn't available. (#8905)Patrick Cloke2020-12-092-0/+24
* | Combine related media admin API docs (#8839)Dirk Klimpel2020-12-093-50/+87
* | Merge remote-tracking branch 'origin/master' into developRichard van der Hoff2020-12-092-3/+6
|\ \
| * \ Merge pull request #8906 from matrix-org/rav/fix_multiarch_buildsRichard van der Hoff2020-12-092-3/+6
| |\ \
| | * | Pin the docker version for multiarch buildsRichard van der Hoff2020-12-092-3/+6
* | | | Merge branch 'release-v1.24.0' into developErik Johnston2020-12-091-1/+2
|\ \ \ \
| * | | | Add 'xmlsec1' to dependency list release-v1.24.0Erik Johnston2020-12-091-1/+2
| | |_|/ | |/| |
* | | | Merge branch 'master' into developErik Johnston2020-12-092-0/+60
|\ \ \ \ | | |/ / | |/| |
| * | | Merge tag 'v1.23.1'Erik Johnston2020-12-092-0/+60
| |\ \ \ | | |/ / | |/| |
| | * | 1.23.1 v1.23.1 release-v1.23.1Erik Johnston2020-12-095-3/+59
| | * | Fix installing pysaml2 on Python 3.5. (#8898)Patrick Cloke2020-12-092-1/+6
| | * | Consistently use room_id from federation request body (#8776)Richard van der Hoff2020-12-095-54/+49
| | |/
* | | Merge branch 'master' into developErik Johnston2020-12-094-2/+58
|\| |
| * | 1.24.0 v1.24.0Erik Johnston2020-12-094-2/+53
| * | Fix installing pysaml2 on Python 3.5. (#8898)Patrick Cloke2020-12-082-1/+6
* | | Add X-Robots-Tag header to stop crawlers from indexing media (#8887)Aaron Raimist2020-12-083-0/+19
* | | Better formatting for config errors from modules (#8874)Richard van der Hoff2020-12-0813-37/+160
* | | Simplify the flow for SSO UIA (#8881)Richard van der Hoff2020-12-087-40/+144
* | | Clarify config template comments (#8891)Richard van der Hoff2020-12-084-16/+9
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-09-22 09:25:24 +0000