summary refs log tree commit diff
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixes github/matrix-org-hotfixes matrix-org-hotfixesErik Johnston2024-08-0820-446/+708
|\
| * SSS: Implement PREVIOUSLY room tracking (#17535)Erik Johnston2024-08-083-88/+53
| * Sliding Sync: Use `stream_ordering` based timeline pagination for incremental...Eric Eastwood2024-08-079-126/+311
| * Bump bytes from 1.6.1 to 1.7.1 (#17526)dependabot[bot]2024-08-071-2/+2
| * Bump regex from 1.10.5 to 1.10.6 (#17527)dependabot[bot]2024-08-071-2/+2
| * Fixup sliding sync comment (#17531)Erik Johnston2024-08-072-1/+2
| * Sliding Sync: Add more tracing (#17514)Eric Eastwood2024-08-066-240/+346
| * Merge branch 'release-v1.113' into developAndrew Morgan2024-08-0620-18/+51
| |\
| * | Clarify `auto_accept_invites.worker_to_run_on` config docs (#17515)Andrew Morgan2024-08-062-1/+6
* | | Merge remote-tracking branch 'origin/release-v1.113' into matrix-org-hotfixesAndrew Morgan2024-08-0622-53/+86
|\ \ \ | | |/ | |/|
| * | 1.113.0rc1 v1.113.0rc1 github/release-v1.113 release-v1.113Andrew Morgan2024-08-0620-18/+51
| |/
| * Bump phonenumbers from 8.13.39 to 8.13.42 (#17521)dependabot[bot]2024-08-061-3/+3
| * Bump towncrier from 23.11.0 to 24.7.1 (#17523)dependabot[bot]2024-08-061-5/+5
| * Bump black from 24.4.2 to 24.8.0 (#17522)dependabot[bot]2024-08-061-25/+25
| * Bump serde_json from 1.0.121 to 1.0.122 (#17525)dependabot[bot]2024-08-061-2/+2
* | Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixesErik Johnston2024-08-0642-5337/+8898
|\|
| * SS: Reset connection if token is unrecognized (#17529)Erik Johnston2024-08-064-17/+57
| * Sliding Sync: Easier to understand timeline assertions in tests (#17511)Eric Eastwood2024-08-052-21/+104
| * Sliding Sync: Add typing notification extension (MSC3961) (#17505)Eric Eastwood2024-07-319-7/+640
| * Sliding Sync: Split and move tests (#17504)Eric Eastwood2024-07-3115-5860/+6315
| * Sliding Sync: Fix `limited` response description (make accurate) (#17507)Eric Eastwood2024-07-312-2/+3
| * Sliding Sync: Update filters to be robust against remote invite rooms (#17450)Eric Eastwood2024-07-3011-109/+1597
| * Sliding Sync: Add receipts extension (MSC3960) (#17489)Eric Eastwood2024-07-307-268/+1070
| * Merge branch 'master' into developOlivier 'reivilibre2024-07-303-1/+33
| |\
| | * Merge branch 'release-v1.112' github/master masterOlivier 'reivilibre2024-07-3056-862/+5734
| | |\
| | | * 1.112.0 v1.112.0 github/release-v1.112 release-v1.112Olivier 'reivilibre2024-07-304-2/+32
| | | * Upgrade locked dependency on Twisted to 24.7.0rc1. (#17502)reivilibre2024-07-308-57/+65
| * | | Bump types-setuptools from 70.1.0.20240627 to 71.1.0.20240726 (#17497)dependabot[bot]2024-07-301-3/+3
| * | | Bump types-pyopenssl from 24.1.0.20240425 to 24.1.0.20240722 (#17496)dependabot[bot]2024-07-301-3/+3
| * | | Bump bcrypt from 4.1.3 to 4.2.0 (#17495)dependabot[bot]2024-07-301-28/+28
| * | | Bump serde_json from 1.0.120 to 1.0.121 (#17493)dependabot[bot]2024-07-301-2/+3
| * | | Merge branch 'master' into developOlivier 'reivilibre2024-07-309-57/+90
| |\| |
| | * | Add bold emphasis to some parts of the changelog v1.111.1 github/release-v1.111 release-v1.111Olivier 'reivilibre2024-07-301-2/+2
| | * | 1.111.1Olivier 'reivilibre2024-07-304-2/+27
| | * | Upgrade locked dependency on Twisted to 24.7.0rc1. (#17502)reivilibre2024-07-308-57/+65
| * | | Bump ruff from 0.5.4 to 0.5.5 (#17494)dependabot[bot]2024-07-302-21/+21
* | | | Merge branch 'rei/twisted_247rc1' into matrix-org-hotfixesOlivier 'reivilibre2024-07-308-57/+65
|\ \ \ \
| * | | | Change to miscOlivier 'reivilibre2024-07-301-0/+0
| * | | | Fix and hush Mypy errorsOlivier 'reivilibre2024-07-304-4/+6
| * | | | NewsfileOlivier 'reivilibre2024-07-301-0/+1
| * | | | Make HTTP proxy support changes in Twisted 24.7.0rc1Olivier 'reivilibre2024-07-301-2/+10
| * | | | Slightly simplify some tests whilst reducing 'Any'-typingOlivier 'reivilibre2024-07-301-3/+2
| * | | | Fix tests relying on headers not being HeadersOlivier 'reivilibre2024-07-302-6/+5
| * | | | Fix signature and bug in `writeHeaders` in the testsOlivier 'reivilibre2024-07-301-4/+22
| * | | | Update locked dependency on Twisted to 24.7.0rc1Olivier 'reivilibre2024-07-301-41/+22
| | |/ / | |/| |
* | | | Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixesErik Johnston2024-07-306-16/+109
|\ \ \ \ | | |/ / | |/| |
| * | | Add some more opentracing to sliding sync (#17501)Erik Johnston2024-07-303-5/+34
| * | | Fix `failures` property in `/keys/query` (#17499)Richard van der Hoff2024-07-303-11/+75
* | | | Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixesErik Johnston2024-07-3016-1248/+2693
|\| | |
| * | | Only send rooms with updates down sliding sync (#17479)Erik Johnston2024-07-305-30/+138
| * | | Sliding Sync: Track whether we have sent rooms down to clients (#17447)Erik Johnston2024-07-299-45/+814
| * | | Refactor Sliding Sync tests to better utilize the `SlidingSyncBase.do_sync(.....Eric Eastwood2024-07-252-1021/+726
| * | | Refactor Sliding Sync tests to better utilize the `SlidingSyncBase` (pt. 1) (...Eric Eastwood2024-07-252-228/+107
| * | | Update config_documentation - Change example of msisdn in allowed_local_3pids...YLong Shi2024-07-252-2/+6
| * | | Sliding Sync: Add Account Data extension (MSC3959) (#17477)Eric Eastwood2024-07-246-2/+982
* | | | Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixesErik Johnston2024-07-2436-238/+497
|\| | |
| * | | Sliding Sync: ensure bump stamp ignores backfilled events (#17478)Erik Johnston2024-07-243-3/+130
| * | | Use a new token format for sliding sync (#17452)Erik Johnston2024-07-246-208/+301
| * | | Update debian template - new link to the delegation docs (#17475)Maciej Laskowski2024-07-241-1/+1
| | |/ | |/|
| * | Address changelog review comments v1.112.0rc1Devon Hudson2024-07-231-5/+5
| * | 1.112.0rc1Devon Hudson2024-07-2328-26/+65
* | | Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixesErik Johnston2024-07-2344-233/+1884
|\| |
| * | Speed up SS room sorting (#17468)Erik Johnston2024-07-236-29/+159
| * | Reduce volume of 'Waiting for current token' logs, which were introduced in v...reivilibre2024-07-233-5/+32
| * | Fixed presence results not returning offline users on initial sync (#17231)Michael Hollister2024-07-234-1/+16
| * | Bump hiredis from 2.3.2 to 3.0.0 (#17464)dependabot[bot]2024-07-221-111/+96
| * | Bump pyopenssl from 24.1.0 to 24.2.1 (#17465)dependabot[bot]2024-07-221-4/+4
| * | Sliding Sync: Add E2EE extension (MSC3884) (#17454)Eric Eastwood2024-07-229-34/+1023
| * | SS: Implement `$ME` support (#17469)Erik Johnston2024-07-223-1/+80
| * | Speed up room keys query by using read/write lock (#17461)Erik Johnston2024-07-222-9/+10
| * | Bump ruff from 0.5.0 to 0.5.4 (#17466)dependabot[bot]2024-07-222-21/+21
| * | Bump sentry-sdk from 2.8.0 to 2.10.0 (#17467)dependabot[bot]2024-07-221-3/+3
| * | Prepare for authenticated media freeze (#17433)Shay2024-07-2212-12/+362
| * | Add a cache on `get_rooms_for_local_user_where_membership_is` (#17460)Erik Johnston2024-07-196-4/+38
| * | Generate room sync data concurrently (#17458)Erik Johnston2024-07-192-2/+11
| * | Bump sentry-sdk from 2.6.0 to 2.8.0 (#17456)dependabot[bot]2024-07-191-5/+5
| * | Improve default_power_level_content_override documentation (#17451)Ben Banfield-Zanin2024-07-183-0/+35
* | | Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixesErik Johnston2024-07-181-6/+7
|\| |
| * | Revert "Bump setuptools from 67.6.0 to 70.0.0" (#17455)Erik Johnston2024-07-181-6/+7
* | | Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixesErik Johnston2024-07-1831-638/+2887
|\| |
| * | Add `m.room.create` to default bump event types (#17453)Eric Eastwood2024-07-182-0/+2
| * | Order `heroes` by `stream_ordering` (as spec'ed) (#17435)Eric Eastwood2024-07-174-26/+456
| * | Merge branch 'master' into developTill Faelligen2024-07-163-1/+14
| |\|
| * | Bump mypy from 1.9.0 to 1.10.1 (#17445)dependabot[bot]2024-07-162-29/+30
| * | Bump matrix-org/done-action from 2 to 3 (#17440)dependabot[bot]2024-07-161-2/+2
| * | Handle remote download responses with `UNKNOWN_LENGTH` more gracefully (#17439)Shay2024-07-164-60/+166
| * | Bump setuptools from 67.6.0 to 70.0.0 (#17448)dependabot[bot]2024-07-161-7/+6
| * | Remove unnecessary call to resume producing in fake channel (#17449)Shay2024-07-162-4/+1
| * | Fix bug where sync could get stuck when using workers (#17438)Erik Johnston2024-07-154-10/+138
| * | Bump types-jsonschema from 4.22.0.20240610 to 4.23.0.20240712 (#17446)dependabot[bot]2024-07-151-3/+3
| * | Bump bytes from 1.6.0 to 1.6.1 (#17441)dependabot[bot]2024-07-151-2/+2
| * | Bump ulid from 1.1.2 to 1.1.3 (#17442)dependabot[bot]2024-07-151-2/+2
| * | Bump jsonschema from 4.22.0 to 4.23.0 (#17444)dependabot[bot]2024-07-151-4/+4
| * | Bump twine from 5.1.0 to 5.1.1 (#17443)dependabot[bot]2024-07-151-4/+4
| * | Make sure we use the right logic for enabling the media repo. (#17424)Quentin Gliech2024-07-154-8/+3
| * | Add room subscriptions to Sliding Sync `/sync` (#17432)Eric Eastwood2024-07-155-358/+1489
| * | Add `is_dm` room field to Sliding Sync `/sync` (#17429)Eric Eastwood2024-07-113-29/+70
| * | Add `heroes` and room summary fields to Sliding Sync `/sync` (#17419)Eric Eastwood2024-07-116-110/+529
* | | Merge remote-tracking branch 'origin/release-v1.111' into matrix-org-hotfixesTill Faelligen2024-07-163-1/+14
|\ \ \ | | |/ | |/|
| * | 1.111.0 v1.111.0Till Faelligen2024-07-163-1/+14
* | | Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixesErik Johnston2024-07-1121-95/+993
|\ \ \ | | |/ | |/|
| * | Fix filtering room types on remote rooms (#17434)Erik Johnston2024-07-114-13/+130
| * | Fix docs on `record_action` to clarify the actions are applied (#17426)Travis Ralston2024-07-112-3/+3
| * | Add Red Hat Enterprise Linux and Rocky Linux installation instructions (#17423)villepeh2024-07-113-2/+58
| * | Use consistent casing between FROM and AS (#17431)Joe Groocock2024-07-112-3/+3
| * | Bump zipp from 3.15.0 to 3.19.1 (#17427)dependabot[bot]2024-07-111-6/+6
| * | Upload new logo with white bg and update readme to use it (#17387)Will Lewis2024-07-103-1/+96
| * | Handle to-device extensions to Sliding Sync (#17416)Erik Johnston2024-07-106-12/+392
| * | Merge branch 'release-v1.111' into developQuentin Gliech2024-07-108-5/+31
| |\|
| * | Add `rooms` `name` and `avatar` to Sliding Sync `/sync` (#17418)Eric Eastwood2024-07-093-55/+305
* | | Merge remote-tracking branch 'origin/release-v1.111' into matrix-org-hotfixesQuentin Gliech2024-07-108-5/+31
|\ \ \ | | |/ | |/|
| * | 1.111.0rc2 v1.111.0rc2Quentin Gliech2024-07-106-4/+24
| * | Fix new media APIs when using synapse.app.media_repository (#17420)Erik Johnston2024-07-093-2/+3
| * | Note the new federated media worker endpoints in the worker docs & upgrade no...Andrew Morgan2024-07-093-2/+5
| * | Route auth'd fed media requests to media repo in Complement tests (#17422)Andrew Morgan2024-07-092-0/+2
| |/
* | Only log once when waiting for current token to catch upOlivier 'reivilibre2024-07-091-5/+8
* | Merge branch 'release-v1.111' into matrix-org-hotfixesQuentin Gliech2024-07-0926-26/+60
|\|
| * Fix up the changelog v1.111.0rc1Quentin Gliech2024-07-092-3/+2
| * Merge remote-tracking branch 'origin/develop' into release-v1.111Quentin Gliech2024-07-092-1/+3
| |\
| * | Tweak the changelog for v1.111.0rc1Quentin Gliech2024-07-091-8/+7
| * | 1.111.0rc1Quentin Gliech2024-07-0925-25/+61
* | | Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixesQuentin Gliech2024-07-092-1/+3
|\ \ \ | | |/ | |/|
| * | Fix exception when failing to talk to remote server (#17411)Erik Johnston2024-07-092-1/+3
| |/
* | Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixesQuentin Gliech2024-07-0925-505/+645
|\|
| * Fix `/versions` requests (#17410)Erik Johnston2024-07-093-1/+11
| * Bump ijson from 3.2.3 to 3.3.0 (#17413)dependabot[bot]2024-07-091-90/+95
| * Bump pillow from 10.3.0 to 10.4.0 (#17412)dependabot[bot]2024-07-091-71/+82
| * Fix bug in sliding sync when using old DB. (#17398)Erik Johnston2024-07-088-212/+33
| * Add `rooms.bump_stamp` to Sliding Sync `/sync` for easier client-side sorting...Eric Eastwood2024-07-089-34/+295
| * Bump serde_json from 1.0.119 to 1.0.120 (#17408)dependabot[bot]2024-07-081-2/+2
| * Bump serde from 1.0.203 to 1.0.204 (#17409)dependabot[bot]2024-07-081-4/+4
| * Bump mypy-zope from 1.0.4 to 1.0.5 (#17414)dependabot[bot]2024-07-081-4/+3
| * Bump pydantic from 2.7.1 to 2.8.2 (#17415)dependabot[bot]2024-07-081-85/+98
| * Declare support for Matrix 1.11 (#17403)Travis Ralston2024-07-082-0/+2
| * MSC3861: allow overriding the introspection endpoint (#17406)Quentin Gliech2024-07-083-2/+20
* | Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixesErik Johnston2024-07-0896-648/+8249
|\|
| * Bump certifi from 2023.7.22 to 2024.7.4 (#17404)dependabot[bot]2024-07-081-4/+4
| * Support MSC3916 by adding a federation /thumbnail endpoint and authenticated ...Shay2024-07-0812-131/+585
| * Bump ruff from 0.3.7 to 0.5.0 (#17381)dependabot[bot]2024-07-0513-36/+41
| * Allow enabling sliding sync per-user (#17393)Erik Johnston2024-07-057-6/+89
| * Finish up work to allow per-user feature flags (#17392)Erik Johnston2024-07-058-49/+189
| * Fix links to MSC3916 (#17397)Sandro2024-07-052-2/+2
| * Upon deactivation, forget all of the user's rooms (#17400)Travis Ralston2024-07-053-0/+27
| * Fix links in README (#17379)Hugh Nimmo-Smith2024-07-052-3/+4
| * Make the release script create a release branch for Complement as well (#17318)Quentin Gliech2024-07-052-1/+25
| * Add `rooms.required_state` to Sliding Sync `/sync` (#17342)Eric Eastwood2024-07-049-89/+1687
| * Changelog entries only get merged if they have the same content and extension...Eric Eastwood2024-07-042-3/+4
| * Merge branch 'master' into developDevon Hudson2024-07-033-1/+14
| |\
| | * 1.110.0 v1.110.0 github/release-v1.110 release-v1.110Devon Hudson2024-07-033-1/+14
| * | Add `room_types`/`not_room_types` filtering to Sliding Sync `/sync` (#17337)Eric Eastwood2024-07-025-7/+248
| * | Return some room data in Sliding Sync `/sync` (#17320)Eric Eastwood2024-07-0214-259/+3593
| * | Merge branch 'release-v1.110' into developDevon Hudson2024-07-027-5/+21
| |\|
| | * 1.110.0rc3 v1.110.0rc3Devon Hudson2024-07-027-5/+21
| * | Merge remote-tracking branch 'origin/release-v1.110' into developErik Johnston2024-07-025-10/+57
| |\|
| * | Support MSC3916 by adding `_matrix/client/v1/media/download` endpoint (#17365)Shay2024-07-0226-84/+1718
| * | Fix sync waiting for an invalid token from the "future" (#17386)Erik Johnston2024-07-0217-31/+229
| * | Fix building debian packages on non-clean checkouts (#17390)Erik Johnston2024-07-022-0/+4
| * | Bump types-setuptools from 69.5.0.20240423 to 70.1.0.20240627 (#17380)dependabot[bot]2024-07-011-3/+3
| * | Bump serde_json from 1.0.117 to 1.0.119 (#17385)dependabot[bot]2024-07-011-2/+2
| * | Bump log from 0.4.21 to 0.4.22 (#17384)dependabot[bot]2024-07-011-2/+2
| * | Bump cryptography from 42.0.7 to 42.0.8 (#17382)dependabot[bot]2024-07-011-33/+33
| * | Limit size of presence EDUs (#17371)Erik Johnston2024-07-013-11/+140
| * | Clarify `url_preview_url_blacklist` is a usability feature (#17356)davidegirardi2024-06-282-9/+13
| * | Use rstcheck to "lint" the README (#17367)Till2024-06-272-0/+21
| * | Handle multiple rows device inbox (#17362)Erik Johnston2024-06-272-3/+3
| * | Merge branch 'release-v1.110' into developTill Faelligen2024-06-2646-49/+101
| |\ \
| * | | Fix uploading packages to PyPi (#17363)Till2024-06-262-7/+8
* | | | Merge remote-tracking branch 'origin/release-v1.110' into matrix-org-hotfixesErik Johnston2024-07-026-21/+194
|\ \ \ \ | | |_|/ | |/| |
| * | | Limit size of presence EDUs (#17371)Erik Johnston2024-07-023-11/+140
| * | | Fix regression when bounding future tokens (#17391)Erik Johnston2024-07-023-10/+54
* | | | Merge branch 'release-v1.110' into matrix-org-hotfixesErik Johnston2024-07-0223-39/+255
|\| | |
| * | | Fix sync waiting for an invalid token from the "future" (#17386)Erik Johnston2024-07-0217-31/+229
| * | | Fix building debian packages for sid (#17389)Erik Johnston2024-07-022-0/+3
| | |/ | |/|
| * | 1.110.0rc2 v1.110.0rc2Till Faelligen2024-06-264-2/+16
| * | Fix uploading packages to PyPi (#17363)Till2024-06-262-7/+8
* | | Merge remote-tracking branch 'origin/release-v1.110' into matrix-org-hotfixesTill Faelligen2024-06-261-1/+1
|\| |
| * | Fix typo v1.110.0rc1Till Faelligen2024-06-261-1/+1
* | | Merge remote-tracking branch 'origin/release-v1.110' into matrix-org-hotfixesTill Faelligen2024-06-2655-66/+682
|\| |
| * | Update changelogTill Faelligen2024-06-261-8/+6
| * | 1.110.0rc1Till Faelligen2024-06-2646-49/+88
| |/
| * Fixes to the table of contents in the README (#17329)Andrew Morgan2024-06-252-4/+5
| * Fix outdated Security Disclosure Policy references (#17341)Denis Kasak2024-06-254-5/+6
| * Re-introduce federation /download endpoint (#17350)Shay2024-06-258-11/+588
| * Fix refreshable_access_token_lifetime typo (#17357)douglaz2024-06-251-1/+1
* | Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixesErik Johnston2024-06-259-54/+214
|\|
| * Limit amount of replication we send (#17358)Erik Johnston2024-06-252-8/+8
| * Reintroduce "Reduce device lists replication traffic."" (#17361)Erik Johnston2024-06-256-48/+89
| * Revert "Reduce device lists replication traffic." (#17360)Erik Johnston2024-06-256-89/+48
| * Add `is_invite` filtering to Sliding Sync `/sync` (#17335)Eric Eastwood2024-06-244-43/+199
| * Correct error in user_directory docs (#17348)devonh2024-06-242-1/+3
| * Add default values for rc_invites per_issuer to docs (#17347)devonh2024-06-242-2/+4
* | Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixesErik Johnston2024-06-2432-213/+695
|\|
| * Fix room `type` typo in mailer (#17336)Eric Eastwood2024-06-242-2/+4
| * Reintroduce #17291. (#17338)Erik Johnston2024-06-247-89/+250
| * Add support for MSC3823 - Account Suspension Part 2 (#17255)Shay2024-06-249-0/+287
| * Reduce device lists replication traffic. (#17333)Erik Johnston2024-06-246-48/+89
| * Tidy up integer parsing (#17339)Denis Kasak2024-06-248-34/+25
| * Bump lazy_static from 1.4.0 to 1.5.0 (#17355)dependabot[bot]2024-06-241-2/+2
| * Bump typing-extensions from 4.11.0 to 4.12.2 (#17354)dependabot[bot]2024-06-241-3/+3
| * Bump netaddr from 1.2.1 to 1.3.0 (#17353)dependabot[bot]2024-06-241-3/+3
| * Bump packaging from 24.0 to 24.1 (#17352)dependabot[bot]2024-06-241-4/+4
| * Bump sentry-sdk from 2.3.1 to 2.6.0 (#17351)dependabot[bot]2024-06-241-4/+4
| * Bump urllib3 from 2.0.7 to 2.2.2 (#17346)dependabot[bot]2024-06-211-5/+5
| * Bump requests from 2.31.0 to 2.32.2 (#17345)dependabot[bot]2024-06-211-4/+4
| * Bump tornado from 6.4 to 6.4.1 (#17344)dependabot[bot]2024-06-211-15/+15
| * Bump authlib from 1.3.0 to 1.3.1 (#17343)dependabot[bot]2024-06-211-3/+3
* | Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixesErik Johnston2024-06-1921-276/+304
|\|
| * Revert "Handle large chain calc better (#17291)" (#17334)Erik Johnston2024-06-195-230/+82
| * Register sliding sync under a different path (#17331)Erik Johnston2024-06-193-2/+5
| * register-new-matrix-user: add a flag to ignore already existing users (#17304)Jörg Thalheim2024-06-194-3/+34
| * Filter added to Admin-API GET /rooms (#17276)Alexander Fechler2024-06-195-15/+131
| * Update the README with Element branding and a few fixes (#17324)Andrew Morgan2024-06-192-25/+51
| * Remove `expire_access_token` from Docker configuration (#17198)Aaron Dewes2024-06-192-1/+1
* | Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixesErik Johnston2024-06-1914-110/+432
|\|
| * Handle large chain calc better (#17291)Erik Johnston2024-06-195-82/+230
| * Require the 'from' parameter for `/notifications` be an integer (#17283)Andrew Morgan2024-06-195-21/+173
| * Revert "Support MSC3916 by adding a federation `/download` endpoint" (#17325)Andrew Morgan2024-06-1811-659/+25
| * register_new_matrix_user: add password-file flag (#17294)Jörg Thalheim2024-06-184-7/+29
* | Revert "Support MSC3916 by adding a federation `/download` endpoint" (#17325)Andrew Morgan2024-06-1811-659/+25
* | Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixesErik Johnston2024-06-18108-702/+5252
|\|
| * Merge branch 'master' into developQuentin Gliech2024-06-184-5/+20
| |\
| * | Add support for via query parameter from MSC4156 (#17322)Johannes Marbach2024-06-184-0/+20
| * | fix missing quotes for exclude_rooms_from_sync (#17308)Dirk Klimpel2024-06-182-1/+2
| * | Bump types-pyyaml from 6.0.12.12 to 6.0.12.20240311 (#17316)dependabot[bot]2024-06-181-4/+4
| * | Bump docker/build-push-action from 5 to 6 (#17312)dependabot[bot]2024-06-181-1/+1
| * | Bump dawidd6/action-download-artifact from 5 to 6 (#17313)dependabot[bot]2024-06-181-1/+1
| * | Bump types-netaddr from 1.2.0.20240219 to 1.3.0.20240530 (#17314)dependabot[bot]2024-06-181-3/+3
| * | Bump phonenumbers from 8.13.37 to 8.13.39 (#17315)dependabot[bot]2024-06-181-3/+3
| * | Bump msgpack from 1.0.7 to 1.0.8 (#17317)dependabot[bot]2024-06-181-57/+57
| * | Add `is_encrypted` filtering to Sliding Sync `/sync` (#17281)Eric Eastwood2024-06-175-100/+189
| * | Add `stream_ordering` sort to Sliding Sync `/sync` (#17293)Eric Eastwood2024-06-179-121/+459
| * | Merge branch 'release-v1.109' into developQuentin Gliech2024-06-178-216/+193
| |\ \
| * | | Enable cross-signing key upload without UIA (#17284)Richard van der Hoff2024-06-147-123/+32
| * | | Include user membership on events (#17282)Richard van der Hoff2024-06-1318-45/+8
| * | | Add `is_dm` filtering to Sliding Sync `/sync` (#17277)Eric Eastwood2024-06-135-7/+416
| * | | Fix `newly_left` rooms not appearing if we returned early (Sliding Sync) (#17...Eric Eastwood2024-06-133-14/+15
| * | | Add `event.internal_metadata.instance_name` (#17300)Eric Eastwood2024-06-1310-9/+31
| * | | Fix `get_last_event_in_room_before_stream_ordering(...)` finding the wrong la...Eric Eastwood2024-06-133-12/+290
| * | | Bump `mypy` from 1.8.0 to 1.9.0 (#17297)Andrew Morgan2024-06-134-40/+82
| * | | Clarify that MSC4151 is enabled on matrix.org (#17296)Quentin Gliech2024-06-132-1/+10
| * | | Add report room API (MSC4151) (#17270)Travis Ralston2024-06-129-8/+210
| * | | Bump types-jsonschema from 4.21.0.20240311 to 4.22.0.20240610 (#17288)dependabot[bot]2024-06-121-3/+3
| * | | Bump jinja2 from 3.1.3 to 3.1.4 (#17287)dependabot[bot]2024-06-121-3/+3
| * | | Merge branch 'release-v1.109' into developQuentin Gliech2024-06-115-10/+52
| |\ \ \
| * | | | Bump regex from 1.10.4 to 1.10.5 (#17290)dependabot[bot]2024-06-111-2/+2
| * | | | Bump dawidd6/action-download-artifact from 3.1.4 to 5 (#17289)dependabot[bot]2024-06-111-1/+1
| * | | | Bump types-pillow from 10.2.0.20240423 to 10.2.0.20240520 (#17285)dependabot[bot]2024-06-111-3/+3
| * | | | Reorganize Pydantic models and types used in handlers (#17279)Eric Eastwood2024-06-1015-244/+269
| * | | | Wrong retention policy being used when filtering events (lint `ControlVarUsed...Eric Eastwood2024-06-102-1/+2
| * | | | Support MSC3916 by adding a federation `/download` endpoint (#17172)Shay2024-06-0710-24/+659