Merge branch 'develop' into staging

# Conflicts:
#	package.json
#	yarn.lock

Author: t3chguy

.dockerignore

@@ -7,3 +7,6 @@ karma-reports/
 .idea/
 .tmp/
 config.json*
+# Exclude the playwright directory as much as we can as the snapshots are huge and we bind mount it in
+playwright/
+!playwright/docker-entrypoint.sh

.editorconfig

@@ -1,16 +1,8 @@
+#   Copyright 2024 New Vector Ltd.
 #   Copyright 2017 Aviral Dasgupta
 #
-#   Licensed under the Apache License, Version 2.0 (the "License");
-#   you may not use this file except in compliance with the License.
-#   You may obtain a copy of the License at
-#
-#       http://www.apache.org/licenses/LICENSE-2.0
-#
-#   Unless required by applicable law or agreed to in writing, software
-#   distributed under the License is distributed on an "AS IS" BASIS,
-#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#   See the License for the specific language governing permissions and
-#   limitations under the License.
+#   SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only
+#   Please see LICENSE files in the repository root for full details.
 
 root = true
 
@@ -26,4 +18,7 @@ trim_trailing_whitespace = true
 indent_size = 4
 
 [package.json]
-indent_size = 2
+indent_size = 4
+
+[*.tsx.snap]
+trim_trailing_whitespace = false

.eslintignore

@@ -1,4 +1,8 @@
 src/vector/modernizr.js
+test/end-to-end-tests/node_modules/
+test/end-to-end-tests/element/
+test/end-to-end-tests/synapse/
+test/end-to-end-tests/lib/
 # Legacy skinning file that some people might still have
 src/component-index.js
 # Auto-generated file

.eslintrc-module_system.js

@@ -45,24 +45,12 @@ module.exports = {
                                 name: "matrix-js-sdk/src/index",
                                 message: "Please use matrix-js-sdk/src/matrix instead",
                             },
-                            {
-                                name: "matrix-react-sdk",
-                                message: "Please use matrix-react-sdk/src/index instead",
-                            },
-                            {
-                                name: "matrix-react-sdk/",
-                                message: "Please use matrix-react-sdk/src/index instead",
-                            },
                         ],
                         patterns: [
                             {
                                 group: ["matrix-js-sdk/lib", "matrix-js-sdk/lib/", "matrix-js-sdk/lib/**"],
                                 message: "Please use matrix-js-sdk/src/* instead",
                             },
-                            {
-                                group: ["matrix-react-sdk/lib", "matrix-react-sdk/lib/", "matrix-react-sdk/lib/**"],
-                                message: "Please use matrix-react-sdk/src/* instead",
-                            },
                         ],
                     },
                 ],

.eslintrc.js

@@ -1,2 +1,3 @@
 # prettier
+526645c79160ab1ad4b4c3845de27d51263a405e
 7921a6cbf86b035d2b0c1daecb4c24beaf5a5abc

.git-blame-ignore-revs

@@ -2,4 +2,17 @@
 /.github/workflows/**     @element-hq/element-web-team
 /package.json             @element-hq/element-web-team
 /yarn.lock                @element-hq/element-web-team
+
+/src/SecurityManager.ts                           @element-hq/element-crypto-web-reviewers
+/test/SecurityManager-test.ts                     @element-hq/element-crypto-web-reviewers
+/src/async-components/views/dialogs/security/     @element-hq/element-crypto-web-reviewers
+/src/components/views/dialogs/security/           @element-hq/element-crypto-web-reviewers
+/test/components/views/dialogs/security/          @element-hq/element-crypto-web-reviewers
+/src/stores/SetupEncryptionStore.ts               @element-hq/element-crypto-web-reviewers
+/test/stores/SetupEncryptionStore-test.ts         @element-hq/element-crypto-web-reviewers
+
+# Ignore translations as those will be updated by GHA for Localazy download
 /src/i18n/strings
+# Ignore the synapse plugin as this is updated by GHA for docker image updating
+/playwright/plugins/homeserver/synapse/index.ts
+

.github/CODEOWNERS

@@ -5,4 +5,4 @@
 -   [ ] Tests written for new code (and old code if feasible).
 -   [ ] New or updated `public`/`exported` symbols have accurate [TSDoc](https://tsdoc.org/) documentation.
 -   [ ] Linter and other CI checks pass.
--   [ ] Sign-off given on the changes (see [CONTRIBUTING.md](https://github.com/element-hq/element-web/blob/develop/CONTRIBUTING.md)).
+-   [ ] I have licensed the changes to Element by completing the [Contributor License Agreement (CLA)](https://cla-assistant.io/element-hq/element-web)

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,3 +1,3 @@
-_extends: element-hq/matrix-react-sdk
+_extends: matrix-org/matrix-js-sdk
 version-resolver:
     default: patch

.github/release-drafter.yml

@@ -10,7 +10,7 @@ on:
 jobs:
     backport:
         name: Backport
-        runs-on: ubuntu-latest
+        runs-on: ubuntu-24.04
         # Only react to merged PRs for security reasons.
         # See https://docs.github.com/en/actions/using-workflows/events-that-trigger-workflows#pull_request_target.
         if: >