summary refs log tree commit diff
Commit message (Expand)AuthorAgeFilesLines
* await github/hs/hacked-together-event-cache hs/hacked-together-event-cacheWill Hunt2021-08-101-1/+1
* Merge remote-tracking branch 'origin/develop' into hs/hacked-together-event-c...Will Hunt2021-08-1093-806/+2082
|\
| * Fix an edge-case with invited rooms over federation in the spaces summary. (#...Patrick Cloke2021-08-103-62/+138
| * Update contributing.md to warn against rebasing an open PR. (#10563)Hillery Shay2021-08-102-0/+2
| * Merge branch 'master' into developBrendan Abolivier2021-08-103-1/+13
| |\
| | * 1.40.0 v1.40.0Brendan Abolivier2021-08-103-1/+13
| * | When redacting, keep event fields around that maintain the historical event s...Eric Eastwood2021-08-093-6/+40
| * | Do not remove `status_msg` when user going offline (#10550)Dirk Klimpel2021-08-093-9/+166
| * | Moved homeserver documentation above reverse proxy examples (#10551)Drew Short2021-08-092-10/+14
| * | Merge branch 'release-v1.40' into developBrendan Abolivier2021-08-0911-38/+61
| |\|
| | * 1.40.0rc3 v1.40.0rc3Brendan Abolivier2021-08-096-4/+28
| | * Support MSC3289: Room version 8 (#10449)Patrick Cloke2021-08-099-36/+35
| * | Convert Transaction and Edu object to attrs (#10542)Patrick Cloke2021-08-068-194/+75
| * | Fix exceptions in logs when failing to get remote room list (#10541)Erik Johnston2021-08-065-38/+134
| * | Clean up federation event auth code (#10539)Richard van der Hoff2021-08-063-56/+69
| * | Update the API response for spaces summary over federation. (#10530)Patrick Cloke2021-08-062-19/+39
| * | Add a setting to disable TLS for sending email (#10546)Richard van der Hoff2021-08-068-50/+138
| * | Mark all MSC2716 events as historical (#10537)Eric Eastwood2021-08-052-5/+11
| * | Merge remote-tracking branch 'origin/release-v1.40' into developRichard van der Hoff2021-08-052-28/+24
| |\|
| | * fix broken links in `upgrade.md` (#10543)Dirk Klimpel2021-08-052-28/+24
| * | Refactoring before implementing the updated spaces summary. (#10527)Patrick Cloke2021-08-054-136/+198
| * | Only return an appservice protocol if it has a service providing it. (#10532)Will Hunt2021-08-053-5/+125
| * | Add documentation for configuring a forward proxy. (#10443)Dirk Klimpel2021-08-053-0/+76
| * | Don't fail CI when lint-newfile job was skipped (#10529)Erik Johnston2021-08-052-1/+7
| * | Merge tag 'v1.40.0rc2' into developErik Johnston2021-08-057-3/+38
| |\|
| | * Fixup changelog v1.40.0rc2Brendan Abolivier2021-08-041-1/+1
| | * Fixup changelogBrendan Abolivier2021-08-041-1/+1
| | * Fixup changelogBrendan Abolivier2021-08-041-1/+1
| | * 1.40.0rc2Brendan Abolivier2021-08-046-4/+23
| | * Don't fail on empty bodies when sending out read receipts (#10531)Brendan Abolivier2021-08-043-1/+14
| | * Fix PeriodicallyFlushingMemoryHandler inhibiting application shutdown (#10517)reivilibre2021-08-032-0/+2
| | * Fix release script URL (#10516)Erik Johnston2021-08-032-1/+2
| * | Send unstable-prefixed room_type in store-invite IS API requests (#10435)Michael Telatynski2021-08-043-1/+19
| * | Add support for MSC2716 marker events (#10498)Eric Eastwood2021-08-048-35/+265
| * | Improve event caching code (#10119)Erik Johnston2021-08-044-43/+158
| * | Fix `could not serialize access` errors for `claim_e2e_one_time_keys` (#10504)Erik Johnston2021-08-042-62/+127
| * | Add `get_userinfo_by_id` method to `ModuleApi` (#9581)Jason Robinson2021-08-045-2/+80
| * | Add warnings to ip_range_blacklist usage with proxies (#10129)Kento Okamoto2021-08-034-5/+26
| * | Fix debian package triggers (#10481)Richard van der Hoff2021-08-033-9/+17
| * | Make sync response cache time configurable. (#10513)Richard van der Hoff2021-08-034-3/+34
| * | Include room ID in ignored EDU log messages (#10507)Dagfinn Ilmari Mannsåker2021-08-033-2/+5
| |/
* | Merge remote-tracking branch 'origin/develop' into hs/hacked-together-event-c...Will Hunt2021-08-0355-95/+680
|\|
| * Fixup changelog v1.40.0rc1Erik Johnston2021-08-031-1/+1
| * Fixup changelogErik Johnston2021-08-031-3/+1
| * Fixup changelogErik Johnston2021-08-031-6/+6
| * 1.40.0rc1Erik Johnston2021-08-0347-47/+67
| * Revert use of PeriodicallyFlushingMemoryHandler by default (#10515)reivilibre2021-08-033-8/+3
| * Extend the release script to tag and create the releases. (#10496)Erik Johnston2021-08-033-36/+278
| * Add developer documentation to explain room DAG concepts like `outliers` and ...Eric Eastwood2021-08-033-0/+81
| * Fix the `tests-done` github actions step, again (#10512)Richard van der Hoff2021-08-022-9/+13
| * Fix codestyle CI from #10440 (#10511)reivilibre2021-08-022-1/+2
| * Prune inbound federation queues if they get too long (#10390)Erik Johnston2021-08-024-2/+177
| * Allow setting transaction limit for db connections (#10440)Toni Spets2021-08-026-0/+69
* | Merge remote-tracking branch 'origin/develop' into hs/hacked-together-event-c...Will Hunt2021-08-0181-257/+1819
|\|
| * Fix deb build script to set prerelease flag correctly (#10500)Richard van der Hoff2021-08-012-5/+5
| * Fix explicit assignment of PL 0 from being misinterpreted in rare circumstanc...reivilibre2021-07-302-1/+2
| * Remove shebang line from module files (#10415)V024602021-07-2917-16/+1
| * Merge remote-tracking branch 'origin/master' into developErik Johnston2021-07-293-5/+14
| |\
| | * Merge tag 'v1.39.0'Erik Johnston2021-07-293-5/+14
| | |\
| | | * Fixup changelog v1.39.0Erik Johnston2021-07-291-4/+1
| | | * 1.39.0Erik Johnston2021-07-293-1/+13
| * | | Improve failover logic for MSC3083 restricted rooms. (#10447)Patrick Cloke2021-07-292-4/+40
| * | | Merge branch 'master' into developErik Johnston2021-07-290-0/+0
| |\| |
| | * | Merge tag 'v1.39.0rc3'Erik Johnston2021-07-29265-2479/+4141
| | |\|
| * | | Fix backfilled events being rejected for no `state_groups` (#10439)Eric Eastwood2021-07-292-0/+132
| * | | Generics for `ObservableDeferred` (#10491)Richard van der Hoff2021-07-284-9/+15
| * | | Make historical events discoverable from backfill for servers without any scr...Eric Eastwood2021-07-2812-26/+338
| * | | Merge tag 'v1.39.0rc3' into developErik Johnston2021-07-2811-17/+81
| |\ \ \ | | | |/ | | |/|
| | * | Fixup changelog v1.39.0rc3Erik Johnston2021-07-281-2/+2
| | * | 1.39.0rc3Erik Johnston2021-07-288-6/+25
| | * | Fix import of the default SAML mapping provider. (#10477)Jason Robinson2021-07-272-2/+1
| | * | Fix typo that causes R30v2 to actually be old R30 (#10486)reivilibre2021-07-272-1/+2
| | * | Always communicate device OTK counts to clients (#10485)Andrew Morgan2021-07-275-6/+36
| | * | Change release script to update debian changelog for RCs (#10465)Erik Johnston2021-07-272-6/+21
| * | | Fix up type hints for Twisted 21.7 (#10490)Richard van der Hoff2021-07-286-15/+25
| * | | improve typing annotations in CachedCall (#10450)Richard van der Hoff2021-07-282-10/+18
| * | | Restricted rooms (MSC3083) should not have their allow key redacted. (#10489)Patrick Cloke2021-07-283-0/+46
| * | | Support for MSC2285 (hidden read receipts) (#10413)Å imon Brandner2021-07-2811-12/+495
| * | | Document Complement dev usage (#10483)Eric Eastwood2021-07-272-2/+40
| * | | Support underscores (in addition to hyphens) for charset detection. (#10410)sri-vidyut2021-07-273-2/+18
| * | | Fix `oldest_pdu_in_federation_staging` (#10455)Erik Johnston2021-07-272-2/+6
| * | | allow specifying https:// proxy (#10411)Dirk Klimpel2021-07-273-133/+450
| * | | Add a PeriodicallyFlushingMemoryHandler to prevent logging silence (#10407)reivilibre2021-07-274-2/+97
* | | | Merge remote-tracking branch 'origin/develop' into hs/hacked-together-event-c...Will Hunt2021-07-27155-860/+2255
|\| | |
| * | | Use new go test running syntax for complement. (#10488)Patrick Cloke2021-07-273-2/+3
| * | | Mitigate media repo XSSs on IE11. (#10468)Denis Kasak2021-07-272-0/+3
| * | | Support MSC2033: Device ID on whoami (#9918)Travis Ralston2021-07-273-2/+51
| * | | Add type hints to state handler. (#10482)Patrick Cloke2021-07-264-19/+29
| * | | Update the MSC3083 support to verify if joins are from an authorized server. ...Patrick Cloke2021-07-2617-98/+632
| * | | Add type hints to synapse.federation.transport.client. (#10408)Patrick Cloke2021-07-262-201/+299
| * | | Enable docker image caching for the deb build (#10431)Richard van der Hoff2021-07-263-13/+65
| * | | Merge branch 'release-v1.39' into developErik Johnston2021-07-232-1/+2
| |\| |
| | * | Merge tag 'v1.38.1' into release-v1.39Erik Johnston2021-07-232-0/+15
| | |\ \
| | * | | Fix an error in the docker workflow (#10461)Richard van der Hoff2021-07-222-1/+2
| * | | | Merge tag 'v1.39.0rc2' into developErik Johnston2021-07-233-2/+16
| |\| | |
| | * | | 1.39.0rc2 v1.39.0rc2Erik Johnston2021-07-224-3/+16
| | * | | Merge commit '7da24b975dfb10c277cf963dfddb88f55b1ca598' into release-v1.39Erik Johnston2021-07-222-4/+8
| | |\ \ \
| * | \ \ \ Merge branch 'master' into developErik Johnston2021-07-233-4/+22
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| | * | | | Merge tag 'v1.38.1'Richard van der Hoff2021-07-234-5/+23
| | |\ \ \ \ | | | | |_|/ | | | |/| |
| | | * | | 1.38.1 v1.38.1Erik Johnston2021-07-224-2/+16
| | | | |/ | | | |/|
| | | * | Always send device_one_time_keys_count (#10457)David Baker2021-07-222-4/+8
| * | | | Disable msc2716 until Complement update is merged (#10463)Eric Eastwood2021-07-222-1/+2
| * | | | Add `creation_ts` to list users admin API (#10448)Dirk Klimpel2021-07-226-33/+46
| * | | | Replace `or_ignore` in `simple_insert` with `simple_upsert` (#10442)Erik Johnston2021-07-226-99/+44
| * | | | Fix a handful of type annotations. (#10446)Richard van der Hoff2021-07-224-5/+6
| * | | | Move dev/ docs to development/ (#10453)Eric Eastwood2021-07-229-7/+8
| * | | | Cancel redundant GHA workflows (#10451)Richard van der Hoff2021-07-223-0/+9
| * | | | Fix the tests-done Github Actions job (#10444)Richard van der Hoff2021-07-222-1/+19
| * | | | Drop xenial-support hacks (#10429)Richard van der Hoff2021-07-217-18/+22
| * | | | Add type hints to additional servlet functions (#10437)Patrick Cloke2021-07-216-66/+176
| * | | | Fix the hierarchy of OpenID providers in the docs. (#10445)Patrick Cloke2021-07-212-1/+2
| * | | | Update the notification email subject when invited to a space. (#10426)Patrick Cloke2021-07-213-2/+21
| * | | | Merge remote-tracking branch 'origin/release-v1.39' into developRichard van der Hoff2021-07-213-78/+73
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | Move the docker image build to Github Actions (#10416)Richard van der Hoff2021-07-213-78/+73
| * | | | Add a return type to parse_string. (#10438)Patrick Cloke2021-07-2113-45/+86
| * | | | Switch to `chunk` events so we can auth via power_levels (MSC2716) (#10432)Eric Eastwood2021-07-213-6/+18
| * | | | Merge tag 'v1.39.0rc1' into developAndrew Morgan2021-07-2055-52/+94
| |\| | |
| | * | | 1.39.0rc1 v1.39.0rc1Andrew Morgan2021-07-201-0/+6
| | * | | Incorporate changelog of #10433Andrew Morgan2021-07-202-1/+1
| | * | | Fix dropping locks on shut down (#10433)Erik Johnston2021-07-203-1/+19
| | * | | Combine some changelog lines in the documentation sectionAndrew Morgan2021-07-201-6/+3
| | * | | Update account validity feature line in changelogAndrew Morgan2021-07-201-1/+1
| | * | | fix typo in changelogAndrew Morgan2021-07-201-1/+1
| | * | | changelog word fixesAndrew Morgan2021-07-201-1/+1
| | * | | 1.39.0rc1Andrew Morgan2021-07-2052-51/+72
| * | | | MSC3244 room capabilities implementation (#10283)Michael Telatynski2021-07-205-3/+93
| * | | | Revert "Fix dropping locks on shut down"Erik Johnston2021-07-201-5/+1
| * | | | Fix dropping locks on shut downErik Johnston2021-07-201-1/+5
| |/ / /
| * | | Add a github actions job recording success of other jobs. (#10430)Richard van der Hoff2021-07-202-0/+13
| * | | Port the ThirdPartyEventRules module interface to the new generic interface (...Brendan Abolivier2021-07-2012-108/+403
| * | | Fix exception when failing to get remote room list (#10414)Erik Johnston2021-07-202-1/+6
* | | | Fix merge failWill Hunt2021-07-201-4/+0
* | | | Merge remote-tracking branch 'origin/develop' into hs/hacked-together-event-c...Will Hunt2021-07-20365-3506/+5931
|\| | |
| * | | Factorise `get_datastore` calls in phone_stats_home. (#10427)reivilibre2021-07-192-16/+19
| * | | Add a new version of the R30 phone-home metric, which removes a false impress...reivilibre2021-07-196-5/+416
| * | | [pyupgrade] `synapse/` (#10348)Jonathan de Jong2021-07-1929-102/+86
| * | | Remove unused `events_by_room` (#10421)Eric Eastwood2021-07-192-4/+1
| * | | One last inline type hint (for the whole repo) (#10418)Jonathan de Jong2021-07-162-1/+2
| * | | Use inline type hints in `handlers/` and `rest/`. (#10382)Jonathan de Jong2021-07-1643-215/+212
| * | | Add a module type for account validity (#9884)Brendan Abolivier2021-07-1613-228/+438
| * | | Do not include signatures/hashes in make_{join,leave,knock} responses. (#10404)Patrick Cloke2021-07-163-6/+18
| * | | Use inline type hints in `http/federation/`, `storage/` and `util/` (#10381)Jonathan de Jong2021-07-1538-162/+150
| * | | Reduce likelihood of Postgres table scanning `state_groups_state`. (#10359)Erik Johnston2021-07-152-0/+35
| * | | Merge branch 'master' into developBrendan Abolivier2021-07-152-2/+5
| |\| |
| | * | Make deprecation notice of the spam checker doc more obvious (#10395)Brendan Abolivier2021-07-152-2/+5
| | |/
| * | Add tests to characterise the current behaviour of R30 phone-home metrics (#1...reivilibre2021-07-152-0/+154
| * | Updating install prerequisites for newer macOS & ARM Macs. (#9971)Luke Walsh2021-07-152-3/+7
| * | Docs: Use something other than the document name to describe a page (#10399)Andrew Morgan2021-07-1512-23/+22
| * | Stagger send presence to remotes (#10398)Erik Johnston2021-07-154-5/+116
| * | Update the logcontext doc (#10353)Brendan Abolivier2021-07-152-230/+102
| * | Use inline type hints in various other places (in `synapse/`) (#10380)Jonathan de Jong2021-07-1579-336/+329
| * | Allow providing credentials to `http_proxy` (#10360)Dirk Klimpel2021-07-153-14/+64
| * | Fix a number of logged errors caused by remote servers being down. (#10400)Erik Johnston2021-07-155-19/+66
| * | doc: Add delegation example to the caddy reverse proxy section (#10368)Moritz Dietz2021-07-142-0/+28
| * | Instructions on installing RC debs (#10396)Richard van der Hoff2021-07-142-9/+13
| * | Set section for prerelease debs (#10391)Richard van der Hoff2021-07-142-0/+15
| * | Make GHA config more efficient (#10383)Richard van der Hoff2021-07-143-15/+21
| * | Add type hints and comments to event auth code. (#10393)Patrick Cloke2021-07-144-10/+18
| * | Fix messages from multiple senders in historical chunk (MSC2716) (#10276)Eric Eastwood2021-07-133-11/+76
| * | Add type hints to get_domain_from_id and get_localpart_from_id. (#10385)Patrick Cloke2021-07-133-26/+75
| * | Show all joinable rooms in the spaces summary. (#10298)Patrick Cloke2021-07-136-38/+237
| * | Merge branch 'master' into developRichard van der Hoff2021-07-135-9/+133
| |\|
| | * Move upgrade blurb v1.38.0Richard van der Hoff2021-07-131-2/+2
| | * Update CHANGES.mdRichard van der Hoff2021-07-131-1/+1
| | * fix debian changelogRichard van der Hoff2021-07-131-1/+7
| | * 1.38.0Richard van der Hoff2021-07-133-2/+8
| | * 1.38.0rc3 v1.38.0rc3Richard van der Hoff2021-07-135-5/+16
| | * Github Actions workflow to attach release artifacts to release (#10379)Richard van der Hoff2021-07-132-1/+28
| | * Build the python release artifacts in GHA tooRichard van der Hoff2021-07-131-3/+23
| | * build debs in GHA (#10247)Richard van der Hoff2021-07-123-4/+58
| * | Fix some links in `docs` and `contrib` (#10370)Dirk Klimpel2021-07-139-17/+23
| * | Bugfix `make_room_admin` fails for users that have left a private room (#10367)Dirk Klimpel2021-07-132-1/+9
| * | Use inline type hints in `tests/` (#10350)Jonathan de Jong2021-07-1318-63/+62
| * | [pyupgrade] `tests/` (#10347)Jonathan de Jong2021-07-1320-58/+45
| * | Fix federation inbound age metric. (#10355)Erik Johnston2021-07-132-1/+4
| * | Replace `room_depth.min_depth` with a BIGINT (#10289)Richard van der Hoff2021-07-124-7/+186
| * | Additional unit tests for spaces summary. (#10305)Patrick Cloke2021-07-122-1/+204
| * | Unblacklist fixed tests (#10357)Erik Johnston2021-07-093-5/+2
| * | Re-enable room v6 sytest (#10345)Richard van der Hoff2021-07-092-1/+1
| * | Revert "Newsfile"Erik Johnston2021-07-091-1/+0
| * | NewsfileErik Johnston2021-07-091-0/+1
| * | Merge remote-tracking branch 'origin/release-v1.38' into developErik Johnston2021-07-091-2/+2
| |\|
| | * Fix README rstErik Johnston2021-07-091-5/+4
| | * Fix README rstErik Johnston2021-07-091-4/+5
| * | Fix the user directory becoming broken (and noisy errors being logged) when k...reivilibre2021-07-092-2/+7
| * | Switch `application_services_txns.txn_id` to BIGINT (#10349)Richard van der Hoff2021-07-092-0/+24
| * | Merge tag 'v1.38.0rc2' into developErik Johnston2021-07-0916-621/+659
| |\|
| | * Fixup changelog v1.38.0rc2Erik Johnston2021-07-091-1/+1
| | * Fixup changelogErik Johnston2021-07-091-1/+1
| | * 1.38.0rc2Erik Johnston2021-07-095-4/+17
| | * Ensure we always drop the federation inbound lock (#10336)Erik Johnston2021-07-093-2/+15
| | * Fix broken links in INSTALL.md (#10331)Dirk Klimpel2021-07-0813-617/+629
| * | Upsert redactions in case they already exists (#10343)Andreas Rammhold2021-07-093-2/+4
| * | Add base starting insertion event when no chunk ID is provided (MSC2716) (#10...Eric Eastwood2021-07-083-23/+98
| * | Fix formatting in the logcontext doc (#10337)Brendan Abolivier2021-07-082-1/+2
| * | Remove functionality associated with unused historical stats tables (#9721)Cristina2021-07-0810-572/+22
| * | Minor changes to `user_daily_visits` (#10324)reivilibre2021-07-082-2/+3
| * | Rebuild event auth when rebuilding an event after a call to a `ThirdPartyEven...Brendan Abolivier2021-07-082-4/+7
| * | Fix a broken link in the admin api docs (#10322)Richard van der Hoff2021-07-072-2/+3
| * | Merge remote-tracking branch 'origin/release-v1.38' into developRichard van der Hoff2021-07-0716-46/+51
| |\|
| | * Update links to documentation in sample config (#10287)Dirk Klimpel2021-07-0716-46/+51
| * | Simplify structure of room admin API docs (#10313)Dirk Klimpel2021-07-072-45/+25
| * | Merge tag 'v1.38.0rc1' into developBrendan Abolivier2021-07-072-3/+2
| |\|
| | * Fix broken link v1.38.0rc1Brendan Abolivier2021-07-071-1/+1
| | * Merge latest fix into the changelogBrendan Abolivier2021-07-072-2/+1
| * | Merge branch 'release-v1.38' into developRichard van der Hoff2021-07-0736-64/+87
| |\|
| | * Merge branch 'master' into release-v1.38Richard van der Hoff2021-07-071-30/+27
| | |\
| | | * build the docs for master (#10323)Richard van der Hoff2021-07-071-31/+28
| | * | ANALYZE new stream ordering column (#10326)Brendan Abolivier2021-07-072-0/+11
| | * | Small changelog tweaksBrendan Abolivier2021-07-061-6/+4
| | * | 1.38.0rc1Brendan Abolivier2021-07-0634-33/+50
| * | | Ignore EDUs for rooms we're not in (#10317)Dagfinn Ilmari Mannsåker2021-07-064-0/+67
| |/ /
| * | Fix deactivate a user if he does not have a profile (#10252)Dirk Klimpel2021-07-063-22/+73
| * | Add script for getting info about recently registered users (#10290)Erik Johnston2021-07-0617-153/+309
| * | Handle old staged inbound events (#10303)Erik Johnston2021-07-063-10/+67
| * | Add upgrade notes about disk space for events migration (#10314)Richard van der Hoff2021-07-063-1/+44
| * | Add support for evicting cache entries based on last access time. (#10205)Erik Johnston2021-07-059-95/+485
| * | Fix bad link in modules documentation (#10302)Brendan Abolivier2021-07-022-1/+2
| * | Move methods involving event authentication to EventAuthHandler. (#10268)Patrick Cloke2021-07-0111-106/+112
| * | fix ordering of bg update (#10291)Richard van der Hoff2021-07-012-1/+2
| * | Reenable 'Backfilled events whose prev_events...' sytest (#10292)Erik Johnston2021-07-012-1/+1
| * | Add SSO `external_ids` to Query User Account admin API (#10261)Dirk Klimpel2021-07-014-85/+159
| * | Add some metrics to staging area (#10284)Erik Johnston2021-07-012-0/+40
| * | Fix the homeserver config example in presence router docs (#10288)Andrew Morgan2021-06-302-1/+4
| * | Change more stream_ordering columns to BIGINT (#10286)Richard van der Hoff2021-06-302-0/+31
| * | Rebuild other indexes using `stream_ordering` (#10282)Richard van der Hoff2021-06-303-6/+56
| * | Merge branch 'master' into developErik Johnston2021-06-303-1/+15
| |\|
| | * Fixup changelog v1.37.1Erik Johnston2021-06-301-1/+1
| | * Add note to changelogErik Johnston2021-06-301-1/+3
| | * 1.37.1Erik Johnston2021-06-303-1/+13
| * | Correct type hints for synapse.event_auth. (#10253)Patrick Cloke2021-06-306-38/+51
| * | Fix the inbound PDU metric (#10279)Erik Johnston2021-06-306-27/+93
* | | Merge remote-tracking branch 'origin/develop' into hs/hacked-together-event-c...Will Hunt2021-06-2969-1879/+4101
|\| |
| * | Merge branch 'release-v1.37' into developRichard van der Hoff2021-06-294-3/+10
| |\|
| | * 1.37.1rc1 v1.37.1rc1Richard van der Hoff2021-06-294-3/+10
| * | Merge branch 'release-v1.37' into developRichard van der Hoff2021-06-2912-6/+718
| |\|
| | * Update newsfiles v1.37.1a1Richard van der Hoff2021-06-292-1/+1
| | * v1.37.1a1Richard van der Hoff2021-06-291-1/+1
| | * Merge remote-tracking branch 'origin/erikj/async_federation_base_branch' into...Richard van der Hoff2021-06-2911-5/+717
| | |\
| | | * Handle inbound events from federation asynchronously (#10272)Erik Johnston2021-06-295-5/+241
| | | * Add a distributed lock (#10269)Erik Johnston2021-06-296-0/+476
| * | | Do not recurse into non-spaces in the spaces summary. (#10256)Patrick Cloke2021-06-295-26/+43
| * | | Fix `populate_stream_ordering2` background job (#10267)Richard van der Hoff2021-06-292-16/+13
| * | | Migrate stream_ordering to a bigint (#10264)Richard van der Hoff2021-06-294-16/+163
| * | | Soft-fail spammy events received over federation (#10263)Richard van der Hoff2021-06-292-6/+7
| * | | Merge branch 'master' into developBrendan Abolivier2021-06-293-3/+11
| |\| |
| | * | Move deprecation notices to the top of the changelog v1.37.0Brendan Abolivier2021-06-291-6/+2
| | * | 1.37.0Brendan Abolivier2021-06-293-1/+13
| | |/
| * | Add additional types to the federation transport server. (#10213)Patrick Cloke2021-06-283-118/+521
| * | Adjust the URL in the README.rst file to point to LiberaChat instead of freen...Felix Kronlage-Dammers2021-06-282-1/+2