summary refs log tree commit diff
Commit message (Expand)AuthorAgeFilesLines
...
* Fix AuthBlocking check when requester is appservice (#10881)Jason Robinson2021-09-243-1/+64
* Improve typing in user_directory files (#10891)David Robertson2021-09-244-37/+95
* In `_purge_history_txn`, ensure that txn.fetchall has elements before accessi...Kokokokoka2021-09-242-9/+14
* Allow `.` and `~` chars in registration tokens (#10887)Callum Brown2021-09-233-4/+7
* Factor out `_get_remote_auth_chain_for_event` from `_update_auth_events_and_c...Richard van der Hoff2021-09-232-52/+73
* Use direct references for configuration variables (part 4). (#10893)Patrick Cloke2021-09-2332-64/+77
* Break down cache expiry reasons in grafana (#10880)David Robertson2021-09-232-2/+3
* Fix reactivated users not being added to the user directory (#10782)David Robertson2021-09-233-4/+48
* Use direct references for some configuration variables (part 3) (#10885)Patrick Cloke2021-09-2332-119/+137
* Remove unnecessary parentheses around tuples returned from methods (#10889)Andrew Morgan2021-09-2322-32/+33
* Factor out a separate `EventContext.for_outlier` (#10883)Richard van der Hoff2021-09-225-44/+21
* Treat "\u0000" as "\u0020" for the purposes of message search (message indexi...Hillery Shay2021-09-223-9/+100
* Fix invalidating OTK count cache after claim (#10875)Tulir Asokan2021-09-222-0/+5
* Ensure we mark sent knocks as outliers (#10873)Richard van der Hoff2021-09-222-0/+8
* Include more information in oEmbed previews. (#10819)Patrick Cloke2021-09-224-14/+68
* Fix /initialSync error due to unhashable `RoomStreamToken` (#10827)Sean Quah2021-09-223-6/+19
* Add documentation for experimental feature flags. (#10865)Patrick Cloke2021-09-223-0/+39
* Opt out of cache expiry for `get_users_who_share_room_with_user` (#10826)David Robertson2021-09-225-6/+30
* Extend ModuleApi with the methods we'll need to reject spam based on …IP - ...David Teller2021-09-224-8/+174
* Include outlier status in `str(event)` for V2/V3 events (#10879)Richard van der Hoff2021-09-222-22/+13
* Track why we're evicting from caches (#10829)David Robertson2021-09-224-15/+31
* Rename MSC2716 things from `chunk` to `batch` to match `/batch_send` endpoint...Eric Eastwood2021-09-2113-117/+162
* Add type hints for event streams. (#10856)Patrick Cloke2021-09-2118-60/+169
* Add types to http.site (#10867)Erik Johnston2021-09-212-18/+23
* Clear our destination directories before copying files to GitHub pages. (#10869)Patrick Cloke2021-09-212-1/+1
* Refactor oEmbed previews (#10814)Patrick Cloke2021-09-215-220/+299
* Test that state events sent by modules correctly end up in the room's state (...Brendan Abolivier2021-09-212-0/+85
* Allow Synapse Admin API's Room Search to accept non-ASCII characters (#10859)Hillery Shay2021-09-213-1/+29
* Rename `/batch_send` query parameter from `?prev_event` to more obvious usage...Eric Eastwood2021-09-212-7/+10
* Merge tag 'v1.43.0' into developDavid Robertson2021-09-213-3/+16
|\
| * Fix typo again v1.43.0David Robertson2021-09-211-1/+1
| * Specify MSC name; fix typoDavid Robertson2021-09-211-3/+3
| * Point to upgrade notesDavid Robertson2021-09-211-0/+2
| * Move deprecation notice from 1.43 rc to releaseDavid Robertson2021-09-211-3/+2
| * 1.43.0David Robertson2021-09-213-1/+13
* | Always add local users to the user directory (#10796)David Robertson2021-09-219-55/+54
* | Allow sending a membership event to unban a user (#10807)Aaron Raimist2021-09-214-2/+99
* | GHA: reintroduce an env var for `$GITHUB_HEAD_REF` (#10659)David Robertson2021-09-202-0/+2
* | Require type hints in the handlers module. (#10831)Patrick Cloke2021-09-2035-295/+194
* | Fix remove_stale_pushers job on SQLite. (#10843)reivilibre2021-09-209-23/+27
* | Fix #10837 by adding JSON encoding/decoding to the Module API example… (#10...Charles Wright2021-09-172-2/+3
* | Merge branch 'release-v1.43' into developDavid Robertson2021-09-174-127/+157
|\|
| * Add hyperlink to #9424 in changelog v1.43.0rc2David Robertson2021-09-171-1/+1
| * 1.43.0rc2David Robertson2021-09-174-2/+16
| * Cleanup opentracing logging for syncs (#10828)Erik Johnston2021-09-152-126/+142
* | Create a constant for a small png image in tests. (#10834)Patrick Cloke2021-09-168-94/+45
* | Add type hints to state database module. (#10823)Patrick Cloke2021-09-156-72/+133
* | Add missing type hints to non-client REST servlets. (#10817)Patrick Cloke2021-09-1527-96/+169
* | Use direct references for some configuration variables (part 2) (#10812)Patrick Cloke2021-09-1516-45/+51
* | Verify `?chunk_id` actually corresponds to an insertion event that exists (MS...Eric Eastwood2021-09-154-1/+51
* | Split out `/batch_send` meta events to their own fields (MSC2716) (#10777)Eric Eastwood2021-09-152-11/+19
* | Make StateFilter frozen so we can hash it (#10816)reivilibre2021-09-144-30/+63
* | Prevent logging context going missing on federation request timeout (#10810)Sean Quah2021-09-142-4/+14
* | Merge tag 'v1.43.0rc1' into developAndrew Morgan2021-09-1454-52/+76
|\|
| * update changelog wording v1.43.0rc1Andrew Morgan2021-09-141-7/+7
| * changelog improvementsAndrew Morgan2021-09-141-3/+3
| * update changelog wordingAndrew Morgan2021-09-141-1/+1
| * update wordingAndrew Morgan2021-09-141-1/+1
| * 1.43.0rc1Andrew Morgan2021-09-1454-52/+76
* | Convert media repo's FileInfo to attrs. (#10785)Patrick Cloke2021-09-145-108/+140
* | Name the type of token in "Invalid token" messages (#10815)David Robertson2021-09-144-6/+7
|/
* Use direct references for some configuration variables (#10798)Patrick Cloke2021-09-1366-133/+152
* Fix copy-paste error in the password section of the sample-config. (#10804)BramvdnHeuvel2021-09-133-2/+3
* Use the BaseReporter super-class for _WrappedRustReporter. (#10799)Patrick Cloke2021-09-132-1/+12
* Add types to synapse.util. (#10601)reivilibre2021-09-1041-254/+401
* Fix 2 typos in docs/log_contexts.md (#10795)reivilibre2021-09-102-2/+3
* Handle room upgrades for spaces (#10774)Patrick Cloke2021-09-103-6/+81
* Easy refactors of the user directory (#10789)David Robertson2021-09-108-37/+90
* Remove fixed and flakey tests from the sytest blacklist (#10788)David Robertson2021-09-103-18/+2
* Ask consent on SSO registration with default mxid (#10733)AndrewFerr2021-09-103-23/+63
* Don't needlessly batch in `add_event_to_cache` (#10784)Erik Johnston2021-09-102-27/+25
* Remove unstable MSC2858 API, including `experimental.msc2858_enabled` config ...Sean2021-09-099-127/+19
* Prefer room v9 for restricted rooms. (#10772)Patrick Cloke2021-09-092-1/+2
* Get rid of `_auth_and_persist_event` (#10781)Richard van der Hoff2021-09-083-63/+43
* Improve the modules doc (#10758)Brendan Abolivier2021-09-0810-404/+537
* Fix frontend_proxy jinja script in docker workers (#10783)kegsay2021-09-082-1/+2
* Add a script to update the debian changelog for non-Debian systems (#10778)Brendan Abolivier2021-09-082-0/+65
* Document that /spaces & /hierarchy can be routed to workers. (#10648)Patrick Cloke2021-09-084-25/+33
* Skip handling of push actions for outlier events (#10780)Erik Johnston2021-09-083-4/+19
* Add a constant for m.federate. (#10775)Patrick Cloke2021-09-088-10/+28
* Change logging of puppeted requests to better differentiate users (#10779)Erik Johnston2021-09-082-1/+2
* Request JSON for oEmbed requests (and ignore XML only providers). (#10759)Patrick Cloke2021-09-084-8/+98
* Add some assertions about outliers (#10773)Richard van der Hoff2021-09-082-71/+78
* Persist auth events before the events that rely on them (#10771)Richard van der Hoff2021-09-082-36/+66
* Merge branch 'master' into developAzrenbeth2021-09-073-6/+15
|\
| * Add "No significant changes" to changelog v1.42.0Azrenbeth2021-09-071-0/+2
| * Move upgrade notice up in changelogAzrenbeth2021-09-071-6/+1
| * 1.42.0Azrenbeth2021-09-073-1/+13
* | Use attrs internally for the URL preview code & add documentation. (#10753)Patrick Cloke2021-09-075-119/+132
* | 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