summary refs log tree commit diff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'develop' into matrix-org-hotfixesAndrew Morgan2024-02-2010-14/+65
|\
| * Don't lock up when joining large rooms (#16903)Erik Johnston2024-02-202-9/+18
| * bugfix: always prefer unthreaded receipt when >1 exist (MSC4102) (#16927)kegsay2024-02-202-3/+19
| * Fix incorrect docker hub link in release script (#16910)Erik Johnston2024-02-202-1/+2
| * fix typo in admin_api/rooms.md (#16857)Rainer Zufall2024-02-202-1/+2
| * Add metric for emails sent (#16881)Remi Rampin2024-02-142-0/+24
* | Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixesErik Johnston2024-02-1313-47/+178
|\|
| * Merge branch 'master' into developErik Johnston2024-02-134-2/+16
| |\
| | * 1.101.0 v1.101.0 github/release-v1.101 release-v1.101Erik Johnston2024-02-134-2/+16
| * | Don't invalidate the entire event cache when we purge history (#16905)Erik Johnston2024-02-135-7/+100
| * | Add a config to not send out device list updates for specific users (#16909)Erik Johnston2024-02-133-2/+20
| * | Bump pygithub from 2.1.1 to 2.2.0 (#16902)dependabot[bot]2024-02-121-5/+4
| * | Bump attrs from 23.1.0 to 23.2.0 (#16899)dependabot[bot]2024-02-121-5/+6
| * | Bump bcrypt from 4.0.1 to 4.1.2 (#16900)dependabot[bot]2024-02-121-23/+29
| * | Bump sentry-sdk from 1.40.0 to 1.40.3 (#16898)dependabot[bot]2024-02-121-3/+3
* | | Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixesErik Johnston2024-02-0911-11/+48
|\| |
| * | Merge remote-tracking branch 'origin/release-v1.101' into developErik Johnston2024-02-092-2/+3
| |\|
| | * Increase batching when fetching auth chains (#16893)Erik Johnston2024-02-092-2/+3
| * | Only do one concurrent fetch per server in keyring (#16894)Erik Johnston2024-02-092-4/+6
| |/
| * 1.101.0rc1 v1.101.0rc1Erik Johnston2024-02-067-5/+39
* | Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixesErik Johnston2024-02-0621-259/+279
|\|
| * Accept unprefixed form of MSC3981 recurse parameter (#16842)David Baker2024-02-062-1/+2
| * Bump lxml-stubs from 0.4.0 to 0.5.1 (#16885)dependabot[bot]2024-02-063-9/+7
| * Bump dorny/paths-filter from 2 to 3 (#16869)dependabot[bot]2024-02-061-1/+1
| * Update docs for MacOS installs (#16854)kegsay2024-02-062-0/+12
| * Fix broken links on docs (#16853)kegsay2024-02-066-7/+8
| * Bump sigstore/cosign-installer from 3.3.0 to 3.4.0 (#16890)dependabot[bot]2024-02-061-1/+1
| * Bump sentry-sdk from 1.39.1 to 1.40.0 (#16889)dependabot[bot]2024-02-061-3/+3
| * Bump pydantic from 2.5.3 to 2.6.0 (#16888)dependabot[bot]2024-02-061-112/+86
| * Bump jsonschema from 4.20.0 to 4.21.1 (#16887)dependabot[bot]2024-02-061-3/+3
| * Bump types-requests from 2.31.0.10 to 2.31.0.20240125 (#16886)dependabot[bot]2024-02-061-4/+4
| * Bump hiredis from 2.2.3 to 2.3.2 (#16862)dependabot[bot]2024-02-011-90/+110
| * Bump mypy-zope from 1.0.1 to 1.0.3 (#16865)dependabot[bot]2024-02-011-4/+4
| * Bump types-pillow from 10.1.0.2 to 10.2.0.20240125 (#16864)dependabot[bot]2024-02-011-4/+4
| * Bump types-setuptools from 69.0.0.0 to 69.0.0.20240125 (#16863)dependabot[bot]2024-02-011-4/+4
| * Bump phonenumbers from 8.13.26 to 8.13.29 (#16868)dependabot[bot]2024-02-011-3/+3
| * Bump serde from 1.0.195 to 1.0.196 (#16867)dependabot[bot]2024-02-011-4/+4
| * Bump serde_json from 1.0.111 to 1.0.113 (#16866)dependabot[bot]2024-02-011-2/+2
| * Update version picker for element-hq (#16880)Will Hunt2024-02-012-2/+3
| * Merge branch 'master' into developOlivier Wilkinson (reivilibre)2024-01-313-1/+14
| |\
| | * 1.100.0 v1.100.0 github/release-v1.100 release-v1.100Olivier Wilkinson (reivilibre)2024-01-303-1/+14
| * | Bump gitpython from 3.1.40 to 3.1.41 (#16850)dependabot[bot]2024-01-241-4/+4
| |/
* | Merge branch 'release-v1.100' into matrix-org-hotfixesOlivier Wilkinson (reivilibre)2024-01-246-5/+55
|\|
| * 1.100.0rc3 v1.100.0rc3Olivier Wilkinson (reivilibre)2024-01-244-2/+16
| * Run `ANALYZE` after fiddling with stats (#16849)Erik Johnston2024-01-243-0/+19
| * Tweak changelog v1.100.0rc2Olivier Wilkinson (reivilibre)2024-01-241-0/+2
| * 1.100.0rc2Olivier Wilkinson (reivilibre)2024-01-244-2/+16
| * Downgrade the `download-artifact` and `upload-artifact` actions to v3 due to ...reivilibre2024-01-242-4/+5
* | Merge branch 'release-v1.100' into matrix-org-hotfixesOlivier Wilkinson (reivilibre)2024-01-23757-245/+1374
|\|
| * Update changelog v1.100.0rc1Olivier Wilkinson (reivilibre)2024-01-231-1/+1
| * 1.100.0rc1Olivier Wilkinson (reivilibre)2024-01-2324-23/+70
| * Speed up e2e device keys queries for bot accounts (#16841)Erik Johnston2024-01-232-11/+19
| * Correctly mention previous copyright (#16820)Erik Johnston2024-01-23731-0/+846
| * Preparatory work for tweaking performance of auth chain lookups (#16833)Erik Johnston2024-01-235-27/+163
| * Add a `--generate-only` option to the Complement launcher. (#16828)reivilibre2024-01-222-1/+15
| * listen http2 deprecated nginx (updating documentation) (#16831)Arnold2024-01-222-4/+5
| * Allow room creation but not publishing to continue if room publication rules ...Shay2024-01-225-34/+65
| * Bump regex from 1.9.6 to 1.10.3 (#16837)dependabot[bot]2024-01-221-6/+6
| * Bump minimum Rust version to 1.65.0 (#16818)Erik Johnston2024-01-224-10/+19
| * Bump types-netaddr from 0.9.0.1 to 0.10.0.20240106 (#16839)dependabot[bot]2024-01-221-4/+4
| * Bump ruff from 0.1.13 to 0.1.14 (#16838)dependabot[bot]2024-01-222-20/+20
| * Bump pydantic from 2.5.2 to 2.5.3 (#16836)dependabot[bot]2024-01-221-110/+110
| * Bump isort from 5.13.1 to 5.13.2 (#16835)dependabot[bot]2024-01-221-3/+6
| * Bump types-jsonschema from 4.20.0.20240105 to 4.21.0.20240118 (#16834)dependabot[bot]2024-01-221-3/+4
| * Handle wildcard type filters properly (#14984)Mo Balaa2024-01-224-7/+47
| * Bump actions/cache from 3 to 4 (#16832)dependabot[bot]2024-01-222-2/+2
* | Speed up e2e device keys queries for bot accountsErik Johnston2024-01-221-11/+18
* | Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixesErik Johnston2024-01-1710-140/+144
|\|
| * Fix broken links in issue template (#16810)Erik Johnston2024-01-173-8/+9
| * Merge branch 'master' into developAndrew Morgan2024-01-163-3/+16
| |\
| | * Merge branch 'release-v1.99'Andrew Morgan2024-01-161211-9670/+21442
| | |\
| | | * Fix text and add second link v1.99.0Andrew Morgan2024-01-161-2/+3
| | | * Fix link and remove email from changelog.Andrew Morgan2024-01-161-4/+1
| | | * 1.99.0Andrew Morgan2024-01-163-3/+18
| | | * Update license in Debian metadata (#16807)Erik Johnston2024-01-162-0/+10
| | * | Revert changes to READMEErik Johnston2023-12-132-25/+4
| | * | Update README.rstWill Lewis2023-12-131-0/+2
| | * | Update README.rstWill Lewis2023-12-131-1/+1
| * | | feat: add msc4028 to versions api (#16787)Hanadi2024-01-162-0/+3
| * | | Bump ruff from 0.1.7 to 0.1.13 (#16814)dependabot[bot]2024-01-162-20/+20
| * | | Bump service-identity from 23.1.0 to 24.1.0 (#16816)dependabot[bot]2024-01-151-4/+4
| * | | Bump typing-extensions from 4.8.0 to 4.9.0 (#16815)dependabot[bot]2024-01-151-3/+3
| * | | Bump lxml from 4.9.3 to 5.1.0 (#16813)dependabot[bot]2024-01-151-96/+82
| * | | Bump immutabledict from 4.0.0 to 4.1.0 (#16812)dependabot[bot]2024-01-151-3/+3
| * | | Fix building of deps after bump of `pillow` version (#16817)Erik Johnston2024-01-151-3/+4
* | | | Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixes matrix-org-hotfixesErik Johnston2024-01-1256-396/+604
|\| | |
| * | | Update license in Debian metadata (#16807)Erik Johnston2024-01-112-0/+10
| * | | Optimize query for fetching to-device messages in `/sync` (#16805)Erik Johnston2024-01-112-77/+73
| * | | Improve DB performance of calculating badge counts for push. (#16756)Erik Johnston2024-01-113-114/+148
| * | | Bump pillow from 10.1.0 to 10.2.0 (#16802)dependabot[bot]2024-01-111-55/+73
| * | | Bump actions/upload-artifact from 3 to 4 (#16796)dependabot[bot]2024-01-115-8/+8
| * | | Bump actions/download-artifact from 3 to 4 (#16795)dependabot[bot]2024-01-111-1/+1
| * | | Bump dawidd6/action-download-artifact from 2.28.0 to 3.0.0 (#16794)dependabot[bot]2024-01-111-1/+1
| * | | Correctly handle OIDC config with no `client_secret` set (#16806)Erik Johnston2024-01-102-1/+15
| * | | Faster load recents for sync (#16783)Erik Johnston2024-01-103-7/+25
| * | | Bump types-commonmark from 0.9.2.4 to 0.9.2.20240106 (#16797)dependabot[bot]2024-01-101-4/+4
| * | | Bump pyo3 from 0.20.0 to 0.20.2 (#16791)dependabot[bot]2024-01-101-10/+10
| * | | Pull less state out if we fail to backfill (#16788)Erik Johnston2024-01-102-9/+13
| * | | Bump anyhow from 1.0.75 to 1.0.79 (#16789)dependabot[bot]2024-01-101-2/+2
| * | | Bump sentry-sdk from 1.35.0 to 1.39.1 (#16799)dependabot[bot]2024-01-101-3/+3
| * | | Bump serde_json from 1.0.108 to 1.0.111 (#16792)dependabot[bot]2024-01-101-12/+12
| * | | Reduce amount of state pulled out when querying federation hierachy (#16785)Erik Johnston2024-01-104-3/+82
| * | | Split up deleting devices into batches (#16766)Erik Johnston2024-01-102-2/+7
| * | | Fix auto-merge CI to correctly wait for linting. (#16781)Erik Johnston2024-01-102-1/+19
| * | | Remove CI check for sign off (#16776)Erik Johnston2024-01-103-7/+2
| * | | Add a link to the Request log format page from Logging Sample Config (#16778)Andrew Morgan2024-01-102-0/+4
| * | | Bump types-jsonschema from 4.20.0.0 to 4.20.0.20240105 (#16800)dependabot[bot]2024-01-101-3/+3
| * | | Faster partial join to room with complex auth graph (#7)Erik Johnston2024-01-102-49/+31
| * | | Bump authlib from 1.2.1 to 1.3.0 (#16801)dependabot[bot]2024-01-101-5/+5
| | |/ | |/|
| * | Fixup changelog links v1.99.0rc1Erik Johnston2024-01-091-4/+4
| * | Fix changelog linksErik Johnston2024-01-091-15/+15
| * | 1.99.0rc1Erik Johnston2024-01-0924-23/+54
* | | Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixesErik Johnston2024-01-091227-9750/+21249
|\| |
| * | Filter out rooms from the room directory being served to other homeservers wh...reivilibre2024-01-084-52/+221
| * | Port `EventInternalMetadata` class to Rust (#16782)Erik Johnston2024-01-0812-124/+600
| * | Fix linting (#16780)Erik Johnston2024-01-052-1/+12
| * | Simplify internal metadata class. (#16762)Erik Johnston2024-01-056-46/+24
| * | Implement cosign on docker image (#16774)Gaël Goinvic2024-01-042-1/+17
| * | Add recursion_depth to /relations if recursing (#16775)David Baker2024-01-042-0/+5
| * | Search non ASCII display names using Admin API (#16767)Adam Jędrzejewski2024-01-043-1/+26
| * | Update the contributing guide after reliecensing (#16772)Erik Johnston2024-01-032-78/+16
| * | Fix email verification redirection (#16761)FadhlanR2024-01-024-5/+43
| * | Re-enable automatic triagingErik Johnston2024-01-021-3/+2
| * | Revert "Disable automatic traiging"Erik Johnston2024-01-021-5/+5
| * | Delete the add version picker GHA workflow (#9453)Andrew Morgan2024-01-022-90/+1
| * | Add another custom statistics collection server (#16769)Christian Lölkes2024-01-022-0/+2
| * | Enable user without password (#16770)Dirk Klimpel2024-01-024-26/+34
| * | Remove config value from header (#16763)Fredrik Lanker2024-01-022-1/+2
| * | Move the rust stubs inline for better IDE integration (#16757)Erik Johnston2023-12-215-0/+1
| * | Fix sample config doc CI (#16758)Erik Johnston2023-12-212-0/+2
| * | Disable automatic traigingErik Johnston2023-12-151-5/+5
| * | Fix typoErik Johnston2023-12-1317-52/+50
| * | Update book locationErik Johnston2023-12-1343-122/+120
| * | More renamingErik Johnston2023-12-1324-126/+125
| * | Update nightly jobs to run on element-hq/synapse.Erik Johnston2023-12-132-5/+5
| * | Update repo for release scripts.Patrick Cloke2023-12-132-14/+16
| * | Keep pointing at packages.matrix.org for nowErik Johnston2023-12-132-4/+4
| * | Fix debian linkErik Johnston2023-12-131-1/+1
| * | Update documentation to refer to element-hq.Patrick Cloke2023-12-138-52/+36
| * | Fix linksErik Johnston2023-12-132-2/+2
| * | Update debian build with AGPL changes.Patrick Cloke2023-12-133-3/+3
| * | Log the new license during start.Patrick Cloke2023-12-131-0/+4
| * | Merge remote-tracking branch 'gitlab/clokep/license-license' into new_developErik Johnston2023-12-131125-8815/+19505
| |\ \
| | * | Update license headersPatrick Cloke2023-11-211137-8638/+19110
| | * | Update packaging metadataPatrick Cloke2023-11-211-1/+1
| | * | Update the license from Apache License v2 to AGPL-3.0.Patrick Cloke2023-11-211-176/+660
| * | | Revert changes to READMEErik Johnston2023-12-132-25/+4
| * | | Update README.rstWill Lewis2023-12-131-0/+2
| * | | Update README.rstWill Lewis2023-12-131-1/+1
| * | | Merge remote-tracking branch 'origin/clokep/morg-readme' into developErik Johnston2023-12-132-4/+23
| |\ \ \ | | | |/ | | |/|
| | * | Update text github/clokep/morg-readme clokep/morg-readmeErik Johnston2023-12-122-6/+15
| | * | Update the README pointing to the Element fork.Patrick Cloke2023-12-122-4/+14
| * | | Merge remote-tracking branch 'origin/master' into developErik Johnston2023-12-125-7/+20
| |\| |
| | * | Update changelog v1.98.0 github/release-v1.98 release-v1.98Erik Johnston2023-12-121-3/+3
| | * | 1.98.0Erik Johnston2023-12-123-2/+15
| | * | Version picker added for v1.98 docsAction Bot2023-12-116-2/+230
| * | | Sentry Alert configuration based on production and development environment (#...Zeeshan Rafiq2023-12-124-1/+9
| * | | Add avatar and topic settings for server notice room (#16679)Mathieu Velten2023-12-126-14/+235
| * | | Add config to change the delay before sending a notification email (#16696)Mathieu Velten2023-12-124-9/+17
| * | | Bump isort from 5.13.0 to 5.13.1 (#16752)dependabot[bot]2023-12-121-169/+3
| * | | Bump types-setuptools from 68.2.0.2 to 69.0.0.0 (#16744)dependabot[bot]2023-12-121-3/+3
| * | | Bump isort from 5.12.0 to 5.13.0 (#16745)dependabot[bot]2023-12-121-6/+166
| * | | Bump ruff from 0.1.6 to 0.1.7 (#16746)dependabot[bot]2023-12-122-20/+20
| * | | Bump actions/setup-go from 4 to 5 (#16749)dependabot[bot]2023-12-123-3/+3
| * | | Bump actions/setup-python from 4 to 5 (#16748)dependabot[bot]2023-12-126-13/+13
| * | | Bump pydantic from 2.5.1 to 2.5.2 (#16747)dependabot[bot]2023-12-121-110/+110
| * | | Bump immutabledict from 3.0.0 to 4.0.0 (#16743)dependabot[bot]2023-12-121-3/+3
* | | | Fix 'block non-admins from publishing to room directory'Erik Johnston2023-12-221-1/+1
* | | | Merge remote-tracking branch 'shay/shay/freeze_directory' into matrix-org-hot...Erik Johnston2023-12-1220-16/+488
|\ \ \ \
| * | | | block non-admins from publishing to room directoryH. Shay2023-12-112-1/+13
| |/ / /
| * | | Adding a version picker for Synapse docs (#16533)Dmytro Kagirov2023-12-119-1/+323
| * | | Write signing keys with file mode 0640 (#16740)elara-leitstellentechnik2023-12-083-5/+17
| * | | Clarify documentation for `only_for_reauth` (#16737)Dirk Klimpel2023-12-072-9/+10
| * | | Expose OIDC discovery information under the CSAPI (#16726)David Robertson2023-12-064-0/+125
| |/ /
* | | Merge remote-tracking branch 'origin/release-v1.98' into matrix-org-hotfixesErik Johnston2023-12-05147-240/+81
|\| |
| * | Revert postgres logical replication deltaas v1.98.0rc1David Robertson2023-12-05118-213/+1
| * | Amend changelog typoDavid Robertson2023-12-051-1/+1
| * | Fixup dependency bumps syntax in changelogDavid Robertson2023-12-051-1/+1
| * | 1.98.0rc1David Robertson2023-12-0530-28/+81
* | | Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixesErik Johnston2023-12-05142-59/+572
|\| |
| * | Fix upgrading a room without `events` field in power levels (#16725)David Robertson2023-12-053-1/+30
| * | Add how to validate configuration file with synapse.config script (#16714)Amanda H. L. de Andrade Katz2023-12-052-0/+18
| * | Set response values to zero if None for /_synapse/admin/v1/federation/destina...Will Hunt2023-12-052-2/+3
| * | Fix postgres schema after dropping old tables (#16730)David Robertson2023-12-056-5/+1
| * | Add a Postgres `REPLICA IDENTITY` to tables that do not have an implicit one....reivilibre2023-12-04123-1/+218
| * | Switch UNIX socket paths to /run, and add a UNIX socket example for HAProxy (...villepeh2023-12-043-8/+13
| * | Bump phonenumbers from 8.13.23 to 8.13.26 (#16722)dependabot[bot]2023-12-041-3/+3
| * | Server notices: add an autojoin setting for the notices room (#16699)Mathieu Velten2023-12-046-1/+50
| * | Bump matrix-org/netlify-pr-preview from 2 to 3 (#16719)dependabot[bot]2023-12-041-1/+1
| * | Implement MSC4069: Inhibit profile propagation (#16636)Travis Ralston2023-12-046-5/+203
| * | Bump idna from 3.4 to 3.6 (#16720)dependabot[bot]2023-12-041-3/+3
| * | Bump cryptography from 41.0.6 to 41.0.7 (#16721)dependabot[bot]2023-12-041-24/+24
| * | Bump sphinx-autodoc2 from 0.4.2 to 0.5.0 (#16723)dependabot[bot]2023-12-042-7/+7
| * | Bump types-jsonschema from 4.19.0.4 to 4.20.0.0 (#16724)dependabot[bot]2023-12-041-3/+3
* | | Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixesErik Johnston2023-12-04122-3368/+1138
|\| |
| * | ModuleAPI SSO auth callbacks (#15207)Andrew Yasinishyn2023-12-018-2/+56
| * | Drop unused tables & unneeded access token ID for events. (#16522)Patrick Cloke2023-12-014-8/+29
| * | Upgrade poetry-core range to fix issue with .so file (#16702)Mo Balaa2023-11-292-1/+2
| * | Declare support for Matrix v1.7, v1.8, and v1.9. (#16707)Patrick Cloke2023-11-292-0/+4
| * | Request & follow redirects for /media/v3/download (#16701)Patrick Cloke2023-11-297-38/+212
| * | Reduce DB load when forget on leave setting is disabled (#16668)Erik Johnston2023-11-292-3/+9
| * | Add a workflow to try and automatically fixup a PR (#16704)Erik Johnston2023-11-292-0/+53
| * | Speed up pruning of `user_ips` table (#16667)Erik Johnston2023-11-292-10/+8
| * | Bump cryptography from 41.0.5 to 41.0.6 (#16703)dependabot[bot]2023-11-281-25/+25
| * | Merge branch 'master' into developErik Johnston2023-11-283-2/+14
| |\ \
| | * | 1.97.0 v1.97.0Erik Johnston2023-11-283-2/+14
| * | | Document which versions of Synapse have compatible schema versions. (#16661)Patrick Cloke2023-11-286-1/+216
| * | | Ignore `encryption_enabled_by_default_for_room_type` for notices room (#16677)Mathieu Velten2023-11-283-1/+11
| * | | Remove old full schema dumps. (#16697)Patrick Cloke2023-11-2821-2962/+1
| * | | Fix poetry version typo in contributors' guide (#16695)David Robertson2023-11-272-1/+2
| * | | Bump prometheus-client from 0.18.0 to 0.19.0 (#16691)dependabot[bot]2023-11-271-3/+3
| * | | Bump pyasn1 from 0.5.0 to 0.5.1 (#16689)dependabot[bot]2023-11-271-3/+3
| * | | Bump types-setuptools from 68.2.0.0 to 68.2.0.2 (#16688)dependabot[bot]2023-11-271-4/+4
| * | | Bump ruff from 0.1.4 to 0.1.6 (#16690)dependabot[bot]2023-11-272-20/+20
| * | | Bump jsonschema from 4.19.1 to 4.20.0 (#16692)dependabot[bot]2023-11-271-3/+3
| * | | Bump serde from 1.0.192 to 1.0.193 (#16693)dependabot[bot]2023-11-271-4/+4
| * | | Move media retention tests out of rest tests (#16684)David Robertson2023-11-272-0/+1
| * | | Correctly read to-device stream pos on SQLite (#16682)David Robertson2023-11-243-13/+21
| * | | Keep track of `user_ips` and `monthly_active_users` when delegating auth (#16...David Robertson2023-11-2311-82/+201
| * | | Enable refreshable tokens on the admin registration endpoint (#16642)Charles Wright2023-11-222-1/+10
| * | | Bump pyo3 (0.20), pythonize (0.20), pyo3-log (0.9) (#16673)V024602023-11-223-35/+32
| * | | Admin API for server notice: consistently bypass rate limits (#16670)Mathieu Velten2023-11-222-0/+3
| * | | Bump pydantic from 2.4.2 to 2.5.1 (#16663)dependabot[bot]2023-11-221-111/+110
| * | | Filter out auth chain queries that don't exist (#16552)Jason Little2023-11-222-0/+6
| * | | Merge branch 'release-v1.97' into developDavid Robertson2023-11-2139-37/+77
| |\| | | | |/ | |/|
| | * fix changelog typo v1.97.0rc1David Robertson2023-11-211-1/+1
| | * 1.97.0rc1David Robertson2023-11-2139-37/+77
| * | Bump sentry-sdk from 1.32.0 to 1.35.0 (#16666)dependabot[bot]2023-11-201-3/+3
| * | Bump pyopenssl from 23.2.0 to 23.3.0 (#16662)dependabot[bot]2023-11-201-6/+6
| * | Bump types-pillow from 10.1.0.0 to 10.1.0.2 (#16664)dependabot[bot]2023-11-201-3/+3
| * | Bump types-psycopg2 from 2.9.21.15 to 2.9.21.16 (#16665)dependabot[bot]2023-11-201-4/+4
| |/
* | Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixesErik Johnston2023-11-2018-15/+110
|\|
| * Speed up how quickly we launch new tasks (#16660)Erik Johnston2023-11-172-1/+2
| * Bump requests-toolbelt from 0.10.1 to 1.0.0. (#16659)Patrick Cloke2023-11-172-4/+5
| * Speed up purge room by adding index (#16657)Erik Johnston2023-11-173-0/+26
| * Also discard 'caches' and 'backfill' stream POSITIONS (#16655)Erik Johnston2023-11-172-0/+17
| * Merge branch 'master' into developPatrick Cloke2023-11-175-4/+41
| |\
| | * Tweaks from review. v1.96.1Patrick Cloke2023-11-171-4/+6
| | * Move the forking note to 1.96.1.Patrick Cloke2023-11-171-8/+8
| | * 1.96.1Patrick Cloke2023-11-174-2/+15
| | * Fix building wheels in CI. (#16653)Patrick Cloke2023-11-172-1/+2
| | * Add blogpost link to changelog. v1.96.0Patrick Cloke2023-11-161-2/+8
| | * 1.96.0Patrick Cloke2023-11-164-2/+16
| | * Fix "'int' object is not iterable" error in set_device_id_for_pushers backgro...Patrick Cloke2023-11-022-2/+3
| * | Update admin user API return types in docs. (#16654)Michael Weimann2023-11-172-4/+16
| * | Reduce task concurrency (#16656)Erik Johnston2023-11-173-2/+3
* | | Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixesErik Johnston2023-11-160-0/+0
|\| |
| * | Revert "Fix test not detecting tables with missing primary keys and missing r...Erik Johnston2023-11-163-111/+0
* | | Revert "Fix test not detecting tables with missing primary keys and missing r...Erik Johnston2023-11-163-111/+0
* | | Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixesErik Johnston2023-11-164-203/+1
|\| |