summary refs log tree commit diff
Commit message (Expand)AuthorAgeFilesLines
* Add `Keyring.verify_events_for_server` and reduce memory usage (#10018)Erik Johnston2021-05-203-22/+94
* Use ijson to parse the response to `/send_join`, reducing memory usage. (#9958)Erik Johnston2021-05-207-58/+227
* Allow a user who could join a restricted room to see it in spaces summary. (#...Patrick Cloke2021-05-204-54/+254
* Merge branch 'master' of github.com:matrix-org/synapse into developAndrew Morgan2021-05-202-1/+2
|\
| * Update user_directory.md (#10016)Javier Junquera Sánchez2021-05-202-1/+2
* | Update the contrib grafana dashboard (#10001)Erik Johnston2021-05-192-644/+3558
* | Hardened systemd unit files (#9803)Savyasachee Jha2021-05-193-0/+102
* | Refactor checking restricted join rules (#10007)Patrick Cloke2021-05-184-51/+50
* | Use a database table to hold the users that should have full presence sent to...Andrew Morgan2021-05-1811-158/+479
* | Fix the allowed range of valid ordering characters for spaces. (#10002)Patrick Cloke2021-05-172-2/+3
* | Clarify comments in the space summary handler. (#9974)Patrick Cloke2021-05-172-5/+47
* | Merge branch 'master' into developErik Johnston2021-05-174-15/+25
|\|
| * Changelog v1.34.0 github/release-v1.34.0 release-v1.34.0Erik Johnston2021-05-171-6/+6
| * Update UPGRADE.rstErik Johnston2021-05-171-7/+4
| * 1.34.0Erik Johnston2021-05-173-3/+16
* | Split multiplart email sending into a dedicated handler (#9977)Brendan Abolivier2021-05-175-90/+122
* | Update postgres docs (#9989)Richard van der Hoff2021-05-143-103/+98
* | Run `black` on the scripts (#9981)Richard van der Hoff2021-05-148-76/+141
* | Minor `@cachedList` enhancements (#9975)Richard van der Hoff2021-05-146-20/+31
* | Remove unnecessary SystemRandom from SQLBaseStore (#9987)Dan Callahan2021-05-143-3/+3
* | Remove superfluous call to bool() (#9986)Dan Callahan2021-05-142-1/+2
* | Simplify exception handling in is_ascii. (#9985)Dan Callahan2021-05-142-3/+2
* | Use Python's secrets module instead of random (#9984)Dan Callahan2021-05-142-8/+12
* | Support enabling opentracing by user (#9978)Richard van der Hoff2021-05-145-17/+56
* | Update minimum supported version in postgres.md (#9988)Andrew Morgan2021-05-142-1/+2
* | Update SSO mapping providers documentation about unique IDs. (#9980)Patrick Cloke2021-05-132-7/+12
|/
* Incorporate changes from review v1.34.0rc1Brendan Abolivier2021-05-121-2/+6
* Refer and link to the upgrade notes rather than to the file nameBrendan Abolivier2021-05-121-1/+1
* 1.34.0rc1Brendan Abolivier2021-05-1236-35/+62
* Correctly ratelimit invites when creating a room (#9968)Brendan Abolivier2021-05-126-12/+157
* Change the format of access tokens away from macaroons (#5588)Richard van der Hoff2021-05-129-103/+78
* Run cache_joined_hosts_for_event in background (#9951)Erik Johnston2021-05-122-5/+41
* Tests for to-device messages (#9965)Richard van der Hoff2021-05-112-0/+202
* Sort child events according to MSC1772 for the spaces summary API. (#9954)Patrick Cloke2021-05-113-2/+151
* Support fetching the spaces summary via GET over federation. (#9947)Patrick Cloke2021-05-114-0/+29
* Send the `m.room.create` stripped event with invites (support MSC1772). (#9966)Patrick Cloke2021-05-115-5/+34
* Merge branch 'master' into developBrendan Abolivier2021-05-1110-70/+319
|\
| * Use link to advisory rather than to the CVE repo v1.33.2 github/release-v1.33.2 release-v1.33.2Brendan Abolivier2021-05-111-1/+1
| * 1.33.2Brendan Abolivier2021-05-114-2/+23
| * Merge pull request from GHSA-x345-32rc-8h85Richard van der Hoff2021-05-116-68/+296
* | Add config option to hide device names over federation (#9945)Aaron Raimist2021-05-114-1/+20
* | Add debug logging for issue #9533 (#9959)Richard van der Hoff2021-05-116-2/+42
* | Fix `m.room_key_request` to-device messages (#9961)Richard van der Hoff2021-05-114-26/+32
* | Improve performance of backfilling in large rooms. (#9935)Erik Johnston2021-05-102-69/+55
* | Fix port_db on empty db (#9930)Richard van der Hoff2021-05-106-54/+69
* | Always cache 'event_to_prev_state_group' (#9950)Erik Johnston2021-05-072-6/+8
* | Fix make_full_schema to create the db with the right options and user (#9931)Richard van der Hoff2021-05-072-9/+11
* | Merge remote-tracking branch 'origin/release-v1.33.2' into developErik Johnston2021-05-072-1/+2
|\|
| * Unpin attrs dep after new version has been released (#9946)Erik Johnston2021-05-072-1/+2
* | Reorganise the database schema directories (#9932)Richard van der Hoff2021-05-07284-47/+81
* | Export jemalloc stats to prometheus when used (#9882)Erik Johnston2021-05-064-0/+200
* | Revert "Leave out optional keys from /sync (#9919)" (#9940)Erik Johnston2021-05-064-51/+50
* | Merge remote-tracking branch 'origin/master' into developErik Johnston2021-05-064-2/+18
|\|
| * 1.33.1 v1.33.1 github/release-v1.33.1 release-v1.33.1Erik Johnston2021-05-064-2/+16
| * Pin attrs to <21.1.0 (#9937)Erik Johnston2021-05-062-1/+3
* | Follow-up to #9915 to correct the identifier for room types.Patrick Cloke2021-05-051-1/+1
* | Include the time of the create event in Spaces Summary. (#9928)Patrick Cloke2021-05-052-0/+2
* | Increase perf of handling presence when joining large rooms. (#9916)Erik Johnston2021-05-053-82/+87
* | Support stable MSC1772 spaces identifiers. (#9915)Patrick Cloke2021-05-053-2/+10
* | Optionally track memory usage of each LruCache (#9881)Erik Johnston2021-05-058-1/+97
* | Limit how often GC happens by time. (#9902)Erik Johnston2021-05-056-3/+63
* | Don't set the external cache if its been done recently (#9905)Erik Johnston2021-05-053-5/+34
* | Use get_current_users_in_room from store and not StateHandler (#9910)Erik Johnston2021-05-0512-17/+26
* | Docker healthcheck timings - add startup delay and changed interval (#9913)Christopher May-Townsend2021-05-053-4/+16
* | Leave out optional keys from /sync (#9919)DeepBlueV7.X2021-05-054-50/+51
* | Merge branch 'master' into developBrendan Abolivier2021-05-054-4/+20
|\|
| * 1.33.0 v1.33.0 github/release-v1.33.0 release-v1.33.0Brendan Abolivier2021-05-054-2/+16
| * Build Debian packages for Ubuntu 21.04 Hirsute (#9909)Dan Callahan2021-04-302-3/+5
* | Time external cache response time (#9904)Erik Johnston2021-05-042-10/+27
* | Add port parameter to the sample config for psycopg2 args (#9911)Andrew Morgan2021-05-043-0/+3
* | Merge tag 'v1.33.0rc2' into developAndrew Morgan2021-04-293-2/+10
|\|
| * typo in changelog v1.33.0rc2Andrew Morgan2021-04-291-1/+1
| * 1.33.0rc2Andrew Morgan2021-04-293-2/+10
* | Add missing type hints to handlers and fix a Spam Checker type hint. (#9896)Patrick Cloke2021-04-298-54/+82
* | Delete room endpoint (#9889)ThibF2021-04-295-64/+128
* | Merge remote-tracking branch 'origin/release-v1.33.0' into developErik Johnston2021-04-283-1/+46
|\|
| * Fix tight loop handling presence replication. (#9900)Erik Johnston2021-04-283-1/+46
* | Use the parent's logging context name for runWithConnection. (#9895)Patrick Cloke2021-04-282-1/+4
* | Merge tag 'v1.33.0rc1' into developAndrew Morgan2021-04-2841-173/+147
|\|
| * Reword account validity template change to sound less like a bugfix v1.33.0rc1Andrew Morgan2021-04-281-1/+1
| * 1.33.0rc1Andrew Morgan2021-04-2836-35/+54
| * Revert "Experimental Federation Speedup (#9702)"Andrew Morgan2021-04-285-138/+93
* | Reduce memory footprint of caches (#9886)Erik Johnston2021-04-282-18/+60
* | Add type hints to presence handler (#9885)Erik Johnston2021-04-282-70/+90
|/
* Remove various bits of compatibility code for Python <3.6 (#9879)Andrew Morgan2021-04-2716-98/+29
* Pass errors back to the client when trying multiple federation destinations. ...Patrick Cloke2021-04-272-58/+61
* Use current state table for `presence.get_interested_remotes` (#9887)Erik Johnston2021-04-272-7/+3
* Improved validation for received requests (#9817)Richard van der Hoff2021-04-2315-31/+174
* Kill off `_PushHTTPChannel`. (#9878)Richard van der Hoff2021-04-233-121/+20
* Allow OIDC cookies to work on non-root public baseurls (#9726)Andrew Morgan2021-04-233-9/+22
* pass a reactor into SynapseSite (#9874)Richard van der Hoff2021-04-237-24/+43
* Add type hints to auth and auth_blocking. (#9876)Patrick Cloke2021-04-234-44/+48
* Make DomainSpecificString an attrs class (#9875)Erik Johnston2021-04-234-8/+24
* Remove room and user invite ratelimits in default unit test config (#9871)Andrew Morgan2021-04-232-0/+5
* Split presence out of master (#9820)Erik Johnston2021-04-2317-245/+245
* Check for space membership during a remote join of a restricted room (#9814)Patrick Cloke2021-04-236-68/+131
* Only store data in caches, not "smart" objects (#9845)Erik Johnston2021-04-233-141/+182
* Limit the size of HTTP responses read over federation. (#9833)Richard van der Hoff2021-04-234-8/+110
* Handle all new rate limits in demo scripts (#9858)manuroe2021-04-222-12/+43
* Limit length of accepted email addresses (#9855)Erik Johnston2021-04-226-7/+100
* Clear the resync bit after resyncing device lists (#9867)Richard van der Hoff2021-04-223-10/+17
* Remove `synapse.types.Collection` (#9856)Richard van der Hoff2021-04-2226-62/+77
* Merge branch 'master' into developAndrew Morgan2021-04-224-4/+30
|\
| * Merge tag 'v1.32.2'Andrew Morgan2021-04-224-4/+30
| |\
| | * A regression can't be introduced twice v1.32.2 github/release-v1.32.2 release-v1.32.2Andrew Morgan2021-04-221-2/+2
| | * Note regression was in 1.32.0 and 1.32.1Andrew Morgan2021-04-221-2/+2
| | * Update dates in changelogsAndrew Morgan2021-04-212-2/+2
| | * 1.32.2Andrew Morgan2021-04-214-2/+18
| | * Merge branch 'release-v1.32.1' of github.com:matrix-org/synapse into release-...Andrew Morgan2021-04-212-9/+16
| | |\
| | * | Make LoggingContext's name optional (#9857)Richard van der Hoff2021-04-212-3/+13
* | | | Merge branch 'master' of github.com:matrix-org/synapse into developAndrew Morgan2021-04-212-9/+16
|\| | |
| * | | Merge branch 'release-v1.32.1' of github.com:matrix-org/synapseAndrew Morgan2021-04-212-9/+16
| |\ \ \ | | | |/ | | |/|
| | * | Note LoggingContext signature change incompatibility in 1.32.0 (#9859) github/release-v1.32.1 release-v1.32.1Andrew Morgan2021-04-212-9/+16
| | |/
* | | Merge branch 'master' into developAndrew Morgan2021-04-216-15/+49
|\| |
| * | Merge tag 'v1.32.1'Andrew Morgan2021-04-216-15/+49
| |\|
| | * Clarify 1.32.0/1 changelog and upgrade notes v1.32.1Andrew Morgan2021-04-212-8/+7
| | * Add regression notes to CHANGES.md; fix link in 1.32.0 changelogAndrew Morgan2021-04-211-2/+6
| | * Add link to fixing prometheus to 1.32.0 upgrade notes; 1.32.1 has a fixAndrew Morgan2021-04-212-2/+6
| | * Fix typo in link to regression in 1.32.0 upgrade notesAndrew Morgan2021-04-211-1/+1
| | * 1.32.1Andrew Morgan2021-04-214-2/+16
| | * Mention Prometheus metrics regression in v1.32.0Andrew Morgan2021-04-212-0/+15
| | * Stop BackgroundProcessLoggingContext making new prometheus timeseries (#9854)Richard van der Hoff2021-04-213-5/+18
* | | Rename handler and config modules which end in handler/config. (#9816)Patrick Cloke2021-04-2017-35/+43
* | | Merge branch 'master' into developAndrew Morgan2021-04-202-0/+15
|\| |
| * | Mention Prometheus metrics regression in v1.32.0 github/release-v1.32.0 release-v1.32.0Andrew Morgan2021-04-202-0/+15
| |/
* | Merge branch 'master' into developAndrew Morgan2021-04-201-0/+9
|\|
| * Further tweaking on gpg signing key noticeAndrew Morgan2021-04-201-2/+5
| * Add note about expired Debian gpg signing keys to CHANGES.mdAndrew Morgan2021-04-201-0/+6
* | Merge branch 'master' into developAndrew Morgan2021-04-2011-40/+62
|\|
| * Update v1.32.0 changelog. It's m.login.application_service, not plural v1.32.0Andrew Morgan2021-04-201-1/+1
| * 1.32.0Andrew Morgan2021-04-204-6/+18
| * Add Application Service registration type requirement + py35, pg95 deprecatio...Andrew Morgan2021-04-201-0/+18
| * Always use the name as the log ID. (#9829)Patrick Cloke2021-04-208-34/+26
* | Add presence federation stream (#9819)Erik Johnston2021-04-206-31/+426
* | Fix bug where we sent remote presence states to remote servers (#9850)Erik Johnston2021-04-203-3/+13
* | Fix (final) Bugbear violations (#9838)Jonathan de Jong2021-04-2023-49/+46
* | Port "Allow users to click account renewal links multiple times without hitti...Andrew Morgan2021-04-1918-263/+496
* | Sanity check identity server passed to bind/unbind. (#9802)Denis Kasak2021-04-193-3/+59
* | Don't send normal presence updates over federation replication stream (#9828)Erik Johnston2021-04-195-183/+75
* | User directory: use calculated room membership state instead (#9821)Andrew Morgan2021-04-163-7/+36
* | Small speed up joining large remote rooms (#9825)Erik Johnston2021-04-162-21/+34
* | remove `HomeServer.get_config` (#9815)Richard van der Hoff2021-04-149-18/+16
* | Separate creating an event context from persisting it in the federation handl...Patrick Cloke2021-04-143-67/+118
* | Revert "Check for space membership during a remote join of a restricted room....Patrick Cloke2021-04-147-238/+131
* | Check for space membership during a remote join of a restricted room. (#9763)Patrick Cloke2021-04-147-131/+238
* | Experimental Federation Speedup (#9702)Jonathan de Jong2021-04-145-97/+129
* | Move some replication processing out of generic_worker (#9796)Erik Johnston2021-04-146-483/+486
* | More robust handling of the Content-Type header for thumbnail generation (#9788)rkfg2021-04-143-0/+5
* | Remove redundant "coding: utf-8" lines (#9786)Jonathan de Jong2021-04-14651-651/+1
* | Add a dockerfile for running a set of Synapse worker processes (#9162)Andrew Morgan2021-04-1411-6/+867
* | Add note to docker docs explaining platform support (#9801)Andrew Morgan2021-04-142-3/+7
|/
* Update changelog for v1.32.0 v1.32.0rc1Andrew Morgan2021-04-131-1/+1
* 1.32.0rc1Andrew Morgan2021-04-1337-36/+73
* Add release helper script (#9713)Erik Johnston2021-04-133-0/+252
* Bump black configuration to target py36 (#9781)Dan Callahan2021-04-1311-15/+16
* Add an admin API to manage ratelimit for a specific user (#9648)Dirk Klimpel2021-04-136-6/+573
* Drop Python 3.5 from Trove classifier metadata. (#9782)Dan Callahan2021-04-122-1/+1
* Add option to skip unit tests when building debs (#9793)Dan Callahan2021-04-124-13/+34
* Require AppserviceRegistrationType (#9548)Will Hunt2021-04-125-23/+60
* Use mock from the stdlib. (#9772)Patrick Cloke2021-04-0982-126/+86
* Fix duplicate logging of exceptions in transaction processing (#9780)Richard van der Hoff2021-04-092-7/+4
* Enable complement tests for MSC2946. (#9771)Patrick Cloke2021-04-092-1/+2
* Proof of concept for GitHub Actions (#9661)Dan Callahan2021-04-092-0/+323
* Remove old admin API `GET /_synapse/admin/v1/users/<user_id>` (#9401)Dirk Klimpel2021-04-095-27/+16
* Bugbear: Add Mutable Parameter fixes (#9682)Jonathan de Jong2021-04-0838-113/+224
* Merge pull request #9766 from matrix-org/rav/drop_py35Richard van der Hoff2021-04-0813-111/+24
|\
| * Merge remote-tracking branch 'origin/develop' into rav/drop_py35Richard van der Hoff2021-04-0867-825/+2182
| |\ | |/ |/|
* | Merge pull request #9769 from matrix-org/rav/fix_bionicRichard van der Hoff2021-04-083-11/+18
|\ \
* \ \ Merge branch 'erikj/fix_stalled_catchup' into developErik Johnston2021-04-082-2/+5
|\ \ \
| * | | Fix sharded federation sender sometimes using 100% CPU.Erik Johnston2021-04-082-2/+5
* | | | Put opencontainers labels to the final image (#9765)Johannes Wienke2021-04-082-5/+6
* | | | MSC3083: Check for space membership during a local join of restricted rooms. ...Patrick Cloke2021-04-083-2/+76
|/ / /
* | | Record more information into structured logs. (#9654)Patrick Cloke2021-04-0810-88/+255
* | | Don't report anything from GaugeBucketCollector metrics until data is present...Andrew Morgan2021-04-062-3/+14
* | | Add a Synapse Module for configuring presence update routing (#9491)Andrew Morgan2021-04-0614-64/+1282
* | | Add type hints to expiring cache. (#9730)Patrick Cloke2021-04-068-54/+65
* | | Fix reported bugbear: too broad exception assertion (#9753)Andrew Morgan2021-04-062-2/+4
* | | Remove outdated constraint on remote_media_cache_thumbnails (#9725)Richard van der Hoff2021-04-063-3/+41
* | | Merge branch 'master' into developErik Johnston2021-04-068-8/+72
|\ \ \
| * | | 1.31.0 v1.31.0 github/release-v1.31.0 release-v1.31.0Erik Johnston2021-04-066-7/+27
| * | | Add deprecation policy doc (#9723)Erik Johnston2021-04-064-2/+46
| * | | Fix version for bugbear (#9734)Jonathan de Jong2021-04-062-1/+2
* | | | Add type hints to the federation handler and server. (#9743)Patrick Cloke2021-04-064-95/+97
* | | | Convert storage test cases to HomeserverTestCase. (#9736)Patrick Cloke2021-04-0611-499/+265
| | | * remove unused param on `make_tuple_comparison_clause`Richard van der Hoff2021-04-085-9/+3
| | | * update test_old_deps scriptRichard van der Hoff2021-04-081-1/+1
| | | * Update tox.ini to remove py35Richard van der Hoff2021-04-081-8/+6
| | | * drop support for stretch and xenialRichard van der Hoff2021-04-081-2/+0
| | | * Drop support for sqlite<3.22 as wellRichard van der Hoff2021-04-086-92/+14
| | | * Require py36 and Postgres 9.6Richard van der Hoff2021-04-083-3/+4
| | |/
| | * unpin olddeps build from py36Richard van der Hoff2021-04-082-5/+5
| | * Fix incompatibility with tox 2.5Richard van der Hoff2021-04-082-6/+13
| |/ |/|
* | Update mypy configuration: `no_implicit_optional = True` (#9742)Jonathan de Jong2021-04-0510-11/+21
* | Fix version for bugbear (#9734)Jonathan de Jong2021-04-022-1/+2
* | Improve tracing for to device messages (#9686)Erik Johnston2021-04-017-19/+102
* | Add `order_by` to list user admin API (#9691)Dirk Klimpel2021-04-016-31/+248
* | Add an experimental room version to support restricted join rules. (#9717)Patrick Cloke2021-03-316-11/+297
* | Merge branch 'release-v1.31.0' into developPatrick Cloke2021-03-312-1/+2
|\|
| * Revert "Use 'dmypy run' in lint.sh instead of 'mypy' (#9701)" (#9720)Patrick Cloke2021-03-312-1/+2
* | Make sample config allowed_local_3pids regex stricter. (#9719)Denis Kasak2021-03-313-4/+5
* | Deprecate imp (#9718)Cristina2021-03-312-3/+9
* | Rewrite complement.sh (#9685)Andrew Morgan2021-03-312-11/+39
* | Include m.room.create in invite_room_state for Spaces (#9710)Richard van der Hoff2021-03-302-0/+5
* | Replace `room_invite_state_types` with `room_prejoin_state` (#9700)Richard van der Hoff2021-03-308-43/+144
* | Make RateLimiter class check for ratelimit overrides (#9711)Erik Johnston2021-03-3016-154/+241
|/
* Update changelog v1.31.0rc1Erik Johnston2021-03-301-3/+7
* 1.31.0rc1Erik Johnston2021-03-3045-44/+65
* Use 'dmypy run' in lint.sh instead of 'mypy' (#9701)Andrew Morgan2021-03-302-1/+2
* Add type hints to DictionaryCache and TTLCache. (#9442)Patrick Cloke2021-03-297-67/+96
* Clarify that register_new_matrix_user is present also when installed via non-...blakehawkins2021-03-292-8/+19
* Add type hints for the federation sender. (#9681)Patrick Cloke2021-03-297-59/+177
* Update the OIDC sample config (#9695)Richard van der Hoff2021-03-293-62/+7
* Fix CI by ignore type for None module import (#9709)Andrew Morgan2021-03-292-1/+2
* Fix `re.Pattern` mypy error on 3.6 (#9703)Jonathan de Jong2021-03-292-2/+3
* Fix the suggested pip incantation for cryptography (#9699)Richard van der Hoff2021-03-292-2/+16
* Make pip install faster in Docker build for Complement testing (#9610)Eric Eastwood2021-03-262-43/+42
* Suppress CryptographyDeprecationWarning (#9698)Richard van der Hoff2021-03-264-14/+26
* Make it possible to use dmypy (#9692)Erik Johnston2021-03-2616-17/+56
* Merge branch 'master' into developErik Johnston2021-03-265-21/+63
|\
| * Update cahngelog v1.30.1 github/release-v1.30.1 release-v1.30.1Erik Johnston2021-03-261-3/+2
| * Update cahngelogErik Johnston2021-03-261-2/+14
| * 1.30.1Erik Johnston2021-03-265-3/+26
| * Explicitly upgrade openssl in docker file and enforce new version of cryptogr...Erik Johnston2021-03-264-20/+28
* | Preserve host in example apache config (#9696)Paul Tötterman2021-03-262-5/+11
* | Use interpreter from $PATH instead of absolute paths in various scripts using...Quentin Gliech2021-03-2517-17/+18
* | platform specific prerequisites in source install (#9667)Serban Constantin2021-03-252-7/+9
* | Add a storage method for returning all current presence from all users (#9650)Andrew Morgan2021-03-253-3/+69
* | Fixed undefined variable error in catchup (#9664)Erik Johnston2021-03-242-0/+3
* | Fix typo in changelog.Patrick Cloke2021-03-242-2/+2
* | Enable addtional flake8-bugbear linting checks. (#9659)Jonathan de Jong2021-03-248-8/+9
* | Spaces summary: call out to other servers (#9653)Richard van der Hoff2021-03-244-27/+324
* | docs: fallback/web endpoint does not appear to be mounted on workers (#9679)Ben Banfield-Zanin2021-03-242-2/+2
* | Bump mypy-zope to 0.2.13. (#9678)Patrick Cloke2021-03-242-1/+2
* | Add type hints to misc. files. (#9676)Patrick Cloke2021-03-246-54/+57
* | Add a type hints for service notices to the HomeServer object. (#9675)Patrick Cloke2021-03-2411-40/+52
* | Increase default join burst ratelimiting (#9674)Erik Johnston2021-03-233-6/+7
* | Fix federation stall on concurrent access errors (#9639)Jonathan de Jong2021-03-232-36/+10
* | Federation API for Space summary (#9652)Richard van der Hoff2021-03-233-54/+197
* | Import HomeServer from the proper module. (#9665)Patrick Cloke2021-03-2359-58/+59
* | Allow providing credentials to HTTPS_PROXY (#9657)Andrew Morgan2021-03-224-34/+184
* | Include opencontainers labels in Docker image (#9612)Johannes Wienke2021-03-222-0/+6
* | Fixed code misc. quality issues (#9649)Ankit Dobhal2021-03-224-3/+4
* | Merge branch 'master' into developErik Johnston2021-03-223-4/+17
|\|
| * 1.30.0 v1.30.0 github/release-v1.30.0 release-v1.30.0Erik Johnston2021-03-223-3/+16
| * Fix jemalloc changelog entry wordingAndrew Morgan2021-03-161-1/+1
* | Merge pull request #9644 from matrix-org/babolivier/msc3026Brendan Abolivier2021-03-227-4/+43
|\ \
| * | Incorporate reviewBrendan Abolivier2021-03-192-2/+2
| * | Merge branch 'develop' into babolivier/msc3026Brendan Abolivier2021-03-1918-154/+563
| |\ \ | |/ / |/| |
* | | fix mypyRichard van der Hoff2021-03-191-4/+7
* | | federation_client: handle inline signing_keys in hs.yaml (#9647)Richard van der Hoff2021-03-182-54/+18