Merge remote-tracking branch 'origin/develop' into staging

.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
 

.github/CODEOWNERS

@@ -1,17 +1,18 @@
-*                         @matrix-org/element-web-reviewers
-/.github/workflows/**     @matrix-org/element-web-team
-/package.json             @matrix-org/element-web-team
-/yarn.lock                @matrix-org/element-web-team
+*                         @element-hq/element-web-reviewers
+/.github/workflows/**     @element-hq/element-web-team
+/package.json             @element-hq/element-web-team
+/yarn.lock                @element-hq/element-web-team
 
-/src/SecurityManager.ts                           @matrix-org/element-crypto-web-reviewers
-/test/SecurityManager-test.ts                     @matrix-org/element-crypto-web-reviewers
-/src/async-components/views/dialogs/security/     @matrix-org/element-crypto-web-reviewers
-/src/components/views/dialogs/security/           @matrix-org/element-crypto-web-reviewers
-/test/components/views/dialogs/security/          @matrix-org/element-crypto-web-reviewers
-/src/stores/SetupEncryptionStore.ts               @matrix-org/element-crypto-web-reviewers
-/test/stores/SetupEncryptionStore-test.ts         @matrix-org/element-crypto-web-reviewers
+/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/PULL_REQUEST_TEMPLATE.md

@@ -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/matrix-org/matrix-react-sdk/blob/develop/CONTRIBUTING.md)).
+-   [ ] I have licensed the changes to Element by completing the [Contributor License Agreement (CLA)](https://cla-assistant.io/element-hq/matrix-react-sdk)

.github/labels.yml

@@ -0,0 +1,28 @@
+- name: "A-Timesheet-1"
+  description: "Log any time spent on this into the A-Timesheet-1 project"
+  color: "#5319E7"
+- name: "backport staging"
+  description: "Label to automatically backport PR to staging branch"
+  color: "#B60205"
+- name: "Dependencies"
+  description: "Pull requests that update a dependency file"
+  color: "#0366d6"
+- name: "Sponsored"
+  color: "#b506d8"
+- name: "T-Deprecation"
+  description: "A pull request that makes something deprecated"
+  color: "#98e6ae"
+- name: "X-Blocked"
+  description: "The PR cannot move forward in any capacity until an action is made"
+  color: "ff7979"
+- name: "X-Breaking-Change"
+  color: "#ff7979"
+- name: "X-Upcoming-Release-Blocker"
+  description: "This does not affect the current release cycle but will affect the next one"
+  color: "#e99695"
+- name: "Z-Community-PR"
+  description: "Issue is solved by a community member's PR"
+  color: "#ededed"
+- name: "Z-Experiment"
+  description: "Experimental PR, primarily up for its Netlify build, high likelihood of never making it beyond here."
+  color: "#b60205"

.github/workflows/playwright-image-updates.yaml

@@ -20,7 +20,7 @@ jobs:
 
             - name: Create Pull Request
               id: cpr
-              uses: peter-evans/create-pull-request@c5a7806660adbe173f04e3e038b0ccdcd758773c # v6
+              uses: peter-evans/create-pull-request@4320041ed380b20e97d388d56a7fb4f9b8c20e79 # v7
               with:
                   token: ${{ secrets.ELEMENT_BOT_TOKEN }}
                   branch: actions/playwright-image-updates

.github/workflows/sync-labels.yml

@@ -0,0 +1,21 @@
+name: Sync labels
+on:
+    workflow_dispatch: {}
+    schedule:
+        - cron: "0 1 * * *" # 1am every day
+    push:
+        branches:
+            - develop
+        paths:
+            - .github/labels.yml
+jobs:
+    sync-labels:
+        uses: element-hq/element-meta/.github/workflows/sync-labels.yml@develop
+        with:
+            LABELS: |
+                element-hq/element-meta
+                .github/labels.yml
+            DELETE: true
+            WET: true
+        secrets:
+            ELEMENT_BOT_TOKEN: ${{ secrets.ELEMENT_BOT_TOKEN }}

CONTRIBUTING.md

@@ -1,3 +1,5 @@
 # Contributing code to matrix-react-sdk
 
-matrix-react-sdk follows the same pattern as https://github.com/vector-im/element-web/blob/develop/CONTRIBUTING.md
+Everyone is welcome to contribute code to matrix-react-sdk, provided that they are willing to license their contributions to Element under a [Contributor License Agreement](https://cla-assistant.io/element-hq/matrix-react-sdk) (CLA). This ensures that their contribution will be made available under an OSI-approved open-source license, currently licensed under Affero General Public License v3 (AGPLv3) or General Public License v3 (GPLv3) at your choice.
+
+matrix-react-sdk follows the same pattern as element-web, please find more contributing guidelines at https://github.com/vector-im/element-web/blob/develop/CONTRIBUTING.md