summary refs log tree commit diff
Commit message (Expand)AuthorAgeFilesLines
* Return stripped m.space.child events via the space summary. (#10760)Patrick Cloke2021-09-072-14/+13
* Underscore-prefix private fields in `FederationEventHandler` (#10746)Richard van der Hoff2021-09-072-71/+74
* Merge tag 'v1.42.0rc2' into developBrendan Abolivier2021-09-069-4/+145
|\
| * Improve changelog wording v1.42.0rc2Brendan Abolivier2021-09-061-1/+1
| * Expand on why users should read upgrade notesBrendan Abolivier2021-09-061-1/+4
| * Move the upgrade notes reminder up to rc2Brendan Abolivier2021-09-061-3/+2
| * 1.42.0rc2Brendan Abolivier2021-09-065-3/+22
| * Add a warning when using deprecated template_dir settings (#10768)Brendan Abolivier2021-09-064-0/+42
| * Support MSC3375: room version 9. (#10747)Patrick Cloke2021-09-034-1/+79
* | Add logging to help debug #9424 (#10704)Azrenbeth2021-09-062-13/+55
* | Add config option to use non-default manhole password and keys (#10643)Azrenbeth2021-09-069-17/+161
* | Stop using BaseHandler in `FederationEventHandler` (#10745)Richard van der Hoff2021-09-063-10/+12
* | Allow `room_alias_name` parameter to be handled by /createRoom calls on worke...Andrew Morgan2021-09-062-2/+3
* | Ease searching for M_TOO_LARGE-related error codes (#10750)Andrew Morgan2021-09-062-9/+7
* | Doc: Clarifying undoing room shutdowns (#10480)David Teller2021-09-062-15/+28
* | Move `maybe_kick_guest_users` out of `BaseHandler` (#10744)Richard van der Hoff2021-09-069-85/+125
* | Pull out encrypted_by_default tests from user_directory tests (#10752)David Robertson2021-09-064-95/+111
* | Speed up persisting redacted events (#10756)Erik Johnston2021-09-062-11/+12
* | Allow room creator to send MSC2716 related events in existing room versions (...Eric Eastwood2021-09-044-10/+61
* | Speed up MultiWriterIdGenerator when lots of IDs are in flight. (#10755)Erik Johnston2021-09-034-2/+124
* | Add a partial index to `presence_stream` to speed up startups (#10748)Sean2021-09-034-1/+43
* | Use `execute_values` more in PostgreSQL (#10754)Erik Johnston2021-09-032-19/+43
* | Raise an error if an unknown preset is used to create a room. (#10738)Patrick Cloke2021-09-032-1/+7
* | Additional type hints for client REST servlets (part 5) (#10736)Patrick Cloke2021-09-038-68/+146
* | Fix bug with reusing 'txn' when persisting event. (#10743)Erik Johnston2021-09-032-1/+8
* | Fix documentation of directory name for remote thumbnails (#10556)cuttingedge11092021-09-022-1/+2
* | Ignore rooms with unknown room versions in the spaces summary. (#10727)Patrick Cloke2021-09-013-2/+40
* | Consider the `origin_server_ts` of the `m.space.child` event when ordering ro...Patrick Cloke2021-09-013-12/+22
* | Additional type hints for client REST servlets (part 4) (#10728)Patrick Cloke2021-09-019-100/+145
* | Populate `rooms.creator` field for easy lookup (#10697)Eric Eastwood2021-09-016-4/+213
* | Merge tag 'v1.42.0rc1' into developOlivier Wilkinson (reivilibre)2021-09-0152-52/+123
|\|
| * Make minor changes to changelog v1.42.0rc1Olivier Wilkinson (reivilibre)2021-09-011-2/+2
| * Improve changelogOlivier Wilkinson (reivilibre)2021-09-011-3/+3
| * Improve changelogOlivier Wilkinson (reivilibre)2021-09-011-7/+6
| * 1.42.0rc1Olivier Wilkinson (reivilibre)2021-09-0151-52/+78
| * Fix iteration in _remove_deleted_email_pushers background job. (#10734)Andrew Morgan2021-09-013-1/+47
* | Correctly include room avatars in email notifications (#10658)David Robertson2021-09-013-6/+71
* | Skip the final GC on shutdown to improve restart times (#10712)Sean2021-09-012-0/+8
* | Allow configuration of the oEmbed URLs. (#10714)Patrick Cloke2021-08-318-252/+463
* | Additional type hints for the client REST servlets (part 3). (#10707)Patrick Cloke2021-08-317-150/+306
|/
* Move the sessions delta to the latest schema version. (#10725)Patrick Cloke2021-08-312-0/+1
* Merge branch 'master' into developRichard van der Hoff2021-08-318-7/+214
|\
| * 1.41.1 v1.41.1Richard van der Hoff2021-08-313-1/+39
| * Fix up unit tests (#10723)Richard van der Hoff2021-08-312-2/+16
| * Merge pull request from GHSA-jj53-8fmw-f2w2reivilibre2021-08-312-2/+59
| * Merge pull request from GHSA-3x4c-pq33-4w3qreivilibre2021-08-312-4/+103
* | Advertise matrix-org.github.io/synapse docs (#10595)David Robertson2021-08-314-432/+459
* | Merge remote-tracking branch 'origin/release-v1.41' into developRichard van der Hoff2021-08-275-21/+173
|\|
| * Fix incompatibility with Twisted < 21. (#10713)Richard van der Hoff2021-08-275-21/+173
* | Removed page summaries from the top of installation and contributing doc pag...Azrenbeth2021-08-274-75/+21
* | Clarifications to reverse_proxy.md (#10708)Richard van der Hoff2021-08-272-5/+6
* | Remove unused `compare_digest` function. (#10706)Patrick Cloke2021-08-272-13/+1
* | Improve ServerNoticeServlet to avoid duplicate requests (#10679)Dirk Klimpel2021-08-275-17/+475
* | Fix perf of fetching the same events many times. (#10703)Erik Johnston2021-08-272-6/+24
* | Split `FederationHandler` in half (#10692)Richard van der Hoff2021-08-2611-1780/+1883
* | Make `backfill` and `get_missing_events` use the same codepath (#10645)Richard van der Hoff2021-08-263-233/+42
* | Validate new m.room.power_levels events (#10232)Aaron Raimist2021-08-265-4/+160
* | Remove pushers when deleting 3pid from account (#10581)Azrenbeth2021-08-267-1/+143
* | Additional type hints for REST servlets (part 2). (#10674)Patrick Cloke2021-08-2617-138/+216
* | Cache the result of fetching the room hierarchy over federation. (#10647)Patrick Cloke2021-08-262-40/+67
* | Make a note to leave a summary when one is bumping the schema version (#10621)Andrew Morgan2021-08-252-0/+3
* | Ensure the base Docker image is rebuilt when running complement with workers....Patrick Cloke2021-08-252-7/+8
* | Fix error when selecting between thumbnails with the same quality (#10684)Sean2021-08-253-10/+56
* | Merge branch 'master' into developErik Johnston2021-08-246-9/+29
|\|
| * Update changelog v1.41.0Erik Johnston2021-08-241-4/+9
| * 1.41.0Erik Johnston2021-08-244-2/+16
| * Set room version 8 as preferred for restricted rooms. (#10571)Patrick Cloke2021-08-204-4/+5
| * Fix typo in release notes (#10646)John-Scott Atlakson2021-08-191-1/+1
* | Persist room hierarchy pagination sessions to the database. (#10613)Patrick Cloke2021-08-247-38/+212
* | Correctly initialise the `synapse_user_logins` metric. (#10677)Richard van der Hoff2021-08-244-6/+44
* | doc: add django-oauth-toolkit to oidc doc (#10192)Hugo DELVAL2021-08-232-0/+49
* | Enforce the max length for per-room display names / avatar URLs. (#10654)Azrenbeth2021-08-232-1/+17
* | Fix the titles in the OIDC documentation (#10639)Andrew Morgan2021-08-232-6/+11
* | Avoid duplicate issues from Twisted trunk failures (#10672)Dan Callahan2021-08-232-1/+3
* | Additional type hints for the sync REST servlet. (#10666)Patrick Cloke2021-08-233-61/+93
* | Addtional type hints for the REST servlets. (#10665)Patrick Cloke2021-08-2314-107/+204
* | Do not include stack traces for known exceptions when trying multiple federat...Patrick Cloke2021-08-232-1/+7
* | Run a nightly CI build against Twisted trunk. (#10651)Richard van der Hoff2021-08-234-0/+102
* | Implement MSC3231: Token authenticated registration (#10142)Callum Brown2021-08-2121-1/+2389
* | Flatten tests/rest/client/{v1,v2_alpha} too (#10667)David Robertson2021-08-2027-18/+6
* | Simplify tests for the device admin rest API. (#10664)Dirk Klimpel2021-08-202-81/+19
* | Follow-up: format changelog, add licence (#10593)David Robertson2021-08-202-1/+15
* | Validate device_keys for C-S /keys/query requests (#10593)David Robertson2021-08-204-1/+101
* | Split `on_receive_pdu` in half (#10640)Richard van der Hoff2021-08-194-109/+142
* | Extract `_resolve_state_at_missing_prevs` (#10624)Richard van der Hoff2021-08-192-105/+125
* | Do not include rooms with an unknown room version in a sync response. (#10644)Patrick Cloke2021-08-197-11/+145
* | Support MSC3283: Expose `enable_set_displayname` in capabilities (#10452)Dirk Klimpel2021-08-194-23/+101
* | Remove not needed database updates in modify user admin API (#10627)Dirk Klimpel2021-08-195-33/+118
* | Additional type hints for the proxy agent and SRV resolver modules. (#10608)Dirk Klimpel2021-08-185-25/+41
* | Merge branch 'release-v1.41' into developErik Johnston2021-08-1884-950/+806
|\|
| * Update docs/upgrade.md with new versionErik Johnston2021-08-181-1/+1
| * Update changelog v1.41.0rc1Erik Johnston2021-08-181-4/+4
| * 1.41.0rc1Erik Johnston2021-08-1863-61/+86
| * Mount /_synapse/admin/v1/users/{userId}/media admin API on media workers only...Andrew Morgan2021-08-186-165/+173
| * fix broken link to upgrade notes (#10631)Richard van der Hoff2021-08-182-1/+2
| * Allow modules to run looping call on all instances (#10638)Erik Johnston2021-08-182-1/+9
| * Allow /createRoom to be run on workers (#10564)Andrew Morgan2021-08-174-35/+37
| * Remove the unused public_room_list_stream (#10565)Andrew Morgan2021-08-179-250/+48
| * Build debs for bookworm (#10612)Richard van der Hoff2021-08-172-1/+3
| * Centralise the custom template directory (#10596)Brendan Abolivier2021-08-1712-418/+342
| * Attempt to pull from the legacy spaces summary API over federation. (#10583)Patrick Cloke2021-08-172-9/+56
| * Make `PeriodicallyFlushingMemoryHandler` the default logging handler. (#10518)reivilibre2021-08-174-21/+61
* | Fix weakref_slot parameter for room member storage attrs. (#10642)Patrick Cloke2021-08-182-4/+5
* | Convert room member storage tuples to attrs. (#10629)Patrick Cloke2021-08-187-29/+54
* | Display an error page during failure of fallback UIA. (#10561)Callum Brown2021-08-188-28/+65
* | Refactor `on_receive_pdu` code (#10615)Richard van der Hoff2021-08-182-134/+138
* | Use auto-attribs for attrs classes for sync. (#10630)Patrick Cloke2021-08-182-78/+79
* | Remove deprecated Shutdown Room and Purge Room Admin API (#8830)Dirk Klimpel2021-08-179-384/+14
* | Port the PresenceRouter module interface to the new generic interface (#10524)Azrenbeth2021-08-179-69/+326
* | Stop setting the outlier flag for things that aren't (#10614)Richard van der Hoff2021-08-172-7/+3
|/
* Flatten the synapse.rest.client package (#10600)reivilibre2021-08-17123-188/+137
* Always list fallback key types in /sync (#10623)Andrew Morgan2021-08-172-4/+6
* Allow to edit `external_ids` by Edit User admin API (#10598)Dirk Klimpel2021-08-175-89/+340
* update links to schema doc (#10620)Richard van der Hoff2021-08-173-3/+4
* Allow using several custom template directories (#10587)Brendan Abolivier2021-08-177-27/+98
* Add an admin API to check if a username is available (#10578)Will Hunt2021-08-175-0/+136
* Manhole: wrap coroutines in `defer.ensureDeferred` automatically (#10602)reivilibre2021-08-163-1/+16
* Update CONTRIBUTING.md to fix index links and SyTest instructions (#10599)reivilibre2021-08-162-3/+5
* Validate the max_rooms_per_space parameter to ensure it is non-negative. (#10...Patrick Cloke2021-08-163-9/+39
* Experimental support for MSC3266 Room Summary API. (#10394)Michael Telatynski2021-08-1610-115/+289
* Split `synapse.federation.transport.server` into multiple files. (#10590)Patrick Cloke2021-08-167-2158/+2219
* Clean up some logging in the federation event handler (#10591)Richard van der Hoff2021-08-164-29/+28
* Support federation in the new spaces summary API (MSC2946). (#10569)Patrick Cloke2021-08-166-165/+518
* Handle string read receipt data (#10606)Šimon Brandner2021-08-163-1/+32
* Update the Synapse Grafana dashboard (#10570)Brendan Abolivier2021-08-162-66/+485
* Move /batch_send to /v2_alpha directory (MSC2716) (#10576)Eric Eastwood2021-08-134-409/+445
* Fix a harmless exception when the staged events queue is empty. (#10592)Patrick Cloke2021-08-132-5/+11
* Stop building a debian package for Groovy Gorilla (#10588)David Robertson2021-08-122-1/+1
* Merge pull request #10573 from DMRobertson/dmr/goodbye-buildkiteDavid Robertson2021-08-1215-84/+28
|\
| * Remove buildkite-era commentDavid Robertson2021-08-121-3/+0
| * portdb also uses coverage, so provide $TOP thereDavid Robertson2021-08-121-0/+2
| * Also rename in lint.shDavid Robertson2021-08-121-1/+1
| * Missed another ci->.ciDavid Robertson2021-08-111-9/+9
| * set TOP in sytest containersDavid Robertson2021-08-112-2/+3
| * Teach MANIFEST and tox about ci->.ciDavid Robertson2021-08-112-2/+2
| * Rename ci to .ciDavid Robertson2021-08-118-6/+6
| * Add changelog entry and signoffDavid Robertson2021-08-101-0/+1
| * Kill off the .buildkite dir completelyDavid Robertson2021-08-105-14/+2
| * Remove buildkite from portdb CI testsDavid Robertson2021-08-106-23/+17
| * Remove unused BUILDKITE_BRANCH env varDavid Robertson2021-08-102-2/+0
| * Move sytest worker-blacklist to ci directoryDavid Robertson2021-08-102-1/+1
| * check-newsfragment: pass pr number explicitlyDavid Robertson2021-08-104-41/+3
| * Move test_old_deps.sh to new ci dirDavid Robertson2021-08-103-2/+3
* | Update the pagination parameter name based on MSC2946 review. (#10579)Patrick Cloke2021-08-113-10/+11
* | Admin API to delete media for a specific user (#10558)Dirk Klimpel2021-08-117-128/+347
* | Allow requesting the summary of a space which is joinable. (#10580)Patrick Cloke2021-08-113-15/+45
* | Expire old spaces summary pagination sessions. (#10574)Patrick Cloke2021-08-112-1/+24
* | Clarify error message when joining a restricted room. (#10572)Patrick Cloke2021-08-112-1/+2
* | Fix type hints in space summary tests. (#10575)Patrick Cloke2021-08-114-9/+10
* | support federation queries through http connect proxy (#10475)Dirk Klimpel2021-08-119-191/+555
* | Only return state events that the AS passed in via `state_events_at_start` (M...Eric Eastwood2021-08-102-1/+4
* | Add local support for the new spaces summary endpoint (MSC2946) (#10549)Patrick Cloke2021-08-106-112/+521
* | 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
|/
* 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
* 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
* | | 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