upgrade to postcss-loader 4

These have been around forever (c1d4a0dd28) and don't seem to do much nowadays
except make modern versions of the loader unhappy.

.dockerignore

@@ -7,6 +7,3 @@ 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,8 +1,16 @@
-#   Copyright 2024 New Vector Ltd.
 #   Copyright 2017 Aviral Dasgupta
 #
-#   SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only
-#   Please see LICENSE files in the repository root for full details.
+#   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.
 
 root = true
 
@@ -18,7 +26,4 @@ trim_trailing_whitespace = true
 indent_size = 4
 
 [package.json]
-indent_size = 4
-
-[*.tsx.snap]
-trim_trailing_whitespace = false
+indent_size = 2

.env.example

@@ -0,0 +1,16 @@
+# To enable CSS hot-reload, set the following variable to 1.
+CSS_HOT_RELOAD=1
+# To use the full page error dialog, set this to 1. Please report false positives to
+# the issue tracker for handling.
+FULL_PAGE_ERRORS=0
+# To use a single theme, uncomment the line with the theme you want to hot-reload.
+MATRIX_THEMES='light'
+#MATRIX_THEMES='dark'
+#MATRIX_THEMES='legacy-light'
+#MATRIX_THEMES='legacy-dark'
+#MATRIX_THEMES='light-custom'
+#MATRIX_THEMES='dark-custom'
+# You can also enable multiple themes by using a comma-separated list.
+# When multiple themes are enabled, switching between them may require a full page reload.
+# Note that compilation times are proportional to the number of enabled themes.
+#MATRIX_THEMES='light,dark'

.eslintignore

@@ -1,10 +1,5 @@
 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
 src/modules.ts
-src/modules.js

.eslintrc-module_system.js

@@ -0,0 +1,72 @@
+module.exports = {
+    plugins: ["matrix-org"],
+    extends: ["./.eslintrc.js"],
+    parserOptions: {
+        project: ["./tsconfig.module_system.json"],
+    },
+    overrides: [
+        {
+            files: ["module_system/**/*.{ts,tsx}"],
+            extends: ["plugin:matrix-org/typescript", "plugin:matrix-org/react"],
+            // NOTE: These rules are frozen and new rules should not be added here.
+            // New changes belong in https://github.com/matrix-org/eslint-plugin-matrix-org/
+            rules: {
+                // Things we do that break the ideal style
+                "prefer-promise-reject-errors": "off",
+                "quotes": "off",
+
+                // We disable this while we're transitioning
+                "@typescript-eslint/no-explicit-any": "off",
+                // We're okay with assertion errors when we ask for them
+                "@typescript-eslint/no-non-null-assertion": "off",
+
+                // Ban matrix-js-sdk/src imports in favour of matrix-js-sdk/src/matrix imports to prevent unleashing hell.
+                "no-restricted-imports": [
+                    "error",
+                    {
+                        paths: [
+                            {
+                                name: "matrix-js-sdk",
+                                message: "Please use matrix-js-sdk/src/matrix instead",
+                            },
+                            {
+                                name: "matrix-js-sdk/",
+                                message: "Please use matrix-js-sdk/src/matrix instead",
+                            },
+                            {
+                                name: "matrix-js-sdk/src",
+                                message: "Please use matrix-js-sdk/src/matrix instead",
+                            },
+                            {
+                                name: "matrix-js-sdk/src/",
+                                message: "Please use matrix-js-sdk/src/matrix instead",
+                            },
+                            {
+                                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,6 +1,6 @@
 module.exports = {
-    plugins: ["matrix-org", "eslint-plugin-react-compiler"],
-    extends: ["plugin:matrix-org/babel", "plugin:matrix-org/react", "plugin:matrix-org/a11y"],
+    plugins: ["matrix-org"],
+    extends: ["plugin:matrix-org/babel", "plugin:matrix-org/react"],
     parserOptions: {
         project: ["./tsconfig.json"],
     },
@@ -8,286 +8,18 @@ module.exports = {
         browser: true,
         node: true,
     },
-    globals: {
-        LANGUAGES_FILE: "readonly",
-    },
     rules: {
         // Things we do that break the ideal style
-        "no-constant-condition": "off",
-        "prefer-promise-reject-errors": "off",
-        "no-async-promise-executor": "off",
-        "no-extra-boolean-cast": "off",
-
-        // Bind or arrow functions in props causes performance issues (but we
-        // currently use them in some places).
-        // It's disabled here, but we should using it sparingly.
-        "react/jsx-no-bind": "off",
-        "react/jsx-key": ["error"],
-
-        "no-restricted-properties": [
-            "error",
-            ...buildRestrictedPropertiesOptions(
-                ["window.innerHeight", "window.innerWidth", "window.visualViewport"],
-                "Use UIStore to access window dimensions instead.",
-            ),
-            ...buildRestrictedPropertiesOptions(
-                ["*.mxcUrlToHttp", "*.getHttpUriForMxc"],
-                "Use Media helper instead to centralise access for customisation.",
-            ),
-            ...buildRestrictedPropertiesOptions(["window.setImmediate"], "Use setTimeout instead."),
-        ],
-        "no-restricted-globals": [
-            "error",
-            {
-                name: "setImmediate",
-                message: "Use setTimeout instead.",
-            },
-            {
-                name: "Buffer",
-                message: "Buffer is not available in the web.",
-            },
-        ],
-
-        "import/no-duplicates": ["error"],
-        // Ban matrix-js-sdk/src imports in favour of matrix-js-sdk/src/matrix imports to prevent unleashing hell.
-        // Ban compound-design-tokens raw svg imports in favour of their React component counterparts
-        "no-restricted-imports": [
-            "error",
-            {
-                paths: [
-                    {
-                        name: "@testing-library/react",
-                        message: "Please use jest-matrix-react instead",
-                    },
-                    {
-                        name: "matrix-js-sdk",
-                        message: "Please use matrix-js-sdk/src/matrix instead",
-                    },
-                    {
-                        name: "matrix-js-sdk/",
-                        message: "Please use matrix-js-sdk/src/matrix instead",
-                    },
-                    {
-                        name: "matrix-js-sdk/src",
-                        message: "Please use matrix-js-sdk/src/matrix instead",
-                    },
-                    {
-                        name: "matrix-js-sdk/src/",
-                        message: "Please use matrix-js-sdk/src/matrix instead",
-                    },
-                    {
-                        name: "matrix-js-sdk/src/index",
-                        message: "Please use matrix-js-sdk/src/matrix instead",
-                    },
-                    {
-                        name: "emojibase-regex",
-                        message:
-                            "This regex doesn't actually test for emoji. See the docs at https://emojibase.dev/docs/regex/ and prefer our own EMOJI_REGEX from HtmlUtils.",
-                    },
-                ],
-                patterns: [
-                    {
-                        group: [
-                            "matrix-js-sdk/src/**",
-                            "!matrix-js-sdk/src/matrix",
-                            "!matrix-js-sdk/src/crypto-api",
-                            "!matrix-js-sdk/src/types",
-                            "!matrix-js-sdk/src/testing",
-                            "!matrix-js-sdk/src/utils/**",
-                            "matrix-js-sdk/src/utils/internal/**",
-                            "matrix-js-sdk/lib",
-                            "matrix-js-sdk/lib/",
-                            "matrix-js-sdk/lib/**",
-                            // XXX: Temporarily allow these as they are not available via the main export
-                            "!matrix-js-sdk/src/logger",
-                            "!matrix-js-sdk/src/errors",
-                            "!matrix-js-sdk/src/utils",
-                            "!matrix-js-sdk/src/version-support",
-                            "!matrix-js-sdk/src/randomstring",
-                            "!matrix-js-sdk/src/sliding-sync",
-                            "!matrix-js-sdk/src/browser-index",
-                            "!matrix-js-sdk/src/feature",
-                            "!matrix-js-sdk/src/NamespacedValue",
-                            "!matrix-js-sdk/src/ReEmitter",
-                            "!matrix-js-sdk/src/event-mapper",
-                            "!matrix-js-sdk/src/interactive-auth",
-                            "!matrix-js-sdk/src/secret-storage",
-                            "!matrix-js-sdk/src/room-hierarchy",
-                            "!matrix-js-sdk/src/rendezvous",
-                            "!matrix-js-sdk/src/indexeddb-worker",
-                            "!matrix-js-sdk/src/pushprocessor",
-                            "!matrix-js-sdk/src/extensible_events_v1",
-                            "!matrix-js-sdk/src/extensible_events_v1/PollStartEvent",
-                            "!matrix-js-sdk/src/extensible_events_v1/PollResponseEvent",
-                            "!matrix-js-sdk/src/extensible_events_v1/PollEndEvent",
-                            "!matrix-js-sdk/src/extensible_events_v1/InvalidEventError",
-                            "!matrix-js-sdk/src/oidc",
-                            "!matrix-js-sdk/src/oidc/discovery",
-                            "!matrix-js-sdk/src/oidc/authorize",
-                            "!matrix-js-sdk/src/oidc/validate",
-                            "!matrix-js-sdk/src/oidc/error",
-                            "!matrix-js-sdk/src/oidc/register",
-                            "!matrix-js-sdk/src/webrtc",
-                            "!matrix-js-sdk/src/webrtc/call",
-                            "!matrix-js-sdk/src/webrtc/callFeed",
-                            "!matrix-js-sdk/src/webrtc/mediaHandler",
-                            "!matrix-js-sdk/src/webrtc/callEventTypes",
-                            "!matrix-js-sdk/src/webrtc/callEventHandler",
-                            "!matrix-js-sdk/src/webrtc/groupCallEventHandler",
-                            "!matrix-js-sdk/src/models",
-                            "!matrix-js-sdk/src/models/read-receipt",
-                            "!matrix-js-sdk/src/models/relations-container",
-                            "!matrix-js-sdk/src/models/related-relations",
-                            "!matrix-js-sdk/src/matrixrtc",
-                        ],
-                        message: "Please use matrix-js-sdk/src/matrix instead",
-                    },
-                    {
-                        group: ["emojibase-regex/emoji*"],
-                        message:
-                            "This regex doesn't actually test for emoji. See the docs at https://emojibase.dev/docs/regex/ and prefer our own EMOJI_REGEX from HtmlUtils.",
-                    },
-                    {
-                        group: ["@vector-im/compound-design-tokens/icons/*"],
-                        message: "Please use @vector-im/compound-design-tokens/assets/web/icons/* instead",
-                    },
-                ],
-            },
-        ],
-
-        // There are too many a11y violations to fix at once
-        // Turn violated rules off until they are fixed
-        "jsx-a11y/aria-activedescendant-has-tabindex": "off",
-        "jsx-a11y/click-events-have-key-events": "off",
-        "jsx-a11y/interactive-supports-focus": "off",
-        "jsx-a11y/media-has-caption": "off",
-        "jsx-a11y/mouse-events-have-key-events": "off",
-        "jsx-a11y/no-autofocus": "off",
-        "jsx-a11y/no-noninteractive-element-interactions": "off",
-        "jsx-a11y/no-noninteractive-element-to-interactive-role": "off",
-        "jsx-a11y/no-noninteractive-tabindex": "off",
-        "jsx-a11y/no-static-element-interactions": "off",
-        "jsx-a11y/role-supports-aria-props": "off",
-
-        "matrix-org/require-copyright-header": "error",
-
-        "react-compiler/react-compiler": "error",
+        quotes: "off",
+    },
+    settings: {
+        react: {
+            version: "detect",
+        },
     },
     overrides: [
         {
-            files: ["src/**/*.{ts,tsx}", "test/**/*.{ts,tsx}", "playwright/**/*.ts"],
-            extends: ["plugin:matrix-org/typescript", "plugin:matrix-org/react"],
-            rules: {
-                "@typescript-eslint/explicit-function-return-type": [
-                    "error",
-                    {
-                        allowExpressions: true,
-                    },
-                ],
-
-                // Things we do that break the ideal style
-                "prefer-promise-reject-errors": "off",
-                "no-extra-boolean-cast": "off",
-
-                // Remove Babel things manually due to override limitations
-                "@babel/no-invalid-this": ["off"],
-
-                // We're okay being explicit at the moment
-                "@typescript-eslint/no-empty-interface": "off",
-                // We disable this while we're transitioning
-                "@typescript-eslint/no-explicit-any": "off",
-                // We'd rather not do this but we do
-                "@typescript-eslint/ban-ts-comment": "off",
-                // We're okay with assertion errors when we ask for them
-                "@typescript-eslint/no-non-null-assertion": "off",
-                "@typescript-eslint/no-empty-object-type": [
-                    "error",
-                    {
-                        // We do this sometimes to brand interfaces
-                        allowInterfaces: "with-single-extends",
-                    },
-                ],
-            },
-        },
-        // temporary override for offending icon require files
-        {
-            files: [
-                "src/SdkConfig.ts",
-                "src/components/structures/FileDropTarget.tsx",
-                "src/components/structures/RoomStatusBar.tsx",
-                "src/components/structures/UserMenu.tsx",
-                "src/components/views/avatars/WidgetAvatar.tsx",
-                "src/components/views/dialogs/AddExistingToSpaceDialog.tsx",
-                "src/components/views/dialogs/ForwardDialog.tsx",
-                "src/components/views/dialogs/InviteDialog.tsx",
-                "src/components/views/dialogs/ModalWidgetDialog.tsx",
-                "src/components/views/dialogs/UploadConfirmDialog.tsx",
-                "src/components/views/dialogs/security/SetupEncryptionDialog.tsx",
-                "src/components/views/elements/AddressTile.tsx",
-                "src/components/views/elements/AppWarning.tsx",
-                "src/components/views/elements/SSOButtons.tsx",
-                "src/components/views/messages/MAudioBody.tsx",
-                "src/components/views/messages/MImageBody.tsx",
-                "src/components/views/messages/MFileBody.tsx",
-                "src/components/views/messages/MStickerBody.tsx",
-                "src/components/views/messages/MVideoBody.tsx",
-                "src/components/views/messages/MVoiceMessageBody.tsx",
-                "src/components/views/right_panel/EncryptionPanel.tsx",
-                "src/components/views/rooms/EntityTile.tsx",
-                "src/components/views/rooms/LinkPreviewGroup.tsx",
-                "src/components/views/rooms/MemberList.tsx",
-                "src/components/views/rooms/MessageComposer.tsx",
-                "src/components/views/rooms/ReplyPreview.tsx",
-                "src/components/views/settings/tabs/room/SecurityRoomSettingsTab.tsx",
-                "src/components/views/settings/tabs/user/GeneralUserSettingsTab.tsx",
-            ],
-            rules: {
-                "@typescript-eslint/no-var-requires": "off",
-            },
-        },
-        {
-            files: ["test/**/*.{ts,tsx}", "playwright/**/*.ts"],
-            extends: ["plugin:matrix-org/jest"],
-            rules: {
-                // We don't need super strict typing in test utilities
-                "@typescript-eslint/explicit-function-return-type": "off",
-                "@typescript-eslint/explicit-member-accessibility": "off",
-                "@typescript-eslint/no-empty-object-type": "off",
-
-                // Jest/Playwright specific
-
-                // Disabled tests are a reality for now but as soon as all of the xits are
-                // eliminated, we should enforce this.
-                "jest/no-disabled-tests": "off",
-                // Also treat "oldBackendOnly" as a test function.
-                // Used in some crypto tests.
-                "jest/no-standalone-expect": [
-                    "error",
-                    {
-                        additionalTestBlockFunctions: ["beforeAll", "beforeEach", "oldBackendOnly"],
-                    },
-                ],
-
-                // These are fine in tests
-                "no-restricted-globals": "off",
-                "react-compiler/react-compiler": "off",
-            },
-        },
-        {
-            files: ["playwright/**/*.ts"],
-            parserOptions: {
-                project: ["./playwright/tsconfig.json"],
-            },
-            rules: {
-                "react-hooks/rules-of-hooks": ["off"],
-                "@typescript-eslint/no-floating-promises": ["error"],
-            },
-        },
-        {
-            files: ["module_system/**/*.{ts,tsx}"],
-            parserOptions: {
-                project: ["./tsconfig.module_system.json"],
-            },
+            files: ["src/**/*.{ts,tsx}", "test/**/*.{ts,tsx}", "scripts/*.ts"],
             extends: ["plugin:matrix-org/typescript", "plugin:matrix-org/react"],
             // NOTE: These rules are frozen and new rules should not be added here.
             // New changes belong in https://github.com/matrix-org/eslint-plugin-matrix-org/
@@ -326,35 +58,37 @@ 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",
+                            },
                         ],
                     },
                 ],
             },
         },
-    ],
-    settings: {
-        react: {
-            version: "detect",
+        {
+            files: ["test/**/*.{ts,tsx}"],
+            rules: {
+                // We don't need super strict typing in test utilities
+                "@typescript-eslint/explicit-function-return-type": "off",
+                "@typescript-eslint/explicit-member-accessibility": "off",
+                "@typescript-eslint/ban-ts-comment": "off",
+            },
         },
-    },
+    ],
 };
-
-function buildRestrictedPropertiesOptions(properties, message) {
-    return properties.map((prop) => {
-        let [object, property] = prop.split(".");
-        if (object === "*") {
-            object = undefined;
-        }
-        return {
-            object,
-            property,
-            message,
-        };
-    });
-}

.git-blame-ignore-revs

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

.github/CODEOWNERS

@@ -2,24 +2,4 @@
 /.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
-/src/components/views/settings/tabs/user/EncryptionUserSettingsTab.tsx  @element-hq/element-crypto-web-reviewers
-/src/components/views/settings/encryption/                              @element-hq/element-crypto-web-reviewers
-/test/unit-tests/components/views/settings/encryption/                  @element-hq/element-crypto-web-reviewers
-/src/components/views/dialogs/devtools/Crypto.tsx                       @element-hq/element-crypto-web-reviewers
-/playwright/e2e/crypto/                                                 @element-hq/element-crypto-web-reviewers
-/playwright/e2e/settings/encryption-user-tab/                           @element-hq/element-crypto-web-reviewers
-
-# Ignore translations as those will be updated by GHA for Localazy download
 /src/i18n/strings
-/src/i18n/strings/en_EN.json  @element-hq/element-web-reviewers
-# Ignore the synapse plugin as this is updated by GHA for docker image updating
-/playwright/testcontainers/synapse.ts
-

.github/PULL_REQUEST_TEMPLATE.md

@@ -2,7 +2,17 @@
 
 ## Checklist
 
-- [ ] 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.
-- [ ] I have licensed the changes to Element by completing the [Contributor License Agreement (CLA)](https://cla-assistant.io/element-hq/element-web)
+-   [ ] Tests written for new code (and old code if feasible)
+-   [ ] 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))
+
+<!--
+If you would like to specify text for the changelog entry other than your PR title, add the following:
+
+Notes: Add super cool feature
+
+For PRs which *only* affect the desktop version, please use:
+
+Notes: none
+element-desktop notes: Add super cool feature
+-->

.github/actions/download-verify-element-tarball/action.yml

@@ -1,38 +0,0 @@
-name: Upload release assets
-description: Uploads assets to an existing release and optionally signs them
-inputs:
-    tag:
-        description: GitHub release tag to fetch assets from.
-        required: true
-    out-file-path:
-        description: Path to where the webapp should be extracted to.
-        required: true
-runs:
-    using: composite
-    steps:
-        - name: Download release tarball
-          uses: robinraju/release-downloader@a96f54c1b5f5e09e47d9504526e96febd949d4c2 # v1
-          with:
-              tag: ${{ inputs.tag }}
-              fileName: element-*.tar.gz*
-              out-file-path: ${{ runner.temp }}/download-verify-element-tarball
-
-        - name: Verify tarball
-          shell: bash
-          run: gpg --verify element-*.tar.gz.asc element-*.tar.gz
-          working-directory: ${{ runner.temp }}/download-verify-element-tarball
-
-        - name: Extract tarball
-          shell: bash
-          run: |
-              mkdir webapp
-              tar xvzf element-*.tar.gz -C webapp --strip-components=1
-          working-directory: ${{ runner.temp }}/download-verify-element-tarball
-
-        - name: Move webapp to out-file-path
-          shell: bash
-          run: mv ${{ runner.temp }}/download-verify-element-tarball/webapp ${{ inputs.out-file-path }}
-
-        - name: Clean up temp directory
-          shell: bash
-          run: rm -R ${{ runner.temp }}/download-verify-element-tarball

.github/cfp_headers

@@ -11,6 +11,3 @@
 
 /apple-app-site-association
   Content-Type: application/json
-
-/.well-known/assetlinks.json
-  Content-Type: application/json

.github/labels.yml

@@ -210,9 +210,6 @@
 - name: "X-Upcoming-Release-Blocker"
   description: "This does not affect the current release cycle but will affect the next one"
   color: "e99695"
-- name: "X-Run-All-Tests"
-  description: "When applied to PRs, it'll run the full gamut of end-to-end tests on the PR"
-  color: "ff7979"
 - name: "Z-Actions"
   color: "ededed"
 - name: "Z-Cache-Confusion"
@@ -229,24 +226,9 @@
 - name: "Z-Fixed by Element Call"
   description: "Issues which can be closed when we move to Element Call"
   color: "ededed"
-- name: "Z-Fixed-By-OIDC"
-  description: "Issues which can be closed when we move to OIDC"
-  color: "ededed"
 - name: "Z-Flaky-Test"
   description: "A test is raising false alarms"
   color: "ededed"
-- name: "Z-Flaky-Test-Chrome"
-  description: "Flaky playwright test in Chrome"
-  color: "ededed"
-- name: "Z-Flaky-Test-Firefox"
-  description: "Flaky playwright test in Firefox"
-  color: "ededed"
-- name: "Z-Flaky-Test-Webkit"
-  description: "Flaky playwright test in Webkit"
-  color: "ededed"
-- name: "Z-Flaky-Jest-Test"
-  description: "A Jest test is raising false alarms"
-  color: "ededed"
 - name: "Z-FOSDEM"
   description: "Issues in chat.fosdem.org"
   color: "ededed"
@@ -276,6 +258,3 @@
   color: "ededed"
 - name: "Z-t3chguy"
   color: "ededed"
-- name: "Z-Flaky-Test-Disabled"
-  description: "The flaking test has been disabled"
-  color: "ededed"

.github/release-drafter.yml

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

.github/workflows/backport.yml

@@ -7,12 +7,10 @@ on:
         branches:
             - develop
 
-permissions: {} # We use ELEMENT_BOT_TOKEN instead
-
 jobs:
     backport:
         name: Backport
-        runs-on: ubuntu-24.04
+        runs-on: ubuntu-latest
         # 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: >

.github/workflows/build.yml

@@ -3,17 +3,11 @@ on:
     pull_request: {}
     push:
         branches: [develop, master]
-    merge_group:
-        types: [checks_requested]
-concurrency:
-    group: ${{ github.workflow }}-${{ github.head_ref || github.sha }}
-    cancel-in-progress: ${{ github.event_name == 'pull_request' }}
 # develop pushes and repository_dispatch handled in build_develop.yaml
 env:
     # These must be set for fetchdep.sh to get the right branch
     REPOSITORY: ${{ github.repository }}
     PR_NUMBER: ${{ github.event.pull_request.number }}
-permissions: {} # No permissions required
 jobs:
     build:
         name: "Build on ${{ matrix.image }}"
@@ -22,22 +16,15 @@ jobs:
             fail-fast: false
             matrix:
                 image:
-                    - ubuntu-24.04
-                    - windows-2022
-                    - macos-14
+                    - ubuntu-latest
+                    - windows-latest
+                    - macos-latest
                 isDevelop:
                     - ${{ github.event_name == 'push' && github.ref_name == 'develop' }}
-                isPullRequest:
-                    - ${{ github.event_name == 'pull_request' }}
-                # Skip the ubuntu-24.04 build for the develop branch as the dedicated CD build_develop workflow handles that
-                # Skip the non-linux builds for pull requests as Windows is awfully slow, so run in merge queue only
+                # Skip the ubuntu-latest build for the develop branch as the dedicated CD build_develop workflow handles that
                 exclude:
                     - isDevelop: true
-                      image: ubuntu-24.04
-                    - isPullRequest: true
-                      image: windows-2022
-                    - isPullRequest: true
-                      image: macos-14
+                      image: ubuntu-latest
         runs-on: ${{ matrix.image }}
         defaults:
             run:
@@ -47,38 +34,13 @@ jobs:
 
             - uses: actions/setup-node@v4
               with:
-                  # Disable cache on Windows as it is slower than not caching
-                  # https://github.com/actions/setup-node/issues/975
-                  cache: ${{ runner.os != 'Windows' && 'yarn' || '' }}
-                  node-version: "lts/*"
+                  cache: "yarn"
 
             # Workaround for yarn install timeouts, especially on Windows
             - run: yarn config set network-timeout 300000
 
-            - name: Fetch layered build
-              id: layered_build
-              env:
-                  # tell layered.sh to check out the right sha of the JS-SDK & EW, if they were given one
-                  JS_SDK_GITHUB_BASE_REF: ${{ inputs.matrix-js-sdk-sha }}
-              run: |
-                  scripts/layered.sh
-                  JSSDK_SHA=$(git -C matrix-js-sdk rev-parse --short=12 HEAD)
-                  VECTOR_SHA=$(git rev-parse --short=12 HEAD)
-                  echo "VERSION=$VECTOR_SHA--js-$JSSDK_SHA" >> $GITHUB_OUTPUT
-
-            - name: Copy config
-              run: cp element.io/develop/config.json config.json
+            - name: Install Dependencies
+              run: "./scripts/layered.sh"
 
             - name: Build
-              env:
-                  CI_PACKAGE: true
-                  VERSION: "${{ steps.layered_build.outputs.VERSION }}"
-              run: |
-                  yarn build
-
-            - name: Upload Artifact
-              uses: actions/upload-artifact@v4
-              with:
-                  name: webapp-${{ matrix.image }}
-                  path: webapp
-                  retention-days: 1
+              run: "yarn build"

.github/workflows/build_debian.yaml

@@ -3,12 +3,11 @@ on:
     release:
         types: [published]
 concurrency: ${{ github.workflow }}
-permissions: {} # We use ELEMENT_BOT_TOKEN instead
 jobs:
     build:
         name: Build package
         environment: packages.element.io
-        runs-on: ubuntu-24.04
+        runs-on: ubuntu-latest
         env:
             R2_INCOMING_BUCKET: ${{ vars.R2_INCOMING_BUCKET }}
             R2_URL: ${{ vars.CF_R2_S3_API }}
@@ -62,7 +61,7 @@ jobs:
                   dpkg-gencontrol -v"$VERSION" -ldebian/tmp/DEBIAN/changelog
                   dpkg-deb -Zxz --root-owner-group --build debian/tmp element-web.deb
 
-            - uses: actions/upload-artifact@v4
+            - uses: actions/upload-artifact@v3
               with:
                   name: element-web.deb
                   path: element-web.deb

.github/workflows/build_develop.yml

@@ -9,35 +9,23 @@ on:
 concurrency:
     group: ${{ github.repository_owner }}-${{ github.workflow }}-${{ github.ref_name }}
     cancel-in-progress: true
-permissions: {}
 jobs:
     build:
         name: "Build & Deploy develop.element.io"
         # Only respect triggers from our develop branch, ignore that of forks
         if: github.repository == 'element-hq/element-web'
-        runs-on: ubuntu-24.04
+        runs-on: ubuntu-latest
         environment: develop
-        permissions:
-            checks: read
-            pages: write
-            deployments: write
         env:
             R2_BUCKET: "element-web-develop"
             R2_URL: ${{ vars.CF_R2_S3_API }}
             R2_PUBLIC_URL: "https://element-web-develop.element.io"
         steps:
-            # Workaround for https://www.cloudflarestatus.com/incidents/t5nrjmpxc1cj
-            - uses: unfor19/install-aws-cli-action@v1
-              with:
-                  version: 2.22.35
-                  verbose: false
-                  arch: amd64
             - uses: actions/checkout@v4
 
             - uses: actions/setup-node@v4
               with:
                   cache: "yarn"
-                  node-version: "lts/*"
 
             - name: Install Dependencies
               run: "./scripts/layered.sh"
@@ -59,7 +47,7 @@ jobs:
 
             - run: mv dist/element-*.tar.gz dist/develop.tar.gz
 
-            - uses: actions/upload-artifact@v4
+            - uses: actions/upload-artifact@v3
               with:
                   name: webapp
                   path: dist/develop.tar.gz
@@ -96,21 +84,14 @@ jobs:
                   AWS_ACCESS_KEY_ID: ${{ secrets.CF_R2_ACCESS_KEY_ID }}
                   AWS_SECRET_ACCESS_KEY: ${{ secrets.CF_R2_TOKEN }}
 
-            # We may be trying to deploy the same webapp bundles again, we need to ensure that the live bundles
-            # are not present in the _redirects file and instead accessed directly from Cloudflare Pages.
-            - name: Trim _redirects
-              working-directory: _deploy
-              run: |
-                  find bundles -type d -mindepth 1 -maxdepth 1 -exec sed -i "\:{}:d" _redirects \;
-
             - name: Wait for other steps to succeed
-              uses: t3chguy/wait-on-check-action@18541021811b56544d90e0f073401c2b99e249d6 # fork
+              uses: t3chguy/wait-on-check-action@05861d3a448898eb33dfce34153bd1ecb9422fb9 # fork
               with:
                   ref: ${{ github.sha }}
                   running-workflow-name: "Build & Deploy develop.element.io"
                   repo-token: ${{ secrets.GITHUB_TOKEN }}
                   wait-interval: 10
-                  check-regexp: ^((?!SonarCloud|SonarQube|issue|board|label|Release|prepare|GitHub Pages).)*$
+                  check-regexp: ^((?!SonarCloud|SonarQube|issue|board|label|Release).)*$
 
             # We keep the latest develop.tar.gz on R2 instead of relying on the github artifact uploaded earlier
             # as the expires after 24h and requires auth to download.

.github/workflows/deploy.yml

@@ -1,99 +0,0 @@
-# Manual deploy workflow for deploying to app.element.io & staging.element.io
-# Runs automatically for staging.element.io when an RC or Release is published
-# Note: Does *NOT* run automatically for app.element.io so that it gets tested on staging.element.io beforehand
-name: Deploy release
-run-name: Deploy ${{ github.ref_name }} to ${{ inputs.site || 'staging.element.io' }}
-on:
-    release:
-        types: [published]
-    workflow_dispatch:
-        inputs:
-            site:
-                description: Which site to deploy to
-                required: true
-                default: staging.element.io
-                type: choice
-                options:
-                    - staging.element.io
-                    - app.element.io
-            skip-checks:
-                description: Skip CI on the tagged commit
-                required: true
-                default: false
-                type: boolean
-concurrency: ${{ inputs.site || 'staging.element.io' }}
-permissions: {}
-jobs:
-    deploy:
-        name: "Deploy to Cloudflare Pages"
-        runs-on: ubuntu-24.04
-        environment: ${{ inputs.site || 'staging.element.io' }}
-        permissions:
-            checks: read
-            deployments: write
-        env:
-            SITE: ${{ inputs.site || 'staging.element.io' }}
-        steps:
-            - uses: actions/checkout@v4
-
-            - name: Load GPG key
-              run: |
-                  curl https://packages.element.io/element-release-key.gpg | gpg --import
-                  gpg -k "$GPG_FINGERPRINT"
-              env:
-                  GPG_FINGERPRINT: ${{ vars.GPG_FINGERPRINT }}
-
-            - name: Check current version on deployment
-              id: current_version
-              run: |
-                  version=$(curl -s https://$SITE/version)
-                  echo "version=${version#v}" >> $GITHUB_OUTPUT
-
-            # The current version bundle melding dance is skipped if the version we're deploying is the same
-            # as then we're just doing a re-deploy of the same version with potentially different configs.
-            - name: Download current version for its old bundles
-              id: current_download
-              if: steps.current_version.outputs.version != github.ref_name
-              uses: ./.github/actions/download-verify-element-tarball
-              with:
-                  tag: v${{ steps.current_version.outputs.version }}
-                  out-file-path: _current_version
-
-            - name: Download target version
-              uses: ./.github/actions/download-verify-element-tarball
-              with:
-                  tag: ${{ github.ref_name }}
-                  out-file-path: _deploy
-
-            - name: Merge current bundles into target
-              if: steps.current_download.outcome == 'success'
-              run: cp -vnpr _current_version/bundles/* _deploy/bundles/
-
-            - name: Copy config
-              run: cp element.io/app/config.json _deploy/config.json
-
-            - name: Populate 404.html
-              run: echo "404 Not Found" > _deploy/404.html
-
-            - name: Populate _headers
-              run: cp .github/cfp_headers _deploy/_headers
-
-            - name: Wait for other steps to succeed
-              uses: t3chguy/wait-on-check-action@18541021811b56544d90e0f073401c2b99e249d6 # fork
-              if: inputs.skip-checks != true
-              with:
-                  ref: ${{ github.sha }}
-                  running-workflow-name: "Deploy to Cloudflare Pages"
-                  repo-token: ${{ secrets.GITHUB_TOKEN }}
-                  wait-interval: 10
-                  check-regexp: ^((?!SonarCloud|SonarQube|issue|board|label|Release|prepare|GitHub Pages).)*$
-
-            - name: Deploy to Cloudflare Pages
-              uses: cloudflare/pages-action@f0a1cd58cd66095dee69bfa18fa5efd1dde93bca # v1
-              with:
-                  apiToken: ${{ secrets.CF_PAGES_TOKEN }}
-                  accountId: ${{ secrets.CF_PAGES_ACCOUNT_ID }}
-                  projectName: ${{ env.SITE == 'staging.element.io' && 'element-web-staging' || 'element-web' }}
-                  directory: _deploy
-                  gitHubToken: ${{ secrets.GITHUB_TOKEN }}
-                  branch: main

.github/workflows/dockerhub.yaml

@@ -1,4 +1,4 @@
-name: Docker
+name: Dockerhub
 on:
     workflow_dispatch: {}
     push:
@@ -7,60 +7,58 @@ on:
         # This job can take a while, and we have usage limits, so just publish develop only twice a day
         - cron: "0 7/12 * * *"
 concurrency: ${{ github.workflow }}-${{ github.ref_name }}
-permissions: {}
 jobs:
     buildx:
         name: Docker Buildx
-        runs-on: ubuntu-24.04
+        runs-on: ubuntu-latest
         environment: dockerhub
-        permissions:
-            id-token: write # needed for signing the images with GitHub OIDC Token
-            packages: write # needed for publishing packages to GHCR
+        strategy:
+            fail-fast: false
+            matrix:
+                include:
+                    - variant: vanilla
+                    # Variant we ship to aid ESS in providing a build on the OpenCoDE platform including specific modules
+                    - variant: opendesk
+                      flavor: suffix=-opendesk,onlatest=true
+                      prepare: mv variants/openDesk/* .
         steps:
             - uses: actions/checkout@v4
               with:
                   fetch-depth: 0 # needed for docker-package to be able to calculate the version
 
-            - name: Install Cosign
-              uses: sigstore/cosign-installer@c56c2d3e59e4281cc41dea2217323ba5694b171e # v3
+            - name: Prepare
+              if: matrix.prepare
+              run: ${{ matrix.prepare }}
 
             - name: Set up QEMU
-              uses: docker/setup-qemu-action@4574d27a4764455b42196d70a065bc6853246a25 # v3
+              uses: docker/setup-qemu-action@68827325e0b33c7199eb31dd4e31fbe9023e06e3 # v3
 
             - name: Set up Docker Buildx
-              uses: docker/setup-buildx-action@f7ce87c1d6bead3e36075b2ce75da1f6cc28aaca # v3
+              uses: docker/setup-buildx-action@f95db51fddba0c2d1ec667646a06c2ce06100226 # v3
               with:
                   install: true
 
             - name: Login to Docker Hub
-              uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 # v3
+              uses: docker/login-action@343f7c4344506bcbf9b4de18042ae17996df046d # v3
               with:
                   username: ${{ secrets.DOCKERHUB_USERNAME }}
                   password: ${{ secrets.DOCKERHUB_TOKEN }}
 
-            - name: Login to GitHub Container Registry
-              uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 # v3
-              with:
-                  registry: ghcr.io
-                  username: ${{ github.repository_owner }}
-                  password: ${{ secrets.GITHUB_TOKEN }}
-
             - name: Docker meta
               id: meta
-              uses: docker/metadata-action@369eb591f429131d6889c46b94e711f089e6ca96 # v5
+              uses: docker/metadata-action@31cebacef4805868f9ce9a0cb03ee36c32df2ac4 # v5
               with:
                   images: |
                       vectorim/element-web
-                      ghcr.io/element-hq/element-web
                   tags: |
                       type=ref,event=branch
                       type=ref,event=tag
                   flavor: |
                       latest=${{ contains(github.ref_name, '-rc.') && 'false' || 'auto' }}
+                      ${{ matrix.flavor }}
 
             - name: Build and push
-              id: build-and-push
-              uses: docker/build-push-action@ca877d9245402d1537745e0e356eab47c3520991 # v6
+              uses: docker/build-push-action@4a13e500e55cf31b7a5d59a38ab2040ab0f42f56 # v5
               with:
                   context: .
                   push: true
@@ -68,19 +66,9 @@ jobs:
                   tags: ${{ steps.meta.outputs.tags }}
                   labels: ${{ steps.meta.outputs.labels }}
 
-            - name: Sign the images with GitHub OIDC Token
-              env:
-                  DIGEST: ${{ steps.build-and-push.outputs.digest }}
-                  TAGS: ${{ steps.meta.outputs.tags }}
-              run: |
-                  images=""
-                  for tag in ${TAGS}; do
-                      images+="${tag}@${DIGEST} "
-                  done
-                  cosign sign --yes ${images}
-
             - name: Update repo description
-              uses: peter-evans/dockerhub-description@e98e4d1628a5f3be2be7c231e50981aee98723ae # v4
+              if: matrix.variant == 'vanilla'
+              uses: peter-evans/dockerhub-description@dc67fad7001ef9e8e3c124cb7a64e16d0a63d864 # v3
               continue-on-error: true
               with:
                   username: ${{ secrets.DOCKERHUB_USERNAME }}

.github/workflows/docs.yml

@@ -5,7 +5,10 @@ on:
         branches: [develop]
     workflow_dispatch: {}
 
-permissions: {}
+permissions:
+    contents: read
+    pages: write
+    id-token: write
 
 concurrency:
     group: "pages"
@@ -14,7 +17,7 @@ concurrency:
 jobs:
     build:
         name: GitHub Pages
-        runs-on: ubuntu-24.04
+        runs-on: ubuntu-latest
         steps:
             - name: Fetch element-desktop
               uses: actions/checkout@v4
@@ -27,6 +30,12 @@ jobs:
               with:
                   path: element-web
 
+            - name: Fetch matrix-react-sdk
+              uses: actions/checkout@v4
+              with:
+                  repository: matrix-org/matrix-react-sdk
+                  path: matrix-react-sdk
+
             - name: Fetch matrix-js-sdk
               uses: actions/checkout@v4
               with:
@@ -37,17 +46,16 @@ jobs:
               with:
                   cache: "yarn"
                   cache-dependency-path: element-web/yarn.lock
-                  node-version: "lts/*"
 
             - name: Generate automations docs
               working-directory: element-web
               run: |
                   yarn install --frozen-lockfile
-                  yarn ts-node ./scripts/gen-workflow-mermaid.ts ../element-desktop ../element-web ../matrix-js-sdk > docs/automations.md
+                  yarn ts-node ./scripts/gen-workflow-mermaid.ts ../element-desktop ../element-web ../matrix-react-sdk ../matrix-js-sdk > docs/automations.md
                   echo "-   [Automations](automations.md)" >> docs/SUMMARY.md
 
             - name: Setup mdBook
-              uses: peaceiris/actions-mdbook@v2
+              uses: peaceiris/actions-mdbook@v1
               with:
                   mdbook-version: "0.4.10"
 
@@ -65,6 +73,9 @@ jobs:
                   mv element-web/docs/lib docs/
                   mv element-web/docs "docs/Element Web"
 
+                  mv matrix-react-sdk/README.md matrix-react-sdk/docs/
+                  mv matrix-react-sdk/docs "docs/Matrix React SDK"
+
                   mv matrix-js-sdk/README.md matrix-js-sdk/docs/
                   mv matrix-js-sdk/docs "docs/Matrix JS SDK"
 
@@ -88,7 +99,7 @@ jobs:
               run: mdbook build
 
             - name: Upload artifact
-              uses: actions/upload-pages-artifact@v3
+              uses: actions/upload-pages-artifact@v2
               with:
                   path: ./book
 
@@ -96,12 +107,9 @@ jobs:
         environment:
             name: github-pages
             url: ${{ steps.deployment.outputs.page_url }}
-        runs-on: ubuntu-24.04
-        permissions:
-            pages: write
-            id-token: write
+        runs-on: ubuntu-latest
         needs: build
         steps:
             - name: Deploy to GitHub Pages
               id: deployment
-              uses: actions/deploy-pages@v4
+              uses: actions/deploy-pages@v3

.github/workflows/end-to-end-tests-netlify.yaml

@@ -1,46 +0,0 @@
-# Triggers after the playwright tests have finished,
-# taking the artifact and uploading it to Netlify for easier viewing
-name: Upload End to End Test report to Netlify
-on:
-    workflow_run:
-        workflows: ["End to End Tests"]
-        types:
-            - completed
-
-concurrency:
-    group: ${{ github.workflow }}-${{ github.event.workflow_run.head_branch || github.run_id }}
-    cancel-in-progress: ${{ github.event.workflow_run.event == 'pull_request' }}
-
-permissions: {}
-
-jobs:
-    report:
-        if: github.event.workflow_run.conclusion != 'cancelled'
-        name: Report results
-        runs-on: ubuntu-24.04
-        environment: Netlify
-        permissions:
-            statuses: write
-            deployments: write
-            actions: read
-        steps:
-            - name: Download HTML report
-              uses: actions/download-artifact@v4
-              with:
-                  github-token: ${{ secrets.GITHUB_TOKEN }}
-                  run-id: ${{ github.event.workflow_run.id }}
-                  name: html-report
-                  path: playwright-report
-
-            - name: 📤 Deploy to Netlify
-              uses: matrix-org/netlify-pr-preview@v3
-              with:
-                  path: playwright-report
-                  owner: ${{ github.event.workflow_run.head_repository.owner.login }}
-                  branch: ${{ github.event.workflow_run.head_branch }}
-                  revision: ${{ github.event.workflow_run.head_sha }}
-                  token: ${{ secrets.NETLIFY_AUTH_TOKEN }}
-                  site_id: ${{ vars.NETLIFY_SITE_ID }}
-                  desc: Playwright Report
-                  deployment_env: EndToEndTests
-                  prefix: "e2e-"

.github/workflows/end-to-end-tests.yaml

@@ -1,236 +0,0 @@
-# Produce a build of element-web with this version of react-sdk
-# and any matching branches of element-web and js-sdk, output it
-# as an artifact and run end-to-end tests.
-name: End to End Tests
-on:
-    # CRON to run all Projects at 6am UTC
-    schedule:
-        - cron: "0 6 * * *"
-    pull_request: {}
-    merge_group:
-        types: [checks_requested]
-    push:
-        branches: [develop, master]
-    repository_dispatch:
-        types: [element-web-notify]
-
-    # support triggering from other workflows
-    workflow_call:
-        inputs:
-            skip:
-                type: boolean
-                required: false
-                default: false
-                description: "A boolean to skip the playwright check itself while still creating the passing check. Useful when only running in Merge Queues."
-
-            matrix-js-sdk-sha:
-                type: string
-                required: false
-                description: "The Git SHA of matrix-js-sdk to build against. By default, will use a matching branch name if it exists, or develop."
-
-concurrency:
-    group: ${{ github.workflow }}-${{ github.ref }}-${{ github.event_name }}
-    cancel-in-progress: true
-
-env:
-    # fetchdep.sh needs to know our PR number
-    PR_NUMBER: ${{ github.event.pull_request.number }}
-    # Use 6 runners in the default case, but 4 when running on a schedule where we run all 5 projects (20 runners total)
-    NUM_RUNNERS: ${{ github.event_name == 'schedule' && 4 || 6 }}
-
-permissions: {} # No permissions required
-
-jobs:
-    build:
-        name: "Build Element-Web"
-        runs-on: ubuntu-24.04
-        if: inputs.skip != true
-        outputs:
-            num-runners: ${{ env.NUM_RUNNERS }}
-            runners-matrix: ${{ steps.runner-vars.outputs.matrix }}
-        steps:
-            - name: Checkout code
-              uses: actions/checkout@v4
-              with:
-                  repository: element-hq/element-web
-
-            - uses: actions/setup-node@v4
-              with:
-                  cache: "yarn"
-                  node-version: "lts/*"
-
-            - name: Fetch layered build
-              id: layered_build
-              env:
-                  # tell layered.sh to check out the right sha of the JS-SDK & EW, if they were given one
-                  JS_SDK_GITHUB_BASE_REF: ${{ inputs.matrix-js-sdk-sha }}
-              run: |
-                  scripts/layered.sh
-                  JSSDK_SHA=$(git -C matrix-js-sdk rev-parse --short=12 HEAD)
-                  VECTOR_SHA=$(git rev-parse --short=12 HEAD)
-                  echo "VERSION=$VECTOR_SHA--js-$JSSDK_SHA" >> $GITHUB_OUTPUT
-
-            - name: Copy config
-              run: cp element.io/develop/config.json config.json
-
-            - name: Build
-              env:
-                  CI_PACKAGE: true
-                  VERSION: "${{ steps.layered_build.outputs.VERSION }}"
-              run: |
-                  yarn build
-
-            - name: Upload Artifact
-              uses: actions/upload-artifact@v4
-              with:
-                  name: webapp
-                  path: webapp
-                  retention-days: 1
-
-            - name: Calculate runner variables
-              id: runner-vars
-              uses: actions/github-script@v7
-              with:
-                  script: |
-                      const numRunners = parseInt(process.env.NUM_RUNNERS, 10);
-                      const matrix = Array.from({ length: numRunners }, (_, i) => i + 1);
-                      core.setOutput("matrix", JSON.stringify(matrix));
-
-    playwright:
-        name: "Run Tests [${{ matrix.project }}] ${{ matrix.runner }}/${{ needs.build.outputs.num-runners }}"
-        needs: build
-        if: inputs.skip != true
-        runs-on: ubuntu-24.04
-        permissions:
-            actions: read
-            issues: read
-            pull-requests: read
-        strategy:
-            fail-fast: false
-            matrix:
-                # Run multiple instances in parallel to speed up the tests
-                runner: ${{ fromJSON(needs.build.outputs.runners-matrix) }}
-                project:
-                    - Chrome
-                    - Firefox
-                    - WebKit
-                    - Dendrite
-                    - Pinecone
-                runAllTests:
-                    - ${{ github.event_name == 'schedule' || contains(github.event.pull_request.labels.*.name, 'X-Run-All-Tests') }}
-                # Skip the Firefox & Safari runs unless this was a cron trigger or PR has X-Run-All-Tests label
-                exclude:
-                    - runAllTests: false
-                      project: Firefox
-                    - runAllTests: false
-                      project: WebKit
-                    - runAllTests: false
-                      project: Dendrite
-                    - runAllTests: false
-                      project: Pinecone
-        steps:
-            - uses: actions/checkout@v4
-              with:
-                  persist-credentials: false
-                  repository: element-hq/element-web
-
-            - name: 📥 Download artifact
-              uses: actions/download-artifact@v4
-              with:
-                  name: webapp
-                  path: webapp
-
-            - uses: actions/setup-node@v4
-              with:
-                  cache: "yarn"
-                  cache-dependency-path: yarn.lock
-                  node-version: "lts/*"
-
-            - name: Install dependencies
-              run: yarn install --frozen-lockfile
-
-            - name: Get installed Playwright version
-              id: playwright
-              run: echo "version=$(yarn list --pattern @playwright/test --depth=0 --json --non-interactive --no-progress | jq -r '.data.trees[].name')" >> $GITHUB_OUTPUT
-
-            - name: Cache playwright binaries
-              uses: actions/cache@v4
-              id: playwright-cache
-              with:
-                  path: |
-                      ~/.cache/ms-playwright
-                  key: ${{ runner.os }}-playwright-${{ steps.playwright.outputs.version }}
-
-            - name: Install Playwright browsers
-              if: steps.playwright-cache.outputs.cache-hit != 'true'
-              run: yarn playwright install --with-deps --no-shell
-
-            - name: Install system dependencies for WebKit
-              # Some WebKit dependencies seem to lay outside the cache and will need to be installed separately
-              if: matrix.project == 'WebKit' && steps.playwright-cache.outputs.cache-hit == 'true'
-              run: yarn playwright install-deps webkit
-
-            # We skip tests tagged with @mergequeue when running on PRs, but run them in MQ and everywhere else
-            - name: Run Playwright tests
-              run: |
-                  yarn playwright test \
-                      --shard "${{ matrix.runner }}/${{ needs.build.outputs.num-runners }}" \
-                      --project="${{ matrix.project }}" \
-                      ${{ (github.event_name == 'pull_request' && matrix.runAllTests == false ) && '--grep-invert @mergequeue' || '' }}
-
-            - name: Upload blob report to GitHub Actions Artifacts
-              if: always()
-              uses: actions/upload-artifact@v4
-              with:
-                  name: all-blob-reports-${{ matrix.project }}-${{ matrix.runner }}
-                  path: blob-report
-                  retention-days: 1
-
-    complete:
-        name: end-to-end-tests
-        needs: playwright
-        if: always()
-        runs-on: ubuntu-24.04
-        steps:
-            - uses: actions/checkout@v4
-              if: inputs.skip != true
-              with:
-                  persist-credentials: false
-                  repository: element-hq/element-web
-
-            - uses: actions/setup-node@v4
-              if: inputs.skip != true
-              with:
-                  cache: "yarn"
-                  node-version: "lts/*"
-
-            - name: Install dependencies
-              if: inputs.skip != true
-              run: yarn install --frozen-lockfile
-
-            - name: Download blob reports from GitHub Actions Artifacts
-              if: inputs.skip != true
-              uses: actions/download-artifact@v4
-              with:
-                  pattern: all-blob-reports-*
-                  path: all-blob-reports
-                  merge-multiple: true
-
-            - name: Merge into HTML Report
-              if: inputs.skip != true
-              run: yarn playwright merge-reports --reporter=html,./playwright/flaky-reporter.ts,./playwright/stale-screenshot-reporter.ts ./all-blob-reports
-              env:
-                  # Only pass creds to the flaky-reporter on main branch runs
-                  GITHUB_TOKEN: ${{ github.ref_name == 'develop' && secrets.ELEMENT_BOT_TOKEN || '' }}
-
-            # Upload the HTML report even if one of our reporters fails, this can happen when stale screenshots are detected
-            - name: Upload HTML report
-              if: always() && inputs.skip != true
-              uses: actions/upload-artifact@v4
-              with:
-                  name: html-report
-                  path: playwright-report
-                  retention-days: 14
-
-            - if: needs.playwright.result != 'skipped' && needs.playwright.result != 'success'
-              run: exit 1

.github/workflows/issue_closed.yml

@@ -4,11 +4,10 @@
 on:
     issues:
         types: [closed]
-permissions: {} # We use ELEMENT_BOT_TOKEN instead
 jobs:
     tidy:
         name: Tidy closed issues
-        runs-on: ubuntu-24.04
+        runs-on: ubuntu-latest
         steps:
             - uses: actions/github-script@v7
               id: main

.github/workflows/localazy_download.yaml

@@ -3,8 +3,6 @@ on:
     workflow_dispatch: {}
     schedule:
         - cron: "0 6 * * 1,3,5" # Every Monday, Wednesday and Friday at 6am UTC
-permissions:
-    pull-requests: write # needed to auto-approve PRs
 jobs:
     download:
         uses: matrix-org/matrix-web-i18n/.github/workflows/localazy_download.yaml@main

.github/workflows/localazy_upload.yaml

@@ -4,7 +4,6 @@ on:
         branches: [develop]
         paths:
             - "src/i18n/strings/en_EN.json"
-permissions: {} # No permissions needed
 jobs:
     upload:
         uses: matrix-org/matrix-web-i18n/.github/workflows/localazy_upload.yaml@main

.github/workflows/netlify.yaml

@@ -1,51 +0,0 @@
-# Triggers after the layered build has finished, taking the artifact
-# and uploading it to netlify
-name: Upload Preview Build to Netlify
-on:
-    workflow_run:
-        workflows: ["Build"]
-        types:
-            - completed
-jobs:
-    deploy:
-        if: github.event.workflow_run.conclusion != 'cancelled' && github.event.workflow_run.event == 'pull_request'
-        runs-on: ubuntu-24.04
-        environment: Netlify
-        permissions:
-            actions: read
-            deployments: write
-        steps:
-            - name: 📝 Create Deployment
-              uses: bobheadxi/deployments@648679e8e4915b27893bd7dbc35cb504dc915bc8 # v1
-              id: deployment
-              with:
-                  step: start
-                  token: ${{ secrets.GITHUB_TOKEN }}
-                  env: Netlify
-                  ref: ${{ github.event.workflow_run.head_sha }}
-                  desc: |
-                      Do you trust the author of this PR? Maybe this build will steal your keys or give you malware.
-                      Exercise caution. Use test accounts.
-
-            - name: 📥 Download artifact
-              uses: actions/download-artifact@v4
-              with:
-                  github-token: ${{ secrets.GITHUB_TOKEN }}
-                  run-id: ${{ github.event.workflow_run.id }}
-                  name: webapp-ubuntu-24.04
-                  path: webapp
-
-            - name: 📤 Deploy to Netlify
-              uses: matrix-org/netlify-pr-preview@v3
-              with:
-                  path: webapp
-                  owner: ${{ github.event.workflow_run.head_repository.owner.login }}
-                  branch: ${{ github.event.workflow_run.head_branch }}
-                  revision: ${{ github.event.workflow_run.head_sha }}
-                  token: ${{ secrets.NETLIFY_AUTH_TOKEN }}
-                  site_id: ${{ vars.NETLIFY_SITE_ID }}
-                  deployment_env: ${{ steps.deployment.outputs.env }}
-                  deployment_id: ${{ steps.deployment.outputs.deployment_id }}
-                  desc: |
-                      Do you trust the author of this PR? Maybe this build will steal your keys or give you malware.
-                      Exercise caution. Use test accounts.

.github/workflows/pending-reviews.yaml

@@ -1,16 +1,13 @@
 name: Pending reviews automation
 on:
-    # The bot exceeded its API rate limit. Disabling for now (adding workflow dispatch so the workflow file stays valid & we can test to see if it starts working again)
-    workflow_dispatch: {}
     # We run it on a schedule instead of on pull_request_* events to not create confusing messaging in the PR
-    #schedule:
-    #    - cron: "*/10 * * * *"
+    schedule:
+        - cron: "*/10 * * * *"
 concurrency: ${{ github.workflow }}
-permissions: {} # We use ELEMENT_BOT_TOKEN instead
 jobs:
     bot:
         name: Pending reviews bot
-        runs-on: ubuntu-24.04
+        runs-on: ubuntu-latest
         environment: Matrix
         env:
             URL: "https://github.com/pulls?q=is%3Apr+is%3Aopen+repo%3Amatrix-org%2Fmatrix-js-sdk+repo%3Amatrix-org%2Fmatrix-react-sdk+repo%3Aelement-hq%2Felement-web+repo%3Aelement-hq%2Felement-desktop+review-requested%3A%40me+sort%3Aupdated-desc+"
@@ -65,6 +62,7 @@ jobs:
                       const repos = [
                           "element-hq/element-desktop",
                           "element-hq/element-web",
+                          "matrix-org/matrix-react-sdk",
                           "matrix-org/matrix-js-sdk",
                       ];
                       const teams = [

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

@@ -1,48 +0,0 @@
-name: Update Playwright docker images
-on:
-    workflow_dispatch: {}
-    schedule:
-        - cron: "0 6 * * *" # Every day at 6am UTC
-permissions: {}
-jobs:
-    update:
-        runs-on: ubuntu-24.04
-        permissions:
-            pull-requests: write
-        steps:
-            - uses: actions/checkout@v4
-
-            - name: Update synapse image
-              run: |
-                  docker pull "$IMAGE"
-                  INSPECT=$(docker inspect --format='{{index .RepoDigests 0}}' "$IMAGE")
-                  DIGEST=${INSPECT#*@}
-                  sed -i "s/const TAG.*/const TAG = \"develop@$DIGEST\";/" playwright/testcontainers/synapse.ts
-              env:
-                  IMAGE: ghcr.io/element-hq/synapse:develop
-
-            - name: Create Pull Request
-              id: cpr
-              uses: peter-evans/create-pull-request@67ccf781d68cd99b580ae25a5c18a1cc84ffff1f # v7
-              with:
-                  token: ${{ secrets.ELEMENT_BOT_TOKEN }}
-                  branch: actions/playwright-image-updates
-                  delete-branch: true
-                  title: Playwright Docker image updates
-                  labels: |
-                      T-Task
-
-            - name: Enable automerge
-              run: gh pr merge --merge --auto "$PR_NUMBER"
-              if: steps.cpr.outputs.pull-request-operation == 'created'
-              env:
-                  GH_TOKEN: ${{ secrets.ELEMENT_BOT_TOKEN }}
-                  PR_NUMBER: ${{ steps.cpr.outputs.pull-request-number }}
-
-            - name: Enable autoapprove
-              run: |
-                  gh pr review --approve "$PR_NUMBER"
-              if: steps.cpr.outputs.pull-request-operation == 'created'
-              env:
-                  GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-                  PR_NUMBER: ${{ steps.cpr.outputs.pull-request-number }}

.github/workflows/pull_request.yaml

@@ -2,13 +2,8 @@ name: Pull Request
 on:
     pull_request_target:
         types: [opened, edited, labeled, unlabeled, synchronize]
-    merge_group:
-        types: [checks_requested]
-permissions: {}
 jobs:
     action:
         uses: matrix-org/matrix-js-sdk/.github/workflows/pull_request.yaml@develop
-        permissions:
-            pull-requests: write
         secrets:
             ELEMENT_BOT_TOKEN: ${{ secrets.ELEMENT_BOT_TOKEN }}

.github/workflows/pull_request_base_branch.yaml

@@ -1,17 +0,0 @@
-name: Pull Request Base Branch
-on:
-    pull_request:
-        types: [opened, edited, synchronize]
-permissions: {} # No permissions required
-jobs:
-    check_base_branch:
-        name: Check PR base branch
-        runs-on: ubuntu-24.04
-        steps:
-            - uses: actions/github-script@v7
-              with:
-                  script: |
-                      const baseBranch = context.payload.pull_request.base.ref;
-                      if (!['develop', 'staging'].includes(baseBranch) && !baseBranch.startsWith('feat/')) {
-                          core.setFailed(`Invalid base branch: ${baseBranch}`);
-                      }

.github/workflows/release-drafter.yml

@@ -2,11 +2,20 @@ name: Release Drafter
 on:
     push:
         branches: [staging]
-    workflow_dispatch: {}
+    workflow_dispatch:
+        inputs:
+            previous-version:
+                description: What release to use as a base for release note purposes
+                required: false
+                type: string
 concurrency: ${{ github.workflow }}
-permissions: {}
 jobs:
     draft:
-        permissions:
-            contents: write
-        uses: matrix-org/matrix-js-sdk/.github/workflows/release-drafter-workflow.yml@develop
+        runs-on: ubuntu-latest
+        steps:
+            - uses: release-drafter/release-drafter@e64b19c4c46173209ed9f2e5a2f4ca7de89a0e86 # v5
+              env:
+                  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+              with:
+                  disable-autolabeler: true
+                  previous-version: ${{ inputs.previous-version }}

.github/workflows/release-gitflow.yml

@@ -4,7 +4,6 @@ on:
     push:
         branches: [master]
 concurrency: ${{ github.repository }}-${{ github.workflow }}
-permissions: {} # We use ELEMENT_BOT_TOKEN instead
 jobs:
     merge:
         uses: matrix-org/matrix-js-sdk/.github/workflows/release-gitflow.yml@develop
@@ -12,4 +11,5 @@ jobs:
             ELEMENT_BOT_TOKEN: ${{ secrets.ELEMENT_BOT_TOKEN }}
         with:
             dependencies: |
+                matrix-react-sdk
                 matrix-js-sdk

.github/workflows/release.yml

@@ -10,60 +10,30 @@ on:
                 options:
                     - rc
                     - final
+            matrix-react-sdk:
+                description: React SDK version to use (current|X.Y.Z)
+                required: false
+                default: current
+                type: string
+            matrix-js-sdk:
+                description: JS SDK version to use (current|X.Y.Z)
+                required: false
+                default: current
+                type: string
 concurrency: ${{ github.workflow }}
-permissions: {}
 jobs:
     release:
         uses: matrix-org/matrix-js-sdk/.github/workflows/release-make.yml@develop
-        permissions:
-            contents: write
-            issues: write
-            pull-requests: read
         secrets:
             ELEMENT_BOT_TOKEN: ${{ secrets.ELEMENT_BOT_TOKEN }}
             GPG_PRIVATE_KEY: ${{ secrets.GPG_PRIVATE_KEY }}
             GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
         with:
             final: ${{ inputs.mode == 'final' }}
+            include-changes: matrix-react-sdk
             gpg-fingerprint: ${{ vars.GPG_FINGERPRINT }}
             asset-path: dist/*.tar.gz
             expected-asset-count: 3
-
-    notify-downstream:
-        name: Trigger release drafter downstream
-        needs: release
-        runs-on: ubuntu-24.04
-        steps:
-            - name: Notify element-desktop repo that element-web release has completed to re-trigger release-drafter
-              uses: benc-uk/workflow-dispatch@e2e5e9a103e331dad343f381a29e654aea3cf8fc # v1
-              with:
-                  workflow: release-drafter.yml
-                  repo: element-hq/element-desktop
-                  ref: staging
-                  # Required when using the `repo` option. Either a PAT or a token generated from the GitHub app or CLI
-                  token: "${{ secrets.ELEMENT_BOT_TOKEN }}"
-
-    check:
-        name: Post release checks
-        needs: release
-        runs-on: ubuntu-24.04
-        permissions:
-            checks: read
-        steps:
-            - name: Wait for docker build
-              uses: t3chguy/wait-on-check-action@18541021811b56544d90e0f073401c2b99e249d6 # fork
-              with:
-                  ref: master
-                  repo-token: ${{ secrets.GITHUB_TOKEN }}
-                  wait-interval: 10
-                  check-name: "Docker Buildx"
-                  allowed-conclusions: success
-
-            - name: Wait for debian package
-              uses: t3chguy/wait-on-check-action@18541021811b56544d90e0f073401c2b99e249d6 # fork
-              with:
-                  ref: master
-                  repo-token: ${{ secrets.GITHUB_TOKEN }}
-                  wait-interval: 10
-                  check-name: Build package
-                  allowed-conclusions: success
+            dependencies: |
+                matrix-react-sdk=${{ inputs.matrix-react-sdk }}
+                matrix-js-sdk=${{ inputs.matrix-js-sdk }}

.github/workflows/release_prepare.yml

@@ -12,33 +12,19 @@ on:
                 required: true
                 type: boolean
                 default: true
+            matrix-react-sdk:
+                description: Prepare matrix-react-sdk
+                required: true
+                type: boolean
+                default: true
             matrix-js-sdk:
                 description: Prepare matrix-js-sdk
                 required: true
                 type: boolean
                 default: true
-permissions: {} # Uses ELEMENT_BOT_TOKEN instead
 jobs:
-    checks:
-        name: Sanity checks
-        strategy:
-            matrix:
-                repo:
-                    - matrix-org/matrix-js-sdk
-                    - element-hq/element-web
-                    - element-hq/element-desktop
-        uses: matrix-org/matrix-js-sdk/.github/workflows/release-checks.yml@develop
-        secrets:
-            ELEMENT_BOT_TOKEN: ${{ secrets.ELEMENT_BOT_TOKEN }}
-        with:
-            repository: ${{ matrix.repo }}
-
     prepare:
-        runs-on: ubuntu-24.04
-        needs: checks
-        env:
-            # The order is specified bottom-up to avoid any races for allchange
-            REPOS: matrix-js-sdk element-web element-desktop
+        runs-on: ubuntu-latest
         steps:
             - name: Checkout Element Desktop
               uses: actions/checkout@v4
@@ -60,6 +46,16 @@ jobs:
                   fetch-depth: 0
                   fetch-tags: true
                   token: ${{ secrets.ELEMENT_BOT_TOKEN }}
+            - name: Checkout Matrix React SDK
+              uses: actions/checkout@v4
+              if: inputs.matrix-react-sdk
+              with:
+                  repository: matrix-org/matrix-react-sdk
+                  path: matrix-react-sdk
+                  ref: staging
+                  fetch-depth: 0
+                  fetch-tags: true
+                  token: ${{ secrets.ELEMENT_BOT_TOKEN }}
             - name: Checkout Matrix JS SDK
               uses: actions/checkout@v4
               if: inputs.matrix-js-sdk
@@ -71,56 +67,15 @@ jobs:
                   fetch-tags: true
                   token: ${{ secrets.ELEMENT_BOT_TOKEN }}
 
-            - name: Prepare Git
+            - name: Resolve repos
+              run: |
+                  echo "REPOS=$(ls . | tr '\n' ' ')" >> $GITHUB_ENV
+
+            - name: Merge develop
               run: |
                   git config --global user.email "releases@riot.im"
                   git config --global user.name "RiotRobot"
-
-            - name: Merge Element Desktop
-              if: inputs.element-desktop
-              run: |
-                  git -C "element-desktop" merge origin/develop
-            - name: Merge Element Web
-              if: inputs.element-web
-              run: |
-                  git -C "element-web" merge origin/develop
-            - name: Merge JS SDK
-              if: inputs.matrix-js-sdk
-              run: |
-                  git -C "matrix-js-sdk" merge origin/develop
+                  for REPO in $REPOS; do git -C "$REPO" merge origin/develop; done
 
             - name: Push staging
-              run: for REPO in $REPOS; do [ -d "$REPO" ] && git -C "$REPO" push origin staging; done
-
-            - name: Wait for matrix-js-sdk draft
-              if: inputs.matrix-js-sdk
-              uses: t3chguy/wait-on-check-action@18541021811b56544d90e0f073401c2b99e249d6 # fork
-              with:
-                  ref: staging
-                  repo: matrix-org/matrix-js-sdk
-                  repo-token: ${{ secrets.ELEMENT_BOT_TOKEN }}
-                  wait-interval: 10
-                  check-name: draft
-                  allowed-conclusions: success
-
-            - name: Wait for element-web draft
-              if: inputs.element-web
-              uses: t3chguy/wait-on-check-action@18541021811b56544d90e0f073401c2b99e249d6 # fork
-              with:
-                  ref: staging
-                  repo: element-hq/element-web
-                  repo-token: ${{ secrets.ELEMENT_BOT_TOKEN }}
-                  wait-interval: 10
-                  check-name: draft
-                  allowed-conclusions: success
-
-            - name: Wait for element-desktop draft
-              if: inputs.element-desktop
-              uses: t3chguy/wait-on-check-action@18541021811b56544d90e0f073401c2b99e249d6 # fork
-              with:
-                  ref: staging
-                  repo: element-hq/element-desktop
-                  repo-token: ${{ secrets.ELEMENT_BOT_TOKEN }}
-                  wait-interval: 10
-                  check-name: draft
-                  allowed-conclusions: success
+              run: for REPO in $REPOS; do git -C "$REPO" push origin staging; done

.github/workflows/sonarqube.yml

@@ -7,18 +7,9 @@ on:
 concurrency:
     group: ${{ github.workflow }}-${{ github.event.workflow_run.head_branch }}
     cancel-in-progress: true
-permissions: {}
 jobs:
     sonarqube:
         name: 🩻 SonarQube
-        if: github.event.workflow_run.conclusion == 'success' && github.event.workflow_run.event != 'merge_group'
         uses: matrix-org/matrix-js-sdk/.github/workflows/sonarcloud.yml@develop
-        permissions:
-            actions: read
-            statuses: write
-            id-token: write # sonar
         secrets:
             SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
-            ELEMENT_BOT_TOKEN: ${{ secrets.ELEMENT_BOT_TOKEN }}
-        with:
-            sharded: true

.github/workflows/static_analysis.yaml

@@ -3,32 +3,22 @@ on:
     pull_request: {}
     push:
         branches: [develop, master]
-    merge_group:
-        types: [checks_requested]
     repository_dispatch:
         types: [element-web-notify]
-concurrency:
-    group: ${{ github.workflow }}-${{ github.ref }}-${{ github.event_name }}
-    cancel-in-progress: true
-
 env:
     # These must be set for fetchdep.sh to get the right branch
     REPOSITORY: ${{ github.repository }}
     PR_NUMBER: ${{ github.event.pull_request.number }}
-
-permissions: {} # No permissions required
-
 jobs:
     ts_lint:
         name: "Typescript Syntax Check"
-        runs-on: ubuntu-24.04
+        runs-on: ubuntu-latest
         steps:
             - uses: actions/checkout@v4
 
             - uses: actions/setup-node@v4
               with:
                   cache: "yarn"
-                  node-version: "lts/*"
 
             - name: Install Dependencies
               run: "./scripts/layered.sh"
@@ -39,39 +29,16 @@ jobs:
     i18n_lint:
         name: "i18n Check"
         uses: matrix-org/matrix-web-i18n/.github/workflows/i18n_check.yml@main
-        permissions:
-            pull-requests: read
-        with:
-            hardcoded-words: "Element"
-            allowed-hardcoded-keys: |
-                console_dev_note
-                labs|element_call_video_rooms
-                labs|feature_disable_call_per_sender_encryption
-                voip|element_call
-                error|invalid_json
-                error|misconfigured
-                welcome_to_element
-
-    rethemendex_lint:
-        name: "Rethemendex Check"
-        runs-on: ubuntu-24.04
-        steps:
-            - uses: actions/checkout@v4
-
-            - run: ./res/css/rethemendex.sh
-
-            - run: git diff --exit-code
 
     js_lint:
         name: "ESLint"
-        runs-on: ubuntu-24.04
+        runs-on: ubuntu-latest
         steps:
             - uses: actions/checkout@v4
 
             - uses: actions/setup-node@v4
               with:
                   cache: "yarn"
-                  node-version: "lts/*"
 
             # Does not need branch matching as only analyses this layer
             - name: Install Deps
@@ -82,32 +49,30 @@ jobs:
 
     style_lint:
         name: "Style Lint"
-        runs-on: ubuntu-24.04
+        runs-on: ubuntu-latest
         steps:
             - uses: actions/checkout@v4
 
             - uses: actions/setup-node@v4
               with:
                   cache: "yarn"
-                  node-version: "lts/*"
 
-            # Does not need branch matching as only analyses this layer
-            - name: Install Deps
-              run: "yarn install"
+            # Needs branch matching as it inherits .stylelintrc.js from matrix-react-sdk
+            - name: Install Dependencies
+              run: "./scripts/layered.sh"
 
             - name: Run Linter
               run: "yarn run lint:style"
 
     workflow_lint:
         name: "Workflow Lint"
-        runs-on: ubuntu-24.04
+        runs-on: ubuntu-latest
         steps:
             - uses: actions/checkout@v4
 
             - uses: actions/setup-node@v4
               with:
                   cache: "yarn"
-                  node-version: "lts/*"
 
             # Does not need branch matching as only analyses this layer
             - name: Install Deps
@@ -118,17 +83,16 @@ jobs:
 
     analyse_dead_code:
         name: "Analyse Dead Code"
-        runs-on: ubuntu-24.04
+        runs-on: ubuntu-latest
         steps:
             - uses: actions/checkout@v4
 
             - uses: actions/setup-node@v4
               with:
                   cache: "yarn"
-                  node-version: "lts/*"
 
             - name: Install Deps
-              run: "yarn install --frozen-lockfile"
+              run: "scripts/layered.sh"
 
-            - name: Run linter
-              run: "yarn run lint:knip"
+            - name: Dead Code Analysis
+              run: "yarn run analyse:unused-exports"

.github/workflows/sync-labels.yml

@@ -8,9 +8,6 @@ on:
             - develop
         paths:
             - .github/labels.yml
-
-permissions: {} # We use ELEMENT_BOT_TOKEN instead
-
 jobs:
     sync-labels:
         uses: element-hq/element-meta/.github/workflows/sync-labels.yml@develop

.github/workflows/tests.yaml

@@ -0,0 +1,41 @@
+name: Tests
+on:
+    pull_request: {}
+    push:
+        branches: [develop, master]
+    repository_dispatch:
+        types: [element-web-notify]
+env:
+    # These must be set for fetchdep.sh to get the right branch
+    REPOSITORY: ${{ github.repository }}
+    PR_NUMBER: ${{ github.event.pull_request.number }}
+jobs:
+    jest:
+        name: Jest
+        runs-on: ubuntu-latest
+        steps:
+            - name: Checkout code
+              uses: actions/checkout@v4
+
+            - name: Yarn cache
+              uses: actions/setup-node@v4
+              with:
+                  cache: "yarn"
+
+            - name: Install Dependencies
+              run: "./scripts/layered.sh"
+
+            - name: Get number of CPU cores
+              id: cpu-cores
+              uses: SimenB/github-actions-cpu-cores@97ba232459a8e02ff6121db9362b09661c875ab8 # v2
+
+            - name: Run tests with coverage
+              run: "yarn coverage --ci --max-workers ${{ steps.cpu-cores.outputs.count }}"
+
+            - name: Upload Artifact
+              uses: actions/upload-artifact@v3
+              with:
+                  name: coverage
+                  path: |
+                      coverage
+                      !coverage/lcov-report

.github/workflows/tests.yml

@@ -1,114 +0,0 @@
-name: Tests
-on:
-    pull_request: {}
-    merge_group:
-        types: [checks_requested]
-    push:
-        branches: [develop, master]
-    repository_dispatch:
-        types: [element-web-notify]
-    workflow_call:
-        inputs:
-            disable_coverage:
-                type: boolean
-                required: false
-                description: "Specify true to skip generating and uploading coverage for tests"
-            matrix-js-sdk-sha:
-                type: string
-                required: false
-                description: "The matrix-js-sdk SHA to use"
-concurrency:
-    group: ${{ github.workflow }}-${{ github.ref }}-${{ github.event_name }}
-    cancel-in-progress: true
-
-env:
-    ENABLE_COVERAGE: ${{ github.event_name != 'merge_group' && inputs.disable_coverage != 'true' }}
-    # fetchdep.sh needs to know our PR number
-    PR_NUMBER: ${{ github.event.pull_request.number }}
-
-permissions: {}
-
-jobs:
-    jest:
-        name: Jest
-        runs-on: ubuntu-24.04
-        strategy:
-            fail-fast: false
-            matrix:
-                # Run multiple instances in parallel to speed up the tests
-                runner: [1, 2]
-        steps:
-            - name: Checkout code
-              uses: actions/checkout@v4
-              with:
-                  repository: ${{ inputs.matrix-js-sdk-sha && 'element-hq/element-web' || github.repository }}
-
-            - name: Yarn cache
-              uses: actions/setup-node@v4
-              with:
-                  node-version: "lts/*"
-                  cache: "yarn"
-
-            - name: Install Deps
-              run: "./scripts/layered.sh"
-              env:
-                  JS_SDK_GITHUB_BASE_REF: ${{ inputs.matrix-js-sdk-sha }}
-
-            - name: Jest Cache
-              uses: actions/cache@v4
-              with:
-                  path: /tmp/jest_cache
-                  key: ${{ hashFiles('**/yarn.lock') }}
-
-            - name: Get number of CPU cores
-              id: cpu-cores
-              uses: SimenB/github-actions-cpu-cores@97ba232459a8e02ff6121db9362b09661c875ab8 # v2
-
-            - name: Run tests
-              run: |
-                  yarn test \
-                      --coverage=${{ env.ENABLE_COVERAGE }} \
-                      --ci \
-                      --max-workers ${{ steps.cpu-cores.outputs.count }} \
-                      --shard ${{ matrix.runner }}/${{ strategy.job-total }} \
-                      --cacheDirectory /tmp/jest_cache
-              env:
-                  JEST_SONAR_UNIQUE_OUTPUT_NAME: true
-
-                  # tell jest to use coloured output
-                  FORCE_COLOR: true
-
-            - name: Move coverage files into place
-              if: env.ENABLE_COVERAGE == 'true'
-              run: mv coverage/lcov.info coverage/${{ steps.setupNode.outputs.node-version }}-${{ matrix.runner }}.lcov.info
-
-            - name: Upload Artifact
-              if: env.ENABLE_COVERAGE == 'true'
-              uses: actions/upload-artifact@v4
-              with:
-                  name: coverage-${{ matrix.runner }}
-                  path: |
-                      coverage
-                      !coverage/lcov-report
-
-    complete:
-        name: jest-tests
-        needs: jest
-        if: always()
-        runs-on: ubuntu-24.04
-        permissions:
-            statuses: write
-        steps:
-            - if: needs.jest.result != 'skipped' && needs.jest.result != 'success'
-              run: exit 1
-
-            - name: Skip SonarCloud in merge queue
-              if: github.event_name == 'merge_group' || inputs.disable_coverage == 'true'
-              uses: guibranco/github-status-action-v2@7ca807c2ba3401be532d29a876b93262108099fb
-              with:
-                  authToken: ${{ secrets.GITHUB_TOKEN }}
-                  state: success
-                  description: SonarCloud skipped
-                  context: SonarCloud Code Analysis
-                  sha: ${{ github.sha }}
-                  target_url: https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}

.github/workflows/triage-assigned.yml

@@ -4,11 +4,9 @@ on:
     issues:
         types: [assigned]
 
-permissions: {} # We use ELEMENT_BOT_TOKEN instead
-
 jobs:
     web-app-team:
-        runs-on: ubuntu-24.04
+        runs-on: ubuntu-latest
         if: |
             contains(github.event.issue.assignees.*.login, 't3chguy') ||
             contains(github.event.issue.assignees.*.login, 'andybalaam') ||

.github/workflows/triage-incoming.yml

@@ -4,13 +4,12 @@ on:
     issues:
         types: [opened]
 
-permissions: {} # We use ELEMENT_BOT_TOKEN instead
-
 jobs:
     automate-project-columns:
-        runs-on: ubuntu-24.04
+        runs-on: ubuntu-latest
         steps:
-            - uses: actions/add-to-project@main
+            - uses: alex-page/github-project-automation-plus@7ffb872c64bd809d23563a130a0a97d01dfa8f43
               with:
-                  project-url: https://github.com/orgs/element-hq/projects/120
-                  github-token: ${{ secrets.ELEMENT_BOT_TOKEN }}
+                  project: Issue triage
+                  column: Incoming
+                  repo-token: ${{ secrets.ELEMENT_BOT_TOKEN }}

.github/workflows/triage-labelled.yml

@@ -8,14 +8,13 @@ on:
             ELEMENT_BOT_TOKEN:
                 required: true
 
-permissions: {} # We use ELEMENT_BOT_TOKEN instead
-
 jobs:
     apply_Z-Labs_label:
         name: Add Z-Labs label for features behind labs flags
-        runs-on: ubuntu-24.04
+        runs-on: ubuntu-latest
         if: >
             contains(github.event.issue.labels.*.name, 'A-Maths') ||
+            contains(github.event.issue.labels.*.name, 'A-Message-Pinning') ||
             contains(github.event.issue.labels.*.name, 'A-Location-Sharing') ||
             contains(github.event.issue.labels.*.name, 'Z-IA') ||
             contains(github.event.issue.labels.*.name, 'A-Jump-To-Date ') ||
@@ -25,7 +24,8 @@ jobs:
             contains(github.event.issue.labels.*.name, 'A-Video-Rooms') ||
             contains(github.event.issue.labels.*.name, 'A-Message-Starring') ||
             contains(github.event.issue.labels.*.name, 'A-Rich-Text-Editor') ||
-            contains(github.event.issue.labels.*.name, 'A-Element-Call')
+            contains(github.event.issue.labels.*.name, 'A-Element-Call') ||
+            contains(github.event.issue.labels.*.name, 'A-Element-R')
         steps:
             - uses: actions/github-script@v7
               with:
@@ -39,7 +39,7 @@ jobs:
 
     apply_Help-Wanted_label:
         name: Add "Help Wanted" label to all "good first issue" and Hacktoberfest
-        runs-on: ubuntu-24.04
+        runs-on: ubuntu-latest
         if: >
             contains(github.event.issue.labels.*.name, 'good first issue') ||
             contains(github.event.issue.labels.*.name, 'Hacktoberfest')
@@ -56,53 +56,18 @@ jobs:
 
     move_needs_info_issues:
         name: X-Needs-Info issues to Need info column on triage board
-        runs-on: ubuntu-24.04
-        if: >
-            contains(github.event.issue.labels.*.name, 'X-Needs-Info')
+        runs-on: ubuntu-latest
         steps:
-            - id: add_to_project
-              uses: actions/add-to-project@v1.0.2
+            - uses: konradpabjan/move-labeled-or-milestoned-issue@190352295fe309fcb113b49193bc81d9aaa9cb01
               with:
-                  project-url: ${{ env.PROJECT_URL }}
-                  github-token: ${{ secrets.ELEMENT_BOT_TOKEN }}
-
-            - id: set_fields
-              uses: titoportas/update-project-fields@421a54430b3cdc9eefd8f14f9ce0142ab7678751 # v0.1.0
-              with:
-                  project-url: ${{ env.PROJECT_URL }}
-                  github-token: ${{ secrets.ELEMENT_BOT_TOKEN }}
-                  item-id: ${{ steps.add_to_project.outputs.itemId }} # Use the item-id output of the previous step
-                  field-keys: Status
-                  field-values: "Needs info"
-        env:
-            PROJECT_URL: https://github.com/orgs/element-hq/projects/120
-
-    move_flakey_test_issues:
-        name: Z-Flaky-Test issues to Sized for maintainer column on triage board
-        runs-on: ubuntu-24.04
-        if: >
-            contains(github.event.issue.labels.*.name, 'Z-Flaky-Test')
-        steps:
-            - id: add_to_project
-              uses: actions/add-to-project@v1.0.2
-              with:
-                  project-url: ${{ env.PROJECT_URL }}
-                  github-token: ${{ secrets.ELEMENT_BOT_TOKEN }}
-
-            - id: set_fields
-              uses: titoportas/update-project-fields@421a54430b3cdc9eefd8f14f9ce0142ab7678751 # v0.1.0
-              with:
-                  project-url: ${{ env.PROJECT_URL }}
-                  github-token: ${{ secrets.ELEMENT_BOT_TOKEN }}
-                  item-id: ${{ steps.add_to_project.outputs.itemId }} # Use the item-id output of the previous step
-                  field-keys: Status
-                  field-values: "Sized for maintainer"
-        env:
-            PROJECT_URL: https://github.com/orgs/element-hq/projects/120
+                  action-token: "${{ secrets.ELEMENT_BOT_TOKEN }}"
+                  project-url: "https://github.com/element-hq/element-web/projects/27"
+                  column-name: "Need info"
+                  label-name: "X-Needs-Info"
 
     add_priority_design_issues_to_project:
         name: P1 X-Needs-Design to Design project board
-        runs-on: ubuntu-24.04
+        runs-on: ubuntu-latest
         if: >
             contains(github.event.issue.labels.*.name, 'X-Needs-Design') &&
             (contains(github.event.issue.labels.*.name, 'S-Critical') &&
@@ -119,7 +84,7 @@ jobs:
 
     add_product_issues:
         name: X-Needs-Product to product project board
-        runs-on: ubuntu-24.04
+        runs-on: ubuntu-latest
         if: >
             contains(github.event.issue.labels.*.name, 'X-Needs-Product')
         steps:
@@ -130,7 +95,7 @@ jobs:
 
     Search_issues_to_board:
         name: Search issues to project board
-        runs-on: ubuntu-24.04
+        runs-on: ubuntu-latest
         if: >
             contains(github.event.issue.labels.*.name, 'A-New-Search-Experience')
         steps:
@@ -141,7 +106,7 @@ jobs:
 
     voip:
         name: Add labelled issues to VoIP project board
-        runs-on: ubuntu-24.04
+        runs-on: ubuntu-latest
         if: >
             contains(github.event.issue.labels.*.name, 'Team: VoIP')
         steps:
@@ -152,7 +117,7 @@ jobs:
 
     verticals_feature:
         name: Add labelled issues to Verticals Feature project
-        runs-on: ubuntu-24.04
+        runs-on: ubuntu-latest
         if: >
             contains(github.event.issue.labels.*.name, 'Team: Verticals Feature')
         steps:
@@ -163,7 +128,7 @@ jobs:
 
     tech_debt:
         name: Add labelled issues to tech debt project
-        runs-on: ubuntu-24.04
+        runs-on: ubuntu-latest
         if: >
             contains(github.event.issue.labels.*.name, 'A-Developer-Experience') ||
             contains(github.event.issue.labels.*.name, 'A-Documentation') ||
@@ -176,3 +141,26 @@ jobs:
               with:
                   project-url: https://github.com/orgs/element-hq/projects/101
                   github-token: ${{ secrets.ELEMENT_BOT_TOKEN }}
+
+    element_r:
+        name: Add Element R issues to Crypto Team board
+        runs-on: ubuntu-latest
+        if: >
+            contains(github.event.issue.labels.*.name, 'A-Element-R')
+        steps:
+            - id: add_to_project
+              uses: actions/add-to-project@v0.5.0
+              with:
+                  project-url: ${{ env.PROJECT_URL }}
+                  github-token: ${{ secrets.ELEMENT_BOT_TOKEN }}
+
+            - id: set_fields
+              uses: titoportas/update-project-fields@421a54430b3cdc9eefd8f14f9ce0142ab7678751 # v0.1.0
+              with:
+                  project-url: ${{ env.PROJECT_URL }}
+                  github-token: ${{ secrets.ELEMENT_BOT_TOKEN }}
+                  item-id: ${{ steps.add_to_project.outputs.itemId }} # Use the item-id output of the previous step
+                  field-keys: Workstream,module
+                  field-values: Element-R,web
+        env:
+            PROJECT_URL: https://github.com/orgs/element-hq/projects/76

.github/workflows/triage-move-review-requests.yml

@@ -3,11 +3,10 @@ on:
     pull_request_target:
         types: [review_requested]
 
-permissions: {} # Uses ELEMENT_BOT_TOKEN instead
 jobs:
     add_design_pr_to_project:
         name: Move PRs asking for design review to the design board
-        runs-on: ubuntu-24.04
+        runs-on: ubuntu-latest
         steps:
             - uses: octokit/graphql-action@v2.x
               id: find_team_members
@@ -74,7 +73,7 @@ jobs:
 
     add_product_pr_to_project:
         name: Move PRs asking for design review to the design board
-        runs-on: ubuntu-24.04
+        runs-on: ubuntu-latest
         steps:
             - uses: octokit/graphql-action@v2.x
               id: find_team_members

.github/workflows/triage-stale.yml

@@ -1,27 +0,0 @@
-name: Close stale issues & PRs
-on:
-    workflow_dispatch: {}
-    schedule:
-        - cron: "30 1 * * *"
-permissions: {}
-jobs:
-    close:
-        runs-on: ubuntu-24.04
-        permissions:
-            actions: write
-            issues: write
-            pull-requests: write
-        steps:
-            - uses: actions/stale@v9
-              with:
-                  operations-per-run: 100
-                  # Flaky test issue closing
-                  only-issue-labels: "Z-Flaky-Test"
-                  days-before-issue-stale: 14
-                  days-before-issue-close: 0
-                  close-issue-message: "This flaky test issue has not been updated in 14 days. It is being closed as presumed resolved."
-                  exempt-issue-labels: "Z-Flaky-Test-Disabled"
-                  # Stale PR closing
-                  days-before-pr-stale: 180
-                  days-before-pr-close: 0
-                  close-pr-message: "This PR has been automatically closed because it has been stale for 180 days. If you wish to continue working on this PR, please ping a maintainer to reopen it."

.github/workflows/triage-unlabelled.yml

@@ -3,13 +3,11 @@ name: Move unlabelled from needs info columns to triaged
 on:
     issues:
         types: [unlabeled]
-permissions: {}
+
 jobs:
     Move_Unabeled_Issue_On_Project_Board:
         name: Move no longer X-Needs-Info issues to Triaged
-        runs-on: ubuntu-24.04
-        permissions:
-            repository-projects: read
+        runs-on: ubuntu-latest
         if: >
             ${{
             !contains(github.event.issue.labels.*.name, 'X-Needs-Info') }}
@@ -37,7 +35,7 @@ jobs:
                     fi
                   fi
             - name: Move issue
-              uses: alex-page/github-project-automation-plus@303f24a24c67ce7adf565a07e96720faf126fe36
+              uses: alex-page/github-project-automation-plus@7ffb872c64bd809d23563a130a0a97d01dfa8f43
               if: ${{ env.ALREADY_IN_BOARD == 'true' && env.SKIP_ACTION != 'true' }}
               with:
                   project: Issue triage
@@ -46,7 +44,7 @@ jobs:
 
     remove_Z-Labs_label:
         name: Remove Z-Labs label when features behind labs flags are removed
-        runs-on: ubuntu-24.04
+        runs-on: ubuntu-latest
         if: >
             !(contains(github.event.issue.labels.*.name, 'A-Maths') ||
             contains(github.event.issue.labels.*.name, 'A-Message-Pinning') ||

.github/workflows/update-jitsi.yml

@@ -4,17 +4,15 @@ on:
     workflow_dispatch: {}
     schedule:
         - cron: "0 3 * * 0" # 3am every Sunday
-permissions: {} # We use ELEMENT_BOT_TOKEN instead
 jobs:
     update:
-        runs-on: ubuntu-24.04
+        runs-on: ubuntu-latest
         steps:
             - uses: actions/checkout@v4
 
             - uses: actions/setup-node@v4
               with:
                   cache: "yarn"
-                  node-version: "lts/*"
 
             - name: Install Deps
               run: "yarn install --frozen-lockfile"
@@ -23,7 +21,7 @@ jobs:
               run: "yarn update:jitsi"
 
             - name: Create Pull Request
-              uses: peter-evans/create-pull-request@67ccf781d68cd99b580ae25a5c18a1cc84ffff1f # v7
+              uses: peter-evans/create-pull-request@153407881ec5c347639a548ade7d8ad1d6740e38 # v5
               with:
                   token: ${{ secrets.ELEMENT_BOT_TOKEN }}
                   branch: actions/jitsi-update

.github/workflows/update-topics.yaml

@@ -15,11 +15,10 @@ on:
                 required: true
                 type: string
 concurrency: ${{ github.workflow }}
-permissions: {} # No permissions required
 jobs:
     bot:
         name: Release topic update
-        runs-on: ubuntu-24.04
+        runs-on: ubuntu-latest
         environment: Matrix
         steps:
             - uses: actions/github-script@v7
@@ -57,7 +56,7 @@ jobs:
                               headers,
                               body: "{}",
                           });
-
+                          
                           let res = await fetch(apiUrl, {
                               method: "GET",
                               headers,
@@ -70,7 +69,7 @@ jobs:
 
                           const data = await res.json();
                           console.log(roomId, "got event", data);
-
+                          
                           const topic = data.topic.replace(regex, releaseTopic);
                           if (topic === data.topic) {
                               console.log(roomId, "nothing to do");
@@ -90,7 +89,7 @@ jobs:
                               }),
                               headers,
                           });
-
+                          
                           if (res.ok) {
                               console.log(roomId, "topic updated:", topic);
                           } else {

.gitignore

@@ -26,9 +26,6 @@ electron/pub
 /coverage
 # Auto-generated file
 /src/modules.ts
-/src/modules.js
 /build_config.yaml
 /book
 /index.html
-# version file and tarball created by `npm pack` / `yarn pack`
-/git-revision.txt

.husky/pre-commit

@@ -1,4 +0,0 @@
-#!/usr/bin/env sh
-. "$(dirname "$0")/_/husky.sh"
-
-npx lint-staged --concurrent false

.lintstagedrc

@@ -1,7 +0,0 @@
-{
-    "*": "prettier --write",
-    "src/**/*.(ts|tsx)": ["eslint --fix"],
-    "scripts/**/*.(ts|tsx)": ["eslint --fix"],
-    "module_system/**/*.(ts|tsx)": ["eslint --fix"],
-    "*.pcss": ["stylelint --fix"]
-}

.modernizr.json

@@ -1,5 +1,5 @@
 {
-    "minify": false,
+    "minify": true,
     "enableClasses": false,
     "feature-detects": [
         "test/css/animations",
@@ -31,7 +31,6 @@
         "test/json",
         "test/network/fetch",
         "test/storage/localstorage",
-        "test/window/resizeobserver",
-        "test/audio/webaudio"
+        "test/window/resizeobserver"
     ]
 }

.node-version

@@ -1 +0,0 @@
-22

.prettierignore

@@ -17,7 +17,6 @@ electron/pub
 /coverage
 # Auto-generated file
 /src/modules.ts
-/src/modules.js
 /src/i18n/strings
 /build_config.yaml
 # Raises an error because it contains a template var breaking the script tag
@@ -26,22 +25,9 @@ src/vector/modernizr.js
 /docs/lib
 /book
 /debian/tmp
-/.npmrc
-package-lock.json
 
 # This file is owned, parsed, and generated by allchange, which doesn't comply with prettier
 /CHANGELOG.md
-/docs/changelogs
-
-# Legacy skinning file that some people might still have
-/src/component-index.js
 
 # Downloaded and already minified
 res/jitsi_external_api.min.js
-
-# This file is also machine-generated
-/playwright/e2e/crypto/test_indexeddb_cryptostore_dump/dump.json
-/playwright/test-results/
-/playwright/html-report/
-/playwright/logs/
-/playwright/snapshots/

.prettierrc.cjs

@@ -1 +0,0 @@
-module.exports = require("eslint-plugin-matrix-org/.prettierrc.js");

.stylelintrc.js

@@ -1,74 +1,4 @@
 module.exports = {
+    ...require("matrix-react-sdk/.stylelintrc.js"),
     extends: ["stylelint-config-standard"],
-    customSyntax: "postcss-scss",
-    plugins: ["stylelint-scss", "stylelint-value-no-unknown-custom-properties"],
-    rules: {
-        "comment-empty-line-before": null,
-        "declaration-empty-line-before": null,
-        "length-zero-no-unit": null,
-        "rule-empty-line-before": null,
-        "color-hex-length": null,
-        "at-rule-no-unknown": null,
-        "no-descending-specificity": null,
-        "scss/at-rule-no-unknown": [
-            true,
-            {
-                // https://github.com/vector-im/element-web/issues/10544
-                ignoreAtRules: ["define-mixin"],
-            },
-        ],
-        // Disable `&_kind`-style selectors while our unused CSS approach is "Find & Replace All"
-        // rather than a CI thing. Shorthand selectors are harder to detect when searching for a
-        // class name. This regex is trying to *allow* anything except `&words`, such as `&::before`,
-        // `&.mx_Class`, etc.
-        "selector-nested-pattern": "^((&[ :.\\[,])|([^&]))",
-        // Disable some defaults
-        "selector-class-pattern": null,
-        "custom-property-pattern": null,
-        "selector-id-pattern": null,
-        "keyframes-name-pattern": null,
-        "alpha-value-notation": null,
-        "color-function-notation": null,
-        "selector-not-notation": null,
-        "import-notation": null,
-        "value-keyword-case": null,
-        "declaration-block-no-redundant-longhand-properties": null,
-        "shorthand-property-no-redundant-values": null,
-        "property-no-vendor-prefix": null,
-        "selector-no-vendor-prefix": null,
-        "media-feature-name-no-vendor-prefix": null,
-        "number-max-precision": null,
-        "no-invalid-double-slash-comments": true,
-        "media-feature-range-notation": null,
-        "declaration-property-value-no-unknown": null,
-        "declaration-property-value-keyword-no-deprecated": null,
-        "csstools/value-no-unknown-custom-properties": [
-            true,
-            {
-                importFrom: [
-                    { from: "res/css/_common.pcss", type: "css" },
-                    { from: "res/themes/light/css/_light.pcss", type: "css" },
-                    // Right now our styles share vars all over the place, this is not ideal but acceptable for now
-                    { from: "res/css/views/rooms/_EventTile.pcss", type: "css" },
-                    { from: "res/css/views/rooms/_IRCLayout.pcss", type: "css" },
-                    { from: "res/css/views/rooms/_EventBubbleTile.pcss", type: "css" },
-                    { from: "res/css/views/rooms/_ReadReceiptGroup.pcss", type: "css" },
-                    { from: "res/css/views/rooms/_EditMessageComposer.pcss", type: "css" },
-                    { from: "res/css/views/right_panel/_BaseCard.pcss", type: "css" },
-                    { from: "res/css/views/messages/_MessageTimestamp.pcss", type: "css" },
-                    { from: "res/css/views/messages/_EventTileBubble.pcss", type: "css" },
-                    { from: "res/css/views/messages/_MessageActionBar.pcss", type: "css" },
-                    { from: "res/css/views/voip/LegacyCallView/_LegacyCallViewButtons.pcss", type: "css" },
-                    { from: "res/css/views/elements/_ToggleSwitch.pcss", type: "css" },
-                    { from: "res/css/views/settings/tabs/_SettingsTab.pcss", type: "css" },
-                    { from: "res/css/structures/_RoomView.pcss", type: "css" },
-                    // Compound vars
-                    "node_modules/@vector-im/compound-design-tokens/assets/web/css/cpd-common-base.css",
-                    "node_modules/@vector-im/compound-design-tokens/assets/web/css/cpd-common-semantic.css",
-                    "node_modules/@vector-im/compound-design-tokens/assets/web/css/cpd-theme-light-base-mq.css",
-                    "node_modules/@vector-im/compound-design-tokens/assets/web/css/cpd-theme-light-semantic-mq.css",
-                ],
-            },
-        ],
-    },
 };

CONTRIBUTING.md

@@ -1,6 +1,12 @@
 # Contributing code to Element Web
 
-Everyone is welcome to contribute code to Element Web, provided that they are willing to license their contributions to Element under a [Contributor License Agreement](https://cla-assistant.io/element-hq/element-web) (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.
+Everyone is welcome to contribute code to Element Web, provided that they are
+willing to license their contributions under the same license as the project
+itself. We follow a simple 'inbound=outbound' model for contributions: the act
+of submitting an 'inbound' contribution means that the contributor agrees to
+license the code under the same terms as the project's overall 'outbound'
+license - in this case, Apache Software License v2 (see
+[LICENSE](LICENSE)).
 
 ## How to contribute
 
@@ -20,26 +26,26 @@ Definitely don't use the GitHub default of "Update file.ts".
 
 As for your PR description, it should include these things:
 
-- References to any bugs fixed by the change (in GitHub's `Fixes` notation)
-- Describe the why and what is changing in the PR description so it's easy for
-  onlookers and reviewers to onboard and context switch. This information is
-  also helpful when we come back to look at this in 6 months and ask "why did
-  we do it like that?" we have a chance of finding out.
-    - Why didn't it work before? Why does it work now? What use cases does it
-      unlock?
-    - If you find yourself adding information on how the code works or why you
-      chose to do it the way you did, make sure this information is instead
-      written as comments in the code itself.
-    - Sometimes a PR can change considerably as it is developed. In this case,
-      the description should be updated to reflect the most recent state of
-      the PR. (It can be helpful to retain the old content under a suitable
-      heading, for additional context.)
-- Include both **before** and **after** screenshots to easily compare and discuss
-  what's changing.
-- Include a step-by-step testing strategy so that a reviewer can check out the
-  code locally and easily get to the point of testing your change.
-- Add comments to the diff for the reviewer that might help them to understand
-  why the change is necessary or how they might better understand and review it.
+-   References to any bugs fixed by the change (in GitHub's `Fixes` notation)
+-   Describe the why and what is changing in the PR description so it's easy for
+    onlookers and reviewers to onboard and context switch. This information is
+    also helpful when we come back to look at this in 6 months and ask "why did
+    we do it like that?" we have a chance of finding out.
+    -   Why didn't it work before? Why does it work now? What use cases does it
+        unlock?
+    -   If you find yourself adding information on how the code works or why you
+        chose to do it the way you did, make sure this information is instead
+        written as comments in the code itself.
+    -   Sometimes a PR can change considerably as it is developed. In this case,
+        the description should be updated to reflect the most recent state of
+        the PR. (It can be helpful to retain the old content under a suitable
+        heading, for additional context.)
+-   Include both **before** and **after** screenshots to easily compare and discuss
+    what's changing.
+-   Include a step-by-step testing strategy so that a reviewer can check out the
+    code locally and easily get to the point of testing your change.
+-   Add comments to the diff for the reviewer that might help them to understand
+    why the change is necessary or how they might better understand and review it.
 
 ### Changelogs
 
@@ -79,8 +85,9 @@ element-web notes: Fix a bug where the 'Herd' button only worked on Tuesdays
 
 This example is for Element Web. You can specify:
 
-- element-web
-- element-desktop
+-   matrix-react-sdk
+-   element-web
+-   element-desktop
 
 If your PR introduces a breaking change, use the `Notes` section in the same
 way, additionally adding the `X-Breaking-Change` label (see below). There's no need
@@ -96,10 +103,10 @@ Notes: Remove legacy `Camelopard` class. `Giraffe` should be used instead.
 
 Other metadata can be added using labels.
 
-- `X-Breaking-Change`: A breaking change - adding this label will mean the change causes a _major_ version bump.
-- `T-Enhancement`: A new feature - adding this label will mean the change causes a _minor_ version bump.
-- `T-Defect`: A bug fix (in either code or docs).
-- `T-Task`: No user-facing changes, eg. code comments, CI fixes, refactors or tests. Won't have a changelog entry unless you specify one.
+-   `X-Breaking-Change`: A breaking change - adding this label will mean the change causes a _major_ version bump.
+-   `T-Enhancement`: A new feature - adding this label will mean the change causes a _minor_ version bump.
+-   `T-Defect`: A bug fix (in either code or docs).
+-   `T-Task`: No user-facing changes, eg. code comments, CI fixes, refactors or tests. Won't have a changelog entry unless you specify one.
 
 If you don't have permission to add labels, your PR reviewer(s) can work with you
 to add them: ask in the PR description or comments.
@@ -112,12 +119,14 @@ checks, so please check back after a few minutes.
 
 Your PR should include tests.
 
-For new user facing features in `matrix-js-sdk` or `element-web`, you must include:
+For new user facing features in `matrix-js-sdk`, `matrix-react-sdk` or `element-web`, you
+must include:
 
 1. Comprehensive unit tests written in Jest. These are located in `/test`.
 2. "happy path" end-to-end tests.
-   These are located in `/playwright/e2e`, and are run using `element-web`.
-   Ideally, you would also include tests for edge and error cases.
+   These are located in `/cypress/e2e` in `matrix-react-sdk`, and
+   are run using `element-web`. Ideally, you would also include tests for edge
+   and error cases.
 
 Unit tests are expected even when the feature is in labs. It's good practice
 to write tests alongside the code as it ensures the code is testable from
@@ -131,7 +140,8 @@ end-to-end test; which is best depends on what sort of test most concisely
 exercises the area.
 
 Changes to must be accompanied by unit tests written in Jest.
-These are located in `/spec/` in `matrix-js-sdk` or `/test/` in `element-web`.
+These are located in `/spec/` in `matrix-js-sdk` or `/test/` in `element-web`
+and `matrix-react-sdk`.
 
 When writing unit tests, please aim for a high level of test coverage
 for new code - 80% or greater. If you cannot achieve that, please document
@@ -189,6 +199,89 @@ give away to contributors - if you feel that Matrix-branded apparel is missing
 from your life, please mail us your shipping address to matrix at matrix.org
 and we'll try to fix it :)
 
+## Sign off
+
+In order to have a concrete record that your contribution is intentional
+and you agree to license it under the same terms as the project's license, we've
+adopted the same lightweight approach that the Linux Kernel
+(https://www.kernel.org/doc/html/latest/process/submitting-patches.html), Docker
+(https://github.com/docker/docker/blob/master/CONTRIBUTING.md), and many other
+projects use: the DCO (Developer Certificate of Origin:
+http://developercertificate.org/). This is a simple declaration that you wrote
+the contribution or otherwise have the right to contribute it to Matrix:
+
+```
+Developer Certificate of Origin
+Version 1.1
+
+Copyright (C) 2004, 2006 The Linux Foundation and its contributors.
+660 York Street, Suite 102,
+San Francisco, CA 94110 USA
+
+Everyone is permitted to copy and distribute verbatim copies of this
+license document, but changing it is not allowed.
+
+Developer's Certificate of Origin 1.1
+
+By making a contribution to this project, I certify that:
+
+(a) The contribution was created in whole or in part by me and I
+    have the right to submit it under the open source license
+    indicated in the file; or
+
+(b) The contribution is based upon previous work that, to the best
+    of my knowledge, is covered under an appropriate open source
+    license and I have the right under that license to submit that
+    work with modifications, whether created in whole or in part
+    by me, under the same open source license (unless I am
+    permitted to submit under a different license), as indicated
+    in the file; or
+
+(c) The contribution was provided directly to me by some other
+    person who certified (a), (b) or (c) and I have not modified
+    it.
+
+(d) I understand and agree that this project and the contribution
+    are public and that a record of the contribution (including all
+    personal information I submit with it, including my sign-off) is
+    maintained indefinitely and may be redistributed consistent with
+    this project or the open source license(s) involved.
+```
+
+If you agree to this for your contribution, then all that's needed is to
+include the line in your commit or pull request comment:
+
+```
+Signed-off-by: Your Name <your@email.example.org>
+```
+
+We accept contributions under a legally identifiable name, such as your name on
+government documentation or common-law names (names claimed by legitimate usage
+or repute). Unfortunately, we cannot accept anonymous contributions at this
+time.
+
+Git allows you to add this signoff automatically when using the `-s` flag to
+`git commit`, which uses the name and email set in your `user.name` and
+`user.email` git configs.
+
+If you forgot to sign off your commits before making your pull request and are
+on Git 2.17+ you can mass signoff using rebase:
+
+```
+git rebase --signoff origin/develop
+```
+
+## Private sign off
+
+If you would like to provide your legal name privately to the Matrix.org
+Foundation (instead of in a public commit or comment), you can do so by emailing
+your legal name and a link to the pull request to dco@matrix.org. It helps to
+include "sign off" or similar in the subject line. You will then be instructed
+further.
+
+Once private sign off is complete, doing so for future contributions will not
+be required.
+
 # Review expectations
 
 See https://github.com/element-hq/element-meta/wiki/Review-process

Dockerfile

@@ -1,17 +1,23 @@
 # Builder
-FROM --platform=$BUILDPLATFORM node:22-bullseye AS builder
+FROM --platform=$BUILDPLATFORM node:20-bullseye as builder
 
-# Support custom branch of the js-sdk. This also helps us build images of element-web develop.
+# Support custom branches of the react-sdk and js-sdk. This also helps us build
+# images of element-web develop.
 ARG USE_CUSTOM_SDKS=false
+ARG REACT_SDK_REPO="https://github.com/matrix-org/matrix-react-sdk.git"
+ARG REACT_SDK_BRANCH="master"
 ARG JS_SDK_REPO="https://github.com/matrix-org/matrix-js-sdk.git"
 ARG JS_SDK_BRANCH="master"
 
+RUN apt-get update && apt-get install -y git dos2unix
+
 WORKDIR /src
 
 COPY . /src
-RUN /src/scripts/docker-link-repos.sh
+RUN dos2unix /src/scripts/docker-link-repos.sh && bash /src/scripts/docker-link-repos.sh
 RUN yarn --network-timeout=200000 install
-RUN /src/scripts/docker-package.sh
+
+RUN dos2unix /src/scripts/docker-package.sh && bash /src/scripts/docker-package.sh
 
 # Copy the config now so that we don't create another layer in the app image
 RUN cp /src/config.sample.json /src/webapp/config.json
@@ -21,22 +27,8 @@ FROM nginx:alpine-slim
 
 COPY --from=builder /src/webapp /app
 
-# Override default nginx config. Templates in `/etc/nginx/templates` are passed
-# through `envsubst` by the nginx docker image entry point.
-COPY /docker/nginx-templates/* /etc/nginx/templates/
-
-# Tell nginx to put its pidfile elsewhere, so it can run as non-root
-RUN sed -i -e 's,/var/run/nginx.pid,/tmp/nginx.pid,' /etc/nginx/nginx.conf
-
-# nginx user must own the cache and etc directory to write cache and tweak the nginx config
-RUN chown -R nginx:0 /var/cache/nginx /etc/nginx
-RUN chmod -R g+w /var/cache/nginx /etc/nginx
+# Override default nginx config
+COPY /nginx/conf.d/default.conf /etc/nginx/conf.d/default.conf
 
 RUN rm -rf /usr/share/nginx/html \
   && ln -s /app /usr/share/nginx/html
-
-# Run as nginx user by default
-USER nginx
-
-# HTTP listen port
-ENV ELEMENT_WEB_PORT=80

LICENSE

@@ -0,0 +1,177 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS

LICENSE-AGPL-3.0

@@ -1,661 +0,0 @@
-                    GNU AFFERO GENERAL PUBLIC LICENSE
-                       Version 3, 19 November 2007
-
-Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
-Everyone is permitted to copy and distribute verbatim copies
-of this license document, but changing it is not allowed.
-
-                            Preamble
-
-The GNU Affero General Public License is a free, copyleft license for
-software and other kinds of works, specifically designed to ensure
-cooperation with the community in the case of network server software.
-
-The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works. By contrast,
-our General Public Licenses are intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users.
-
-When we speak of free software, we are referring to freedom, not
-price. Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-them if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs, and that you know you can do these things.
-
-Developers that use our General Public Licenses protect your rights
-with two steps: (1) assert copyright on the software, and (2) offer
-you this License which gives you legal permission to copy, distribute
-and/or modify the software.
-
-A secondary benefit of defending all users' freedom is that
-improvements made in alternate versions of the program, if they
-receive widespread use, become available for other developers to
-incorporate. Many developers of free software are heartened and
-encouraged by the resulting cooperation. However, in the case of
-software used on network servers, this result may fail to come about.
-The GNU General Public License permits making a modified version and
-letting the public access it on a server without ever releasing its
-source code to the public.
-
-The GNU Affero General Public License is designed specifically to
-ensure that, in such cases, the modified source code becomes available
-to the community. It requires the operator of a network server to
-provide the source code of the modified version running there to the
-users of that server. Therefore, public use of a modified version, on
-a publicly accessible server, gives the public access to the source
-code of the modified version.
-
-An older license, called the Affero General Public License and
-published by Affero, was designed to accomplish similar goals. This is
-a different license, not a version of the Affero GPL, but Affero has
-released a new version of the Affero GPL which permits relicensing under
-this license.
-
-The precise terms and conditions for copying, distribution and
-modification follow.
-
-                       TERMS AND CONDITIONS
-
-0. Definitions.
-
-"This License" refers to version 3 of the GNU Affero General Public License.
-
-"Copyright" also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.
-
-"The Program" refers to any copyrightable work licensed under this
-License. Each licensee is addressed as "you". "Licensees" and
-"recipients" may be individuals or organizations.
-
-To "modify" a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy. The resulting work is called a "modified version" of the
-earlier work or a work "based on" the earlier work.
-
-A "covered work" means either the unmodified Program or a work based
-on the Program.
-
-To "propagate" a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy. Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
-
-To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies. Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.
-
-An interactive user interface displays "Appropriate Legal Notices"
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License. If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
-
-1. Source Code.
-
-The "source code" for a work means the preferred form of the work
-for making modifications to it. "Object code" means any non-source
-form of a work.
-
-A "Standard Interface" means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
-
-The "System Libraries" of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form. A
-"Major Component", in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
-
-The "Corresponding Source" for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities. However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work. For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
-
-The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.
-
-The Corresponding Source for a work in source code form is that
-same work.
-
-2. Basic Permissions.
-
-All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met. This License explicitly affirms your unlimited
-permission to run the unmodified Program. The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work. This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
-
-You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force. You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright. Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.
-
-Conveying under any other circumstances is permitted solely under
-the conditions stated below. Sublicensing is not allowed; section 10
-makes it unnecessary.
-
-3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
-No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.
-
-When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such circumvention
-is effected by exercising rights under this License with respect to
-the covered work, and you disclaim any intention to limit operation or
-modification of the work as a means of enforcing, against the work's
-users, your or third parties' legal rights to forbid circumvention of
-technological measures.
-
-4. Conveying Verbatim Copies.
-
-You may convey verbatim copies of the Program's source code as you
-receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.
-
-You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.
-
-5. Conveying Modified Source Versions.
-
-You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the
-terms of section 4, provided that you also meet all of these conditions:
-
-    a) The work must carry prominent notices stating that you modified
-    it, and giving a relevant date.
-
-    b) The work must carry prominent notices stating that it is
-    released under this License and any conditions added under section
-    7.  This requirement modifies the requirement in section 4 to
-    "keep intact all notices".
-
-    c) You must license the entire work, as a whole, under this
-    License to anyone who comes into possession of a copy.  This
-    License will therefore apply, along with any applicable section 7
-    additional terms, to the whole of the work, and all its parts,
-    regardless of how they are packaged.  This License gives no
-    permission to license the work in any other way, but it does not
-    invalidate such permission if you have separately received it.
-
-    d) If the work has interactive user interfaces, each must display
-    Appropriate Legal Notices; however, if the Program has interactive
-    interfaces that do not display Appropriate Legal Notices, your
-    work need not make them do so.
-
-A compilation of a covered work with other separate and independent
-works, which are not by their nature extensions of the covered work,
-and which are not combined with it such as to form a larger program,
-in or on a volume of a storage or distribution medium, is called an
-"aggregate" if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit. Inclusion of a covered work
-in an aggregate does not cause this License to apply to the other
-parts of the aggregate.
-
-6. Conveying Non-Source Forms.
-
-You may convey a covered work in object code form under the terms
-of sections 4 and 5, provided that you also convey the
-machine-readable Corresponding Source under the terms of this License,
-in one of these ways:
-
-    a) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by the
-    Corresponding Source fixed on a durable physical medium
-    customarily used for software interchange.
-
-    b) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by a
-    written offer, valid for at least three years and valid for as
-    long as you offer spare parts or customer support for that product
-    model, to give anyone who possesses the object code either (1) a
-    copy of the Corresponding Source for all the software in the
-    product that is covered by this License, on a durable physical
-    medium customarily used for software interchange, for a price no
-    more than your reasonable cost of physically performing this
-    conveying of source, or (2) access to copy the
-    Corresponding Source from a network server at no charge.
-
-    c) Convey individual copies of the object code with a copy of the
-    written offer to provide the Corresponding Source.  This
-    alternative is allowed only occasionally and noncommercially, and
-    only if you received the object code with such an offer, in accord
-    with subsection 6b.
-
-    d) Convey the object code by offering access from a designated
-    place (gratis or for a charge), and offer equivalent access to the
-    Corresponding Source in the same way through the same place at no
-    further charge.  You need not require recipients to copy the
-    Corresponding Source along with the object code.  If the place to
-    copy the object code is a network server, the Corresponding Source
-    may be on a different server (operated by you or a third party)
-    that supports equivalent copying facilities, provided you maintain
-    clear directions next to the object code saying where to find the
-    Corresponding Source.  Regardless of what server hosts the
-    Corresponding Source, you remain obligated to ensure that it is
-    available for as long as needed to satisfy these requirements.
-
-    e) Convey the object code using peer-to-peer transmission, provided
-    you inform other peers where the object code and Corresponding
-    Source of the work are being offered to the general public at no
-    charge under subsection 6d.
-
-A separable portion of the object code, whose source code is excluded
-from the Corresponding Source as a System Library, need not be
-included in conveying the object code work.
-
-A "User Product" is either (1) a "consumer product", which means any
-tangible personal property which is normally used for personal, family,
-or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling. In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage. For a particular
-product received by a particular user, "normally used" refers to a
-typical or common use of that class of product, regardless of the status
-of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product. A product
-is a consumer product regardless of whether the product has substantial
-commercial, industrial or non-consumer uses, unless such uses represent
-the only significant mode of use of the product.
-
-"Installation Information" for a User Product means any methods,
-procedures, authorization keys, or other information required to install
-and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source. The information must
-suffice to ensure that the continued functioning of the modified object
-code is in no case prevented or interfered with solely because
-modification has been made.
-
-If you convey an object code work under this section in, or with, or
-specifically for use in, a User Product, and the conveying occurs as
-part of a transaction in which the right of possession and use of the
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information. But this requirement does not apply
-if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has
-been installed in ROM).
-
-The requirement to provide Installation Information does not include a
-requirement to continue to provide support service, warranty, or updates
-for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed. Access to a
-network may be denied when the modification itself materially and
-adversely affects the operation of the network or violates the rules and
-protocols for communication across the network.
-
-Corresponding Source conveyed, and Installation Information provided,
-in accord with this section must be in a format that is publicly
-documented (and with an implementation available to the public in
-source code form), and must require no special password or key for
-unpacking, reading or copying.
-
-7. Additional Terms.
-
-"Additional permissions" are terms that supplement the terms of this
-License by making exceptions from one or more of its conditions.
-Additional permissions that are applicable to the entire Program shall
-be treated as though they were included in this License, to the extent
-that they are valid under applicable law. If additional permissions
-apply only to part of the Program, that part may be used separately
-under those permissions, but the entire Program remains governed by
-this License without regard to the additional permissions.
-
-When you convey a copy of a covered work, you may at your option
-remove any additional permissions from that copy, or from any part of
-it. (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.) You may place
-additional permissions on material, added by you to a covered work,
-for which you have or can give appropriate copyright permission.
-
-Notwithstanding any other provision of this License, for material you
-add to a covered work, you may (if authorized by the copyright holders of
-that material) supplement the terms of this License with terms:
-
-    a) Disclaiming warranty or limiting liability differently from the
-    terms of sections 15 and 16 of this License; or
-
-    b) Requiring preservation of specified reasonable legal notices or
-    author attributions in that material or in the Appropriate Legal
-    Notices displayed by works containing it; or
-
-    c) Prohibiting misrepresentation of the origin of that material, or
-    requiring that modified versions of such material be marked in
-    reasonable ways as different from the original version; or
-
-    d) Limiting the use for publicity purposes of names of licensors or
-    authors of the material; or
-
-    e) Declining to grant rights under trademark law for use of some
-    trade names, trademarks, or service marks; or
-
-    f) Requiring indemnification of licensors and authors of that
-    material by anyone who conveys the material (or modified versions of
-    it) with contractual assumptions of liability to the recipient, for
-    any liability that these contractual assumptions directly impose on
-    those licensors and authors.
-
-All other non-permissive additional terms are considered "further
-restrictions" within the meaning of section 10. If the Program as you
-received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further
-restriction, you may remove that term. If a license document contains
-a further restriction but permits relicensing or conveying under this
-License, you may add to a covered work material governed by the terms
-of that license document, provided that the further restriction does
-not survive such relicensing or conveying.
-
-If you add terms to a covered work in accord with this section, you
-must place, in the relevant source files, a statement of the
-additional terms that apply to those files, or a notice indicating
-where to find the applicable terms.
-
-Additional terms, permissive or non-permissive, may be stated in the
-form of a separately written license, or stated as exceptions;
-the above requirements apply either way.
-
-8. Termination.
-
-You may not propagate or modify a covered work except as expressly
-provided under this License. Any attempt otherwise to propagate or
-modify it is void, and will automatically terminate your rights under
-this License (including any patent licenses granted under the third
-paragraph of section 11).
-
-However, if you cease all violation of this License, then your
-license from a particular copyright holder is reinstated (a)
-provisionally, unless and until the copyright holder explicitly and
-finally terminates your license, and (b) permanently, if the copyright
-holder fails to notify you of the violation by some reasonable means
-prior to 60 days after the cessation.
-
-Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.
-
-Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License. If your rights have been terminated and not permanently
-reinstated, you do not qualify to receive new licenses for the same
-material under section 10.
-
-9. Acceptance Not Required for Having Copies.
-
-You are not required to accept this License in order to receive or
-run a copy of the Program. Ancillary propagation of a covered work
-occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance. However,
-nothing other than this License grants you permission to propagate or
-modify any covered work. These actions infringe copyright if you do
-not accept this License. Therefore, by modifying or propagating a
-covered work, you indicate your acceptance of this License to do so.
-
-10. Automatic Licensing of Downstream Recipients.
-
-Each time you convey a covered work, the recipient automatically
-receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License. You are not responsible
-for enforcing compliance by third parties with this License.
-
-An "entity transaction" is a transaction transferring control of an
-organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations. If propagation of a covered
-work results from an entity transaction, each party to that
-transaction who receives a copy of the work also receives whatever
-licenses to the work the party's predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the
-Corresponding Source of the work from the predecessor in interest, if
-the predecessor has it or can get it with reasonable efforts.
-
-You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License. For example, you may
-not impose a license fee, royalty, or other charge for exercise of
-rights granted under this License, and you may not initiate litigation
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-any patent claim is infringed by making, using, selling, offering for
-sale, or importing the Program or any portion of it.
-
-11. Patents.
-
-A "contributor" is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based. The
-work thus licensed is called the contributor's "contributor version".
-
-A contributor's "essential patent claims" are all patent claims
-owned or controlled by the contributor, whether already acquired or
-hereafter acquired, that would be infringed by some manner, permitted
-by this License, of making, using, or selling its contributor version,
-but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version. For
-purposes of this definition, "control" includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
-this License.
-
-Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor's essential patent claims, to
-make, use, sell, offer for sale, import and otherwise run, modify and
-propagate the contents of its contributor version.
-
-In the following three paragraphs, a "patent license" is any express
-agreement or commitment, however denominated, not to enforce a patent
-(such as an express permission to practice a patent or covenant not to
-sue for patent infringement). To "grant" such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.
-
-If you convey a covered work, knowingly relying on a patent license,
-and the Corresponding Source of the work is not available for anyone
-to copy, free of charge and under the terms of this License, through a
-publicly available network server or other readily accessible means,
-then you must either (1) cause the Corresponding Source to be so
-available, or (2) arrange to deprive yourself of the benefit of the
-patent license for this particular work, or (3) arrange, in a manner
-consistent with the requirements of this License, to extend the patent
-license to downstream recipients. "Knowingly relying" means you have
-actual knowledge that, but for the patent license, your conveying the
-covered work in a country, or your recipient's use of the covered work
-in a country, would infringe one or more identifiable patents in that
-country that you have reason to believe are valid.
-
-If, pursuant to or in connection with a single transaction or
-arrangement, you convey, or propagate by procuring conveyance of, a
-covered work, and grant a patent license to some of the parties
-receiving the covered work authorizing them to use, propagate, modify
-or convey a specific copy of the covered work, then the patent license
-you grant is automatically extended to all recipients of the covered
-work and works based on it.
-
-A patent license is "discriminatory" if it does not include within
-the scope of its coverage, prohibits the exercise of, or is
-conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License. You may not convey a covered
-work if you are a party to an arrangement with a third party that is
-in the business of distributing software, under which you make payment
-to the third party based on the extent of your activity of conveying
-the work, and under which the third party grants, to any of the
-parties who would receive the covered work from you, a discriminatory
-patent license (a) in connection with copies of the covered work
-conveyed by you (or copies made from those copies), or (b) primarily
-for and in connection with specific products or compilations that
-contain the covered work, unless you entered into that arrangement,
-or that patent license was granted, prior to 28 March 2007.
-
-Nothing in this License shall be construed as excluding or limiting
-any implied license or other defenses to infringement that may
-otherwise be available to you under applicable patent law.
-
-12. No Surrender of Others' Freedom.
-
-If conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License. If you cannot convey a
-covered work so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you may
-not convey it at all. For example, if you agree to terms that obligate you
-to collect a royalty for further conveying from those to whom you convey
-the Program, the only way you could satisfy both those terms and this
-License would be to refrain entirely from conveying the Program.
-
-13. Remote Network Interaction; Use with the GNU General Public License.
-
-Notwithstanding any other provision of this License, if you modify the
-Program, your modified version must prominently offer all users
-interacting with it remotely through a computer network (if your version
-supports such interaction) an opportunity to receive the Corresponding
-Source of your version by providing access to the Corresponding Source
-from a network server at no charge, through some standard or customary
-means of facilitating copying of software. This Corresponding Source
-shall include the Corresponding Source for any work covered by version 3
-of the GNU General Public License that is incorporated pursuant to the
-following paragraph.
-
-Notwithstanding any other provision of this License, you have
-permission to link or combine any covered work with a work licensed
-under version 3 of the GNU General Public License into a single
-combined work, and to convey the resulting work. The terms of this
-License will continue to apply to the part which is the covered work,
-but the work with which it is combined will remain governed by version
-3 of the GNU General Public License.
-
-14. Revised Versions of this License.
-
-The Free Software Foundation may publish revised and/or new versions of
-the GNU Affero General Public License from time to time. Such new versions
-will be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number. If the
-Program specifies that a certain numbered version of the GNU Affero General
-Public License "or any later version" applies to it, you have the
-option of following the terms and conditions either of that numbered
-version or of any later version published by the Free Software
-Foundation. If the Program does not specify a version number of the
-GNU Affero General Public License, you may choose any version ever published
-by the Free Software Foundation.
-
-If the Program specifies that a proxy can decide which future
-versions of the GNU Affero General Public License can be used, that proxy's
-public statement of acceptance of a version permanently authorizes you
-to choose that version for the Program.
-
-Later license versions may give you additional or different
-permissions. However, no additional obligations are imposed on any
-author or copyright holder as a result of your choosing to follow a
-later version.
-
-15. Disclaimer of Warranty.
-
-THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
-OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
-IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
-ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-16. Limitation of Liability.
-
-IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
-THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
-GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
-USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
-DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
-PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
-EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGES.
-
-17. Interpretation of Sections 15 and 16.
-
-If the disclaimer of warranty and limitation of liability provided
-above cannot be given local legal effect according to their terms,
-reviewing courts shall apply local law that most closely approximates
-an absolute waiver of all civil liability in connection with the
-Program, unless a warranty or assumption of liability accompanies a
-copy of the Program in return for a fee.
-
-                     END OF TERMS AND CONDITIONS
-
-            How to Apply These Terms to Your New Programs
-
-If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-To do so, attach the following notices to the program. It is safest
-to attach them to the start of each source file to most effectively
-state the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Affero General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Affero General Public License for more details.
-
-    You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
-Also add information on how to contact you by electronic and paper mail.
-
-If your software can interact with users remotely through a computer
-network, you should also make sure that it provides a way for users to
-get its source. For example, if your program is a web application, its
-interface could display a "Source" link that leads users to an archive
-of the code. There are many ways you could offer source, and different
-solutions will be better for different programs; see section 13 for the
-specific requirements.
-
-You should also get your employer (if you work as a programmer) or school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU AGPL, see
-<https://www.gnu.org/licenses/>.

LICENSE-COMMERCIAL

@@ -1,6 +0,0 @@
-Licensees holding a valid commercial license with Element may use this
-software in accordance with the terms contained in a written agreement
-between you and Element.
-
-To purchase a commercial license please contact our sales team at
-licensing@element.io

LICENSE-GPL-3.0

@@ -1,674 +0,0 @@
-                    GNU GENERAL PUBLIC LICENSE
-                       Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-                            Preamble
-
-  The GNU General Public License is a free, copyleft license for
-software and other kinds of works.
-
-  The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works.  By contrast,
-the GNU General Public License is intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users.  We, the Free Software Foundation, use the
-GNU General Public License for most of our software; it applies also to
-any other work released this way by its authors.  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-them if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs, and that you know you can do these things.
-
-  To protect your rights, we need to prevent others from denying you
-these rights or asking you to surrender the rights.  Therefore, you have
-certain responsibilities if you distribute copies of the software, or if
-you modify it: responsibilities to respect the freedom of others.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must pass on to the recipients the same
-freedoms that you received.  You must make sure that they, too, receive
-or can get the source code.  And you must show them these terms so they
-know their rights.
-
-  Developers that use the GNU GPL protect your rights with two steps:
-(1) assert copyright on the software, and (2) offer you this License
-giving you legal permission to copy, distribute and/or modify it.
-
-  For the developers' and authors' protection, the GPL clearly explains
-that there is no warranty for this free software.  For both users' and
-authors' sake, the GPL requires that modified versions be marked as
-changed, so that their problems will not be attributed erroneously to
-authors of previous versions.
-
-  Some devices are designed to deny users access to install or run
-modified versions of the software inside them, although the manufacturer
-can do so.  This is fundamentally incompatible with the aim of
-protecting users' freedom to change the software.  The systematic
-pattern of such abuse occurs in the area of products for individuals to
-use, which is precisely where it is most unacceptable.  Therefore, we
-have designed this version of the GPL to prohibit the practice for those
-products.  If such problems arise substantially in other domains, we
-stand ready to extend this provision to those domains in future versions
-of the GPL, as needed to protect the freedom of users.
-
-  Finally, every program is threatened constantly by software patents.
-States should not allow patents to restrict development and use of
-software on general-purpose computers, but in those that do, we wish to
-avoid the special danger that patents applied to a free program could
-make it effectively proprietary.  To prevent this, the GPL assures that
-patents cannot be used to render the program non-free.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-                       TERMS AND CONDITIONS
-
-  0. Definitions.
-
-  "This License" refers to version 3 of the GNU General Public License.
-
-  "Copyright" also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.
-
-  "The Program" refers to any copyrightable work licensed under this
-License.  Each licensee is addressed as "you".  "Licensees" and
-"recipients" may be individuals or organizations.
-
-  To "modify" a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy.  The resulting work is called a "modified version" of the
-earlier work or a work "based on" the earlier work.
-
-  A "covered work" means either the unmodified Program or a work based
-on the Program.
-
-  To "propagate" a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy.  Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
-
-  To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies.  Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.
-
-  An interactive user interface displays "Appropriate Legal Notices"
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License.  If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
-
-  1. Source Code.
-
-  The "source code" for a work means the preferred form of the work
-for making modifications to it.  "Object code" means any non-source
-form of a work.
-
-  A "Standard Interface" means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
-
-  The "System Libraries" of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form.  A
-"Major Component", in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
-
-  The "Corresponding Source" for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities.  However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work.  For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
-
-  The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.
-
-  The Corresponding Source for a work in source code form is that
-same work.
-
-  2. Basic Permissions.
-
-  All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met.  This License explicitly affirms your unlimited
-permission to run the unmodified Program.  The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work.  This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
-
-  You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force.  You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright.  Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.
-
-  Conveying under any other circumstances is permitted solely under
-the conditions stated below.  Sublicensing is not allowed; section 10
-makes it unnecessary.
-
-  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
-  No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.
-
-  When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such circumvention
-is effected by exercising rights under this License with respect to
-the covered work, and you disclaim any intention to limit operation or
-modification of the work as a means of enforcing, against the work's
-users, your or third parties' legal rights to forbid circumvention of
-technological measures.
-
-  4. Conveying Verbatim Copies.
-
-  You may convey verbatim copies of the Program's source code as you
-receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.
-
-  You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.
-
-  5. Conveying Modified Source Versions.
-
-  You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the
-terms of section 4, provided that you also meet all of these conditions:
-
-    a) The work must carry prominent notices stating that you modified
-    it, and giving a relevant date.
-
-    b) The work must carry prominent notices stating that it is
-    released under this License and any conditions added under section
-    7.  This requirement modifies the requirement in section 4 to
-    "keep intact all notices".
-
-    c) You must license the entire work, as a whole, under this
-    License to anyone who comes into possession of a copy.  This
-    License will therefore apply, along with any applicable section 7
-    additional terms, to the whole of the work, and all its parts,
-    regardless of how they are packaged.  This License gives no
-    permission to license the work in any other way, but it does not
-    invalidate such permission if you have separately received it.
-
-    d) If the work has interactive user interfaces, each must display
-    Appropriate Legal Notices; however, if the Program has interactive
-    interfaces that do not display Appropriate Legal Notices, your
-    work need not make them do so.
-
-  A compilation of a covered work with other separate and independent
-works, which are not by their nature extensions of the covered work,
-and which are not combined with it such as to form a larger program,
-in or on a volume of a storage or distribution medium, is called an
-"aggregate" if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit.  Inclusion of a covered work
-in an aggregate does not cause this License to apply to the other
-parts of the aggregate.
-
-  6. Conveying Non-Source Forms.
-
-  You may convey a covered work in object code form under the terms
-of sections 4 and 5, provided that you also convey the
-machine-readable Corresponding Source under the terms of this License,
-in one of these ways:
-
-    a) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by the
-    Corresponding Source fixed on a durable physical medium
-    customarily used for software interchange.
-
-    b) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by a
-    written offer, valid for at least three years and valid for as
-    long as you offer spare parts or customer support for that product
-    model, to give anyone who possesses the object code either (1) a
-    copy of the Corresponding Source for all the software in the
-    product that is covered by this License, on a durable physical
-    medium customarily used for software interchange, for a price no
-    more than your reasonable cost of physically performing this
-    conveying of source, or (2) access to copy the
-    Corresponding Source from a network server at no charge.
-
-    c) Convey individual copies of the object code with a copy of the
-    written offer to provide the Corresponding Source.  This
-    alternative is allowed only occasionally and noncommercially, and
-    only if you received the object code with such an offer, in accord
-    with subsection 6b.
-
-    d) Convey the object code by offering access from a designated
-    place (gratis or for a charge), and offer equivalent access to the
-    Corresponding Source in the same way through the same place at no
-    further charge.  You need not require recipients to copy the
-    Corresponding Source along with the object code.  If the place to
-    copy the object code is a network server, the Corresponding Source
-    may be on a different server (operated by you or a third party)
-    that supports equivalent copying facilities, provided you maintain
-    clear directions next to the object code saying where to find the
-    Corresponding Source.  Regardless of what server hosts the
-    Corresponding Source, you remain obligated to ensure that it is
-    available for as long as needed to satisfy these requirements.
-
-    e) Convey the object code using peer-to-peer transmission, provided
-    you inform other peers where the object code and Corresponding
-    Source of the work are being offered to the general public at no
-    charge under subsection 6d.
-
-  A separable portion of the object code, whose source code is excluded
-from the Corresponding Source as a System Library, need not be
-included in conveying the object code work.
-
-  A "User Product" is either (1) a "consumer product", which means any
-tangible personal property which is normally used for personal, family,
-or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling.  In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage.  For a particular
-product received by a particular user, "normally used" refers to a
-typical or common use of that class of product, regardless of the status
-of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product.  A product
-is a consumer product regardless of whether the product has substantial
-commercial, industrial or non-consumer uses, unless such uses represent
-the only significant mode of use of the product.
-
-  "Installation Information" for a User Product means any methods,
-procedures, authorization keys, or other information required to install
-and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source.  The information must
-suffice to ensure that the continued functioning of the modified object
-code is in no case prevented or interfered with solely because
-modification has been made.
-
-  If you convey an object code work under this section in, or with, or
-specifically for use in, a User Product, and the conveying occurs as
-part of a transaction in which the right of possession and use of the
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information.  But this requirement does not apply
-if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has
-been installed in ROM).
-
-  The requirement to provide Installation Information does not include a
-requirement to continue to provide support service, warranty, or updates
-for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed.  Access to a
-network may be denied when the modification itself materially and
-adversely affects the operation of the network or violates the rules and
-protocols for communication across the network.
-
-  Corresponding Source conveyed, and Installation Information provided,
-in accord with this section must be in a format that is publicly
-documented (and with an implementation available to the public in
-source code form), and must require no special password or key for
-unpacking, reading or copying.
-
-  7. Additional Terms.
-
-  "Additional permissions" are terms that supplement the terms of this
-License by making exceptions from one or more of its conditions.
-Additional permissions that are applicable to the entire Program shall
-be treated as though they were included in this License, to the extent
-that they are valid under applicable law.  If additional permissions
-apply only to part of the Program, that part may be used separately
-under those permissions, but the entire Program remains governed by
-this License without regard to the additional permissions.
-
-  When you convey a copy of a covered work, you may at your option
-remove any additional permissions from that copy, or from any part of
-it.  (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.)  You may place
-additional permissions on material, added by you to a covered work,
-for which you have or can give appropriate copyright permission.
-
-  Notwithstanding any other provision of this License, for material you
-add to a covered work, you may (if authorized by the copyright holders of
-that material) supplement the terms of this License with terms:
-
-    a) Disclaiming warranty or limiting liability differently from the
-    terms of sections 15 and 16 of this License; or
-
-    b) Requiring preservation of specified reasonable legal notices or
-    author attributions in that material or in the Appropriate Legal
-    Notices displayed by works containing it; or
-
-    c) Prohibiting misrepresentation of the origin of that material, or
-    requiring that modified versions of such material be marked in
-    reasonable ways as different from the original version; or
-
-    d) Limiting the use for publicity purposes of names of licensors or
-    authors of the material; or
-
-    e) Declining to grant rights under trademark law for use of some
-    trade names, trademarks, or service marks; or
-
-    f) Requiring indemnification of licensors and authors of that
-    material by anyone who conveys the material (or modified versions of
-    it) with contractual assumptions of liability to the recipient, for
-    any liability that these contractual assumptions directly impose on
-    those licensors and authors.
-
-  All other non-permissive additional terms are considered "further
-restrictions" within the meaning of section 10.  If the Program as you
-received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further
-restriction, you may remove that term.  If a license document contains
-a further restriction but permits relicensing or conveying under this
-License, you may add to a covered work material governed by the terms
-of that license document, provided that the further restriction does
-not survive such relicensing or conveying.
-
-  If you add terms to a covered work in accord with this section, you
-must place, in the relevant source files, a statement of the
-additional terms that apply to those files, or a notice indicating
-where to find the applicable terms.
-
-  Additional terms, permissive or non-permissive, may be stated in the
-form of a separately written license, or stated as exceptions;
-the above requirements apply either way.
-
-  8. Termination.
-
-  You may not propagate or modify a covered work except as expressly
-provided under this License.  Any attempt otherwise to propagate or
-modify it is void, and will automatically terminate your rights under
-this License (including any patent licenses granted under the third
-paragraph of section 11).
-
-  However, if you cease all violation of this License, then your
-license from a particular copyright holder is reinstated (a)
-provisionally, unless and until the copyright holder explicitly and
-finally terminates your license, and (b) permanently, if the copyright
-holder fails to notify you of the violation by some reasonable means
-prior to 60 days after the cessation.
-
-  Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.
-
-  Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License.  If your rights have been terminated and not permanently
-reinstated, you do not qualify to receive new licenses for the same
-material under section 10.
-
-  9. Acceptance Not Required for Having Copies.
-
-  You are not required to accept this License in order to receive or
-run a copy of the Program.  Ancillary propagation of a covered work
-occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance.  However,
-nothing other than this License grants you permission to propagate or
-modify any covered work.  These actions infringe copyright if you do
-not accept this License.  Therefore, by modifying or propagating a
-covered work, you indicate your acceptance of this License to do so.
-
-  10. Automatic Licensing of Downstream Recipients.
-
-  Each time you convey a covered work, the recipient automatically
-receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License.  You are not responsible
-for enforcing compliance by third parties with this License.
-
-  An "entity transaction" is a transaction transferring control of an
-organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations.  If propagation of a covered
-work results from an entity transaction, each party to that
-transaction who receives a copy of the work also receives whatever
-licenses to the work the party's predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the
-Corresponding Source of the work from the predecessor in interest, if
-the predecessor has it or can get it with reasonable efforts.
-
-  You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License.  For example, you may
-not impose a license fee, royalty, or other charge for exercise of
-rights granted under this License, and you may not initiate litigation
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-any patent claim is infringed by making, using, selling, offering for
-sale, or importing the Program or any portion of it.
-
-  11. Patents.
-
-  A "contributor" is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based.  The
-work thus licensed is called the contributor's "contributor version".
-
-  A contributor's "essential patent claims" are all patent claims
-owned or controlled by the contributor, whether already acquired or
-hereafter acquired, that would be infringed by some manner, permitted
-by this License, of making, using, or selling its contributor version,
-but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version.  For
-purposes of this definition, "control" includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
-this License.
-
-  Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor's essential patent claims, to
-make, use, sell, offer for sale, import and otherwise run, modify and
-propagate the contents of its contributor version.
-
-  In the following three paragraphs, a "patent license" is any express
-agreement or commitment, however denominated, not to enforce a patent
-(such as an express permission to practice a patent or covenant not to
-sue for patent infringement).  To "grant" such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.
-
-  If you convey a covered work, knowingly relying on a patent license,
-and the Corresponding Source of the work is not available for anyone
-to copy, free of charge and under the terms of this License, through a
-publicly available network server or other readily accessible means,
-then you must either (1) cause the Corresponding Source to be so
-available, or (2) arrange to deprive yourself of the benefit of the
-patent license for this particular work, or (3) arrange, in a manner
-consistent with the requirements of this License, to extend the patent
-license to downstream recipients.  "Knowingly relying" means you have
-actual knowledge that, but for the patent license, your conveying the
-covered work in a country, or your recipient's use of the covered work
-in a country, would infringe one or more identifiable patents in that
-country that you have reason to believe are valid.
-
-  If, pursuant to or in connection with a single transaction or
-arrangement, you convey, or propagate by procuring conveyance of, a
-covered work, and grant a patent license to some of the parties
-receiving the covered work authorizing them to use, propagate, modify
-or convey a specific copy of the covered work, then the patent license
-you grant is automatically extended to all recipients of the covered
-work and works based on it.
-
-  A patent license is "discriminatory" if it does not include within
-the scope of its coverage, prohibits the exercise of, or is
-conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License.  You may not convey a covered
-work if you are a party to an arrangement with a third party that is
-in the business of distributing software, under which you make payment
-to the third party based on the extent of your activity of conveying
-the work, and under which the third party grants, to any of the
-parties who would receive the covered work from you, a discriminatory
-patent license (a) in connection with copies of the covered work
-conveyed by you (or copies made from those copies), or (b) primarily
-for and in connection with specific products or compilations that
-contain the covered work, unless you entered into that arrangement,
-or that patent license was granted, prior to 28 March 2007.
-
-  Nothing in this License shall be construed as excluding or limiting
-any implied license or other defenses to infringement that may
-otherwise be available to you under applicable patent law.
-
-  12. No Surrender of Others' Freedom.
-
-  If conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot convey a
-covered work so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you may
-not convey it at all.  For example, if you agree to terms that obligate you
-to collect a royalty for further conveying from those to whom you convey
-the Program, the only way you could satisfy both those terms and this
-License would be to refrain entirely from conveying the Program.
-
-  13. Use with the GNU Affero General Public License.
-
-  Notwithstanding any other provision of this License, you have
-permission to link or combine any covered work with a work licensed
-under version 3 of the GNU Affero General Public License into a single
-combined work, and to convey the resulting work.  The terms of this
-License will continue to apply to the part which is the covered work,
-but the special requirements of the GNU Affero General Public License,
-section 13, concerning interaction through a network will apply to the
-combination as such.
-
-  14. Revised Versions of this License.
-
-  The Free Software Foundation may publish revised and/or new versions of
-the GNU General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-  Each version is given a distinguishing version number.  If the
-Program specifies that a certain numbered version of the GNU General
-Public License "or any later version" applies to it, you have the
-option of following the terms and conditions either of that numbered
-version or of any later version published by the Free Software
-Foundation.  If the Program does not specify a version number of the
-GNU General Public License, you may choose any version ever published
-by the Free Software Foundation.
-
-  If the Program specifies that a proxy can decide which future
-versions of the GNU General Public License can be used, that proxy's
-public statement of acceptance of a version permanently authorizes you
-to choose that version for the Program.
-
-  Later license versions may give you additional or different
-permissions.  However, no additional obligations are imposed on any
-author or copyright holder as a result of your choosing to follow a
-later version.
-
-  15. Disclaimer of Warranty.
-
-  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
-OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
-IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
-ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. Limitation of Liability.
-
-  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
-THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
-GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
-USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
-DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
-PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
-EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGES.
-
-  17. Interpretation of Sections 15 and 16.
-
-  If the disclaimer of warranty and limitation of liability provided
-above cannot be given local legal effect according to their terms,
-reviewing courts shall apply local law that most closely approximates
-an absolute waiver of all civil liability in connection with the
-Program, unless a warranty or assumption of liability accompanies a
-copy of the Program in return for a fee.
-
-                     END OF TERMS AND CONDITIONS
-
-            How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-state the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
-Also add information on how to contact you by electronic and paper mail.
-
-  If the program does terminal interaction, make it output a short
-notice like this when it starts in an interactive mode:
-
-    <program>  Copyright (C) <year>  <name of author>
-    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, your program's commands
-might be different; for a GUI interface, you would use an "about box".
-
-  You should also get your employer (if you work as a programmer) or school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU GPL, see
-<https://www.gnu.org/licenses/>.
-
-  The GNU General Public License does not permit incorporating your program
-into proprietary programs.  If your program is a subroutine library, you
-may consider it more useful to permit linking proprietary applications with
-the library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.  But first, please read
-<https://www.gnu.org/licenses/why-not-lgpl.html>.

README.md

@@ -10,36 +10,26 @@
 # Element
 
 Element (formerly known as Vector and Riot) is a Matrix web client built using the [Matrix
-JS SDK](https://github.com/matrix-org/matrix-js-sdk).
+React SDK](https://github.com/matrix-org/matrix-react-sdk).
 
 # Supported Environments
 
 Element has several tiers of support for different environments:
 
-- Supported
-    - Definition:
-        - Issues **actively triaged**, regressions **block** the release
-    - Last 2 major versions of Chrome, Firefox, and Edge on desktop OSes
-    - Last 2 versions of Safari
-    - Latest release of official Element Desktop app on desktop OSes
-    - Desktop OSes means macOS, Windows, and Linux versions for desktop devices
-      that are actively supported by the OS vendor and receive security updates
-- Best effort
-    - Definition:
-        - Issues **accepted**, regressions **do not block** the release
-        - The wider Element Products(including Element Call and the Enterprise Server Suite) do still not officially support these browsers.
-        - The element web project and its contributors should keep the client functioning and gracefully degrade where other sibling features (E.g. Element Call) may not function.
-    - Last major release of Firefox ESR and Chrome/Edge Extended Stable
-- Community Supported
-    - Definition:
-        - Issues **accepted**, regressions **do not block** the release
-        - Community contributions are welcome to support these issues
-    - Mobile web for current stable version of Chrome, Firefox, and Safari on Android, iOS, and iPadOS
-- Not supported
-    - Definition: Issues only affecting unsupported environments are **closed**
-    - Everything else
-
-The period of support for these tiers should last until the releases specified above, plus 1 app release cycle(2 weeks). In the case of Firefox ESR this is extended further to allow it land in Debian Stable.
+-   Supported
+    -   Definition: Issues **actively triaged**, regressions **block** the release
+    -   Last 2 major versions of Chrome, Firefox, and Edge on desktop OSes
+    -   Last 2 versions of Safari
+    -   Latest release of official Element Desktop app on desktop OSes
+    -   Desktop OSes means macOS, Windows, and Linux versions for desktop devices
+        that are actively supported by the OS vendor and receive security updates
+-   Experimental
+    -   Definition: Issues **accepted**, regressions **do not block** the release
+    -   Element as an installed PWA via current stable version of Chrome
+    -   Mobile web for current stable version of Chrome, Firefox, and Safari on Android, iOS, and iPadOS
+-   Not supported
+    -   Definition: Issues only affecting unsupported environments are **closed**
+    -   Everything else
 
 For accessing Element on an Android or iOS device, we currently recommend the
 native apps [element-android](https://github.com/element-hq/element-android)
@@ -74,16 +64,16 @@ situation, but it's still not good practice to do it in the first place. See
 Unless you have special requirements, you will want to add the following to
 your web server configuration when hosting Element Web:
 
-- The `X-Frame-Options: SAMEORIGIN` header, to prevent Element Web from being
-  framed and protect from [clickjacking][owasp-clickjacking].
-- The `frame-ancestors 'self'` directive to your `Content-Security-Policy`
-  header, as the modern replacement for `X-Frame-Options` (though both should be
-  included since not all browsers support it yet, see
-  [this][owasp-clickjacking-csp]).
-- The `X-Content-Type-Options: nosniff` header, to [disable MIME
-  sniffing][mime-sniffing].
-- The `X-XSS-Protection: 1; mode=block;` header, for basic XSS protection in
-  legacy browsers.
+-   The `X-Frame-Options: SAMEORIGIN` header, to prevent Element Web from being
+    framed and protect from [clickjacking][owasp-clickjacking].
+-   The `frame-ancestors 'self'` directive to your `Content-Security-Policy`
+    header, as the modern replacement for `X-Frame-Options` (though both should be
+    included since not all browsers support it yet, see
+    [this][owasp-clickjacking-csp]).
+-   The `X-Content-Type-Options: nosniff` header, to [disable MIME
+    sniffing][mime-sniffing].
+-   The `X-XSS-Protection: 1; mode=block;` header, for basic XSS protection in
+    legacy browsers.
 
 [mime-sniffing]: https://developer.mozilla.org/en-US/docs/Web/HTTP/Basics_of_HTTP/MIME_types#mime_sniffing
 [owasp-clickjacking-csp]: https://cheatsheetseries.owasp.org/cheatsheets/Clickjacking_Defense_Cheat_Sheet.html#content-security-policy-frame-ancestors-examples
@@ -182,11 +172,141 @@ Dockerfile.
 
 # Development
 
-Please read through the following:
+Before attempting to develop on Element you **must** read the [developer guide
+for `matrix-react-sdk`](https://github.com/matrix-org/matrix-react-sdk#developer-guide), which
+also defines the design, architecture and style for Element too.
 
-1. [Developer guide](./developer_guide.md)
-2. [Code style](./code_style.md)
-3. [Contribution guide](./CONTRIBUTING.md)
+Read the [Choosing an issue](docs/choosing-an-issue.md) page for some guidance
+about where to start. Before starting work on a feature, it's best to ensure
+your plan aligns well with our vision for Element. Please chat with the team in
+[#element-dev:matrix.org](https://matrix.to/#/#element-dev:matrix.org) before
+you start so we can ensure it's something we'd be willing to merge.
+
+You should also familiarise yourself with the ["Here be Dragons" guide
+](https://docs.google.com/document/d/12jYzvkidrp1h7liEuLIe6BMdU0NUjndUYI971O06ooM)
+to the tame & not-so-tame dragons (gotchas) which exist in the codebase.
+
+The idea of Element is to be a relatively lightweight "skin" of customisations on
+top of the underlying `matrix-react-sdk`. `matrix-react-sdk` provides both the
+higher and lower level React components useful for building Matrix communication
+apps using React.
+
+Please note that Element is intended to run correctly without access to the public
+internet. So please don't depend on resources (JS libs, CSS, images, fonts)
+hosted by external CDNs or servers but instead please package all dependencies
+into Element itself.
+
+CSS hot-reload is available as an opt-in development feature. You can enable it
+by defining a `CSS_HOT_RELOAD` environment variable, in a `.env` file in the root
+of the repository. See `.env.example` for documentation and an example.
+
+# Setting up a dev environment
+
+Much of the functionality in Element is actually in the `matrix-react-sdk` and
+`matrix-js-sdk` modules. It is possible to set these up in a way that makes it
+easy to track the `develop` branches in git and to make local changes without
+having to manually rebuild each time.
+
+First clone and build `matrix-js-sdk`:
+
+```bash
+git clone https://github.com/matrix-org/matrix-js-sdk.git
+pushd matrix-js-sdk
+yarn link
+yarn install
+popd
+```
+
+Then similarly with `matrix-react-sdk`:
+
+```bash
+git clone https://github.com/matrix-org/matrix-react-sdk.git
+pushd matrix-react-sdk
+yarn link
+yarn link matrix-js-sdk
+yarn install
+popd
+```
+
+Clone the repo and switch to the `element-web` directory:
+
+```bash
+git clone https://github.com/element-hq/element-web.git
+cd element-web
+```
+
+Configure the app by copying `config.sample.json` to `config.json` and
+modifying it. See the [configuration docs](docs/config.md) for details.
+
+Finally, build and start Element itself:
+
+```bash
+yarn link matrix-js-sdk
+yarn link matrix-react-sdk
+yarn install
+yarn start
+```
+
+Wait a few seconds for the initial build to finish; you should see something like:
+
+```
+[element-js] <s> [webpack.Progress] 100%
+[element-js]
+[element-js] ℹ ｢wdm｣:    1840 modules
+[element-js] ℹ ｢wdm｣: Compiled successfully.
+```
+
+Remember, the command will not terminate since it runs the web server
+and rebuilds source files when they change. This development server also
+disables caching, so do NOT use it in production.
+
+Open <http://127.0.0.1:8080/> in your browser to see your newly built Element.
+
+**Note**: The build script uses inotify by default on Linux to monitor directories
+for changes. If the inotify limits are too low your build will fail silently or with
+`Error: EMFILE: too many open files`. To avoid these issues, we recommend a watch limit
+of at least `128M` and instance limit around `512`.
+
+You may be interested in issues [#15750](https://github.com/element-hq/element-web/issues/15750) and
+[#15774](https://github.com/element-hq/element-web/issues/15774) for further details.
+
+To set a new inotify watch and instance limit, execute:
+
+```
+sudo sysctl fs.inotify.max_user_watches=131072
+sudo sysctl fs.inotify.max_user_instances=512
+sudo sysctl -p
+```
+
+If you wish, you can make the new limits permanent, by executing:
+
+```
+echo fs.inotify.max_user_watches=131072 | sudo tee -a /etc/sysctl.conf
+echo fs.inotify.max_user_instances=512 | sudo tee -a /etc/sysctl.conf
+sudo sysctl -p
+```
+
+---
+
+When you make changes to `matrix-react-sdk` or `matrix-js-sdk` they should be
+automatically picked up by webpack and built.
+
+If any of these steps error with, `file table overflow`, you are probably on a mac
+which has a very low limit on max open files. Run `ulimit -Sn 1024` and try again.
+You'll need to do this in each new terminal you open before building Element.
+
+## Running the tests
+
+There are a number of application-level tests in the `tests` directory; these
+are designed to run with Jest and JSDOM. To run them
+
+```
+yarn test
+```
+
+### End-to-End tests
+
+See [matrix-react-sdk](https://github.com/matrix-org/matrix-react-sdk/#end-to-end-tests) for how to run the end-to-end tests.
 
 # Translations
 
@@ -199,18 +319,3 @@ For a developer guide, see the [translating dev doc](docs/translating-dev.md).
 Issues are triaged by community members and the Web App Team, following the [triage process](https://github.com/element-hq/element-meta/wiki/Triage-process).
 
 We use [issue labels](https://github.com/element-hq/element-meta/wiki/Issue-labelling) to sort all incoming issues.
-
-## Copyright & License
-
-Copyright (c) 2014-2017 OpenMarket Ltd
-Copyright (c) 2017 Vector Creations Ltd
-Copyright (c) 2017-2025 New Vector Ltd
-
-This software is multi licensed by New Vector Ltd (Element). It can be used either:
-
-(1) for free under the terms of the GNU Affero General Public License (as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version); OR
-
-(2) for free under the terms of the GNU General Public License (as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version); OR
-
-(3) under the terms of a paid-for Element Commercial License agreement between you and Element (the terms of which may vary depending on what you and Element have agreed to).
-Unless required by applicable law or agreed to in writing, software distributed under the Licenses is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the Licenses for the specific language governing permissions and limitations under the Licenses.

__mocks__/empty.js

@@ -1,2 +0,0 @@
-// Yes, this is empty.
-module.exports = {};

__mocks__/imageMock.js

@@ -1 +0,0 @@
-module.exports = "image-file-stub";

__mocks__/languages.json

@@ -1,4 +0,0 @@
-{
-    "en": "en_EN.json",
-    "en-us": "en_US.json"
-}

__mocks__/maplibre-gl.js

@@ -1,41 +0,0 @@
-/*
-Copyright 2024 New Vector Ltd.
-Copyright 2022 The Matrix.org Foundation C.I.C.
-
-SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
-Please see LICENSE files in the repository root for full details.
-*/
-
-const EventEmitter = require("events");
-const { LngLat, NavigationControl, LngLatBounds } = require("maplibre-gl");
-
-class MockMap extends EventEmitter {
-    addControl = jest.fn();
-    removeControl = jest.fn();
-    zoomIn = jest.fn();
-    zoomOut = jest.fn();
-    setCenter = jest.fn();
-    setStyle = jest.fn();
-    fitBounds = jest.fn();
-    remove = jest.fn();
-}
-const MockMapInstance = new MockMap();
-
-class MockAttributionControl {}
-class MockGeolocateControl extends EventEmitter {
-    trigger = jest.fn();
-}
-const MockGeolocateInstance = new MockGeolocateControl();
-const MockMarker = {};
-MockMarker.setLngLat = jest.fn().mockReturnValue(MockMarker);
-MockMarker.addTo = jest.fn().mockReturnValue(MockMarker);
-MockMarker.remove = jest.fn().mockReturnValue(MockMarker);
-module.exports = {
-    Map: jest.fn().mockReturnValue(MockMapInstance),
-    GeolocateControl: jest.fn().mockReturnValue(MockGeolocateInstance),
-    Marker: jest.fn().mockReturnValue(MockMarker),
-    LngLat,
-    LngLatBounds,
-    NavigationControl,
-    AttributionControl: MockAttributionControl,
-};

__mocks__/svg.js

@@ -1,2 +0,0 @@
-export const Icon = "div";
-export default "image-file-stub";

__mocks__/workerFactoryMock.js

@@ -1,11 +0,0 @@
-/*
-Copyright 2024 New Vector Ltd.
-Copyright 2023 The Matrix.org Foundation C.I.C.
-
-SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
-Please see LICENSE files in the repository root for full details.
-*/
-
-export default function workerFactory(options) {
-    return jest.fn;
-}

babel.config.js

@@ -10,24 +10,24 @@ module.exports = {
                     "last 2 Safari versions",
                     "last 2 Edge versions",
                 ],
-                include: ["@babel/plugin-transform-class-properties"],
             },
         ],
-        ["@babel/preset-typescript", { allowDeclareFields: true }],
+        "@babel/preset-typescript",
         "@babel/preset-react",
     ],
     plugins: [
         "@babel/plugin-proposal-export-default-from",
-        "@babel/plugin-transform-numeric-separator",
-        "@babel/plugin-transform-object-rest-spread",
-        "@babel/plugin-transform-optional-chaining",
-        "@babel/plugin-transform-nullish-coalescing-operator",
+        "@babel/plugin-proposal-numeric-separator",
+        "@babel/plugin-proposal-class-properties",
+        "@babel/plugin-proposal-object-rest-spread",
+        "@babel/plugin-proposal-optional-chaining",
+        "@babel/plugin-proposal-nullish-coalescing-operator",
 
         // transform logical assignment (??=, ||=, &&=). preset-env doesn't
         // normally bother with these (presumably because all the target
         // browsers support it natively), but they make our webpack version (or
         // something downstream of babel, at least) fall over.
-        "@babel/plugin-transform-logical-assignment-operators",
+        "@babel/plugin-proposal-logical-assignment-operators",
 
         "@babel/plugin-syntax-dynamic-import",
         "@babel/plugin-transform-runtime",

code_style.md

@@ -3,8 +3,18 @@
 This code style applies to projects which the element-web team directly maintains or is reasonably
 adjacent to. As of writing, these are:
 
-- element-desktop
-- element-web
+-   element-desktop
+-   element-web
+-   matrix-react-sdk
+-   matrix-js-sdk
+
+Other projects might extend this code style for increased strictness. For example, matrix-events-sdk
+has stricter code organization to reduce the maintenance burden. These projects will declare their code
+style within their own repos.
+
+Note that some requirements will be layer-specific. Where the requirements don't make sense for the
+project, they are used to the best of their ability, used in spirit, or ignored if not applicable,
+in that order.
 
 ## Guiding principles
 
@@ -215,29 +225,21 @@ Unless otherwise specified, the following applies to all code:
     }
     ```
 
-37. Avoid functions whose fundamental behaviour varies with different parameter types.
-    Multiple return types are fine, but if the function's behaviour is going to change significantly,
-    have two separate functions. For example, `SDKConfig.get()` with a string param which returns the
-    type according to the param given is ok, but `SDKConfig.get()` with no args returning the whole
-    config object would not be: this should just be a separate function.
-
 ## React
 
 Inheriting all the rules of TypeScript, the following additionally apply:
 
-1. Component source files are named with upper camel case (e.g. views/rooms/EventTile.js)
-2. They are organised in a typically two-level hierarchy - first whether the component is a view or a structure, and then a broad functional grouping (e.g. 'rooms' here)
-3. Types for lifecycle functions are not required (render, componentDidMount, and so on).
-4. Class components must always have a `Props` interface declared immediately above them. It can be
+1. Types for lifecycle functions are not required (render, componentDidMount, and so on).
+2. Class components must always have a `Props` interface declared immediately above them. It can be
    empty if the component accepts no props.
-5. Class components should have an `State` interface declared immediately above them, but after `Props`.
-6. Props and State should not be exported. Use `React.ComponentProps<typeof ComponentNameHere>`
+3. Class components should have an `State` interface declared immediately above them, but after `Props`.
+4. Props and State should not be exported. Use `React.ComponentProps<typeof ComponentNameHere>`
    instead.
-7. One component per file, except when a component is a utility component specifically for the "primary"
+5. One component per file, except when a component is a utility component specifically for the "primary"
    component. The utility component should not be exported.
-8. Exported constants, enums, interfaces, functions, etc must be separate from files containing components
+6. Exported constants, enums, interfaces, functions, etc must be separate from files containing components
    or stores.
-9. Stores should use a singleton pattern with a static instance property:
+7. Stores should use a singleton pattern with a static instance property:
 
     ```typescript
     class FooStore {
@@ -254,41 +256,44 @@ Inheriting all the rules of TypeScript, the following additionally apply:
     }
     ```
 
-10. Stores must support using an alternative MatrixClient and dispatcher instance.
-11. Utilities which require JSX must be split out from utilities which do not. This is to prevent import
-    cycles during runtime where components accidentally include more of the app than they intended.
-12. Interdependence between stores should be kept to a minimum. Break functions and constants out to utilities
+8. Stores must support using an alternative MatrixClient and dispatcher instance.
+9. Utilities which require JSX must be split out from utilities which do not. This is to prevent import
+   cycles during runtime where components accidentally include more of the app than they intended.
+10. Interdependence between stores should be kept to a minimum. Break functions and constants out to utilities
     if at all possible.
-13. A component should only use CSS class names in line with the component name.
+11. A component should only use CSS class names in line with the component name.
 
     1. When knowingly using a class name from another component, document it with a [comment](#comments).
 
-14. Curly braces within JSX should be padded with a space, however properties on those components should not.
+12. Curly braces within JSX should be padded with a space, however properties on those components should not.
     See above code example.
-15. Functions used as properties should either be defined on the class or stored in a variable. They should not
+13. Functions used as properties should either be defined on the class or stored in a variable. They should not
     be inline unless mocking/short-circuiting the value.
-16. Prefer hooks (functional components) over class components. Be consistent with the existing area if unsure
+14. Prefer hooks (functional components) over class components. Be consistent with the existing area if unsure
     which should be used.
     1. Unless the component is considered a "structure", in which case use classes.
-17. Write more views than structures. Structures are chunks of functionality like MatrixChat while views are
+15. Write more views than structures. Structures are chunks of functionality like MatrixChat while views are
     isolated components.
-18. Components should serve a single, or near-single, purpose.
-19. Prefer to derive information from component properties rather than establish state.
-20. Do not use `React.Component::forceUpdate`.
+16. Components should serve a single, or near-single, purpose.
+17. Prefer to derive information from component properties rather than establish state.
+18. Do not use `React.Component::forceUpdate`.
 
 ## Stylesheets (\*.pcss = PostCSS + Plugins)
 
 Note: We use PostCSS + some plugins to process our styles. It looks like SCSS, but actually it is not.
 
-1. The view's CSS file MUST have the same name as the component (e.g. `view/rooms/_MessageTile.css` for `MessageTile.tsx` component).
-2. Per-view CSS is optional - it could choose to inherit all its styling from the context of the rest of the app, although this is unusual.
-3. Class names must be prefixed with "mx\_".
-4. Class names must strictly denote the component which defines them.
-   For example: `mx_MyFoo` for `MyFoo` component.
-5. Class names for DOM elements within a view which aren't components are named by appending a lower camel case identifier to the view's class name - e.g. .mx_MyFoo_randomDiv is how you'd name the class of an arbitrary div within the MyFoo view.
-6. Use the `$font` variables instead of manual values.
-7. Keep indentation/nesting to a minimum. Maximum suggested nesting is 5 layers.
-8. Use the whole class name instead of shortcuts:
+1. Class names must be prefixed with "mx\_".
+2. Class names must denote the component which defines them, followed by any context.
+   The context is not further specified here in terms of meaning or syntax.
+   Use whatever is appropriate for your implementation use case.
+   Some examples:
+    1. `mx_MyFoo`
+    2. `mx_MyFoo_avatar`
+    3. `mx_MyFoo_avatarUser`
+    4. `mx_MyFoo_avatar--user`
+3. Use the `$font` variables instead of manual values.
+4. Keep indentation/nesting to a minimum. Maximum suggested nesting is 5 layers.
+5. Use the whole class name instead of shortcuts:
 
     ```scss
     .mx_MyFoo {
@@ -299,7 +304,7 @@ Note: We use PostCSS + some plugins to process our styles. It looks like SCSS, b
     }
     ```
 
-9. Break multiple selectors over multiple lines this way:
+6. Break multiple selectors over multiple lines this way:
 
     ```scss
     .mx_MyFoo,
@@ -309,9 +314,9 @@ Note: We use PostCSS + some plugins to process our styles. It looks like SCSS, b
     }
     ```
 
-10. Non-shared variables should use $lowerCamelCase. Shared variables use $dashed-naming.
-11. Overrides to Z indexes, adjustments of dimensions/padding with pixels, and so on should all be
-    [documented](#comments) for what the values mean:
+7. Non-shared variables should use $lowerCamelCase. Shared variables use $dashed-naming.
+8. Overrides to Z indexes, adjustments of dimensions/padding with pixels, and so on should all be
+   [documented](#comments) for what the values mean:
 
     ```scss
     .mx_MyFoo {
@@ -321,9 +326,7 @@ Note: We use PostCSS + some plugins to process our styles. It looks like SCSS, b
     }
     ```
 
-12. Avoid the use of `!important`. If `!important` is necessary, add a [comment](#comments) explaining why.
-13. The CSS for a component can override the rules for child components. For instance, .mxRoomList .mx_RoomTile {} would be the selector to override styles of RoomTiles when viewed in the context of a RoomList view. Overrides must be scoped to the View's CSS class - i.e. don't just define .mx_RoomTile {} in RoomList.css - only RoomTile.css is allowed to define its own CSS. Instead, say .mx_RoomList .mx_RoomTile {} to scope the override only to the context of RoomList views. N.B. overrides should be relatively rare as in general CSS inheritance should be enough.
-14. Components should render only within the bounding box of their outermost DOM element. Page-absolute positioning and negative CSS margins and similar are generally not cool and stop the component from being reused easily in different places.
+9. Avoid the use of `!important`. If `!important` is necessary, add a [comment](#comments) explaining why.
 
 ## Tests
 

components.json

@@ -1 +1,5 @@
-{}
+{
+    "src/components/views/auth/AuthFooter.tsx": "src/components/views/auth/VectorAuthFooter.tsx",
+    "src/components/views/auth/AuthHeaderLogo.tsx": "src/components/views/auth/VectorAuthHeaderLogo.tsx",
+    "src/components/views/auth/AuthPage.tsx": "src/components/views/auth/VectorAuthPage.tsx"
+}

config.sample.json

@@ -12,7 +12,6 @@
     "disable_guests": false,
     "disable_login_language_selector": false,
     "disable_3pid_login": false,
-    "force_verification": false,
     "brand": "Element",
     "integrations_ui_url": "https://scalar.vector.im/",
     "integrations_rest_url": "https://scalar.vector.im/api",
@@ -23,7 +22,6 @@
         "https://scalar-staging.vector.im/api",
         "https://scalar-staging.riot.im/scalar/api"
     ],
-    "default_widget_container_height": 280,
     "default_country_code": "GB",
     "show_labs_settings": false,
     "features": {},

contribute.json

@@ -3,7 +3,7 @@
     "description": "A glossy Matrix collaboration client for the web.",
     "repository": {
         "url": "https://github.com/element-hq/element-web",
-        "license": "AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial"
+        "license": "Apache License 2.0"
     },
     "bugs": {
         "list": "https://github.com/element-hq/element-web/issues",

debian/control

@@ -8,6 +8,6 @@ Package: element-web
 Architecture: all
 Recommends: httpd, element-io-archive-keyring
 Description:
-  Element: the future of secure communication
+  A feature-rich client for Matrix.org
   This package contains the web-based client that can be served through a web
    server.

developer_guide.md

@@ -1,126 +0,0 @@
-# Developer Guide
-
-## Development
-
-Read the [Choosing an issue](docs/choosing-an-issue.md) page for some guidance
-about where to start. Before starting work on a feature, it's best to ensure
-your plan aligns well with our vision for Element. Please chat with the team in
-[#element-dev:matrix.org](https://matrix.to/#/#element-dev:matrix.org) before
-you start so we can ensure it's something we'd be willing to merge.
-
-You should also familiarise yourself with the ["Here be Dragons" guide
-](https://docs.google.com/document/d/12jYzvkidrp1h7liEuLIe6BMdU0NUjndUYI971O06ooM)
-to the tame & not-so-tame dragons (gotchas) which exist in the codebase.
-
-Please note that Element is intended to run correctly without access to the public
-internet. So please don't depend on resources (JS libs, CSS, images, fonts)
-hosted by external CDNs or servers but instead please package all dependencies
-into Element itself.
-
-## Setting up a dev environment
-
-Much of the functionality in Element is actually in the `matrix-js-sdk` module.
-It is possible to set these up in a way that makes it easy to track the `develop` branches
-in git and to make local changes without having to manually rebuild each time.
-
-First clone and build `matrix-js-sdk`:
-
-```bash
-git clone https://github.com/matrix-org/matrix-js-sdk.git
-pushd matrix-js-sdk
-yarn link
-yarn install
-popd
-```
-
-Clone the repo and switch to the `element-web` directory:
-
-```bash
-git clone https://github.com/element-hq/element-web.git
-cd element-web
-```
-
-Configure the app by copying `config.sample.json` to `config.json` and
-modifying it. See the [configuration docs](docs/config.md) for details.
-
-Finally, build and start Element itself:
-
-```bash
-yarn link matrix-js-sdk
-yarn install
-yarn start
-```
-
-Wait a few seconds for the initial build to finish; you should see something like:
-
-```
-[element-js] <s> [webpack.Progress] 100%
-[element-js]
-[element-js] ℹ ｢wdm｣:    1840 modules
-[element-js] ℹ ｢wdm｣: Compiled successfully.
-```
-
-Remember, the command will not terminate since it runs the web server
-and rebuilds source files when they change. This development server also
-disables caching, so do NOT use it in production.
-
-Open <http://127.0.0.1:8080/> in your browser to see your newly built Element.
-
-**Note**: The build script uses inotify by default on Linux to monitor directories
-for changes. If the inotify limits are too low your build will fail silently or with
-`Error: EMFILE: too many open files`. To avoid these issues, we recommend a watch limit
-of at least `128M` and instance limit around `512`.
-
-You may be interested in issues [#15750](https://github.com/element-hq/element-web/issues/15750) and
-[#15774](https://github.com/element-hq/element-web/issues/15774) for further details.
-
-To set a new inotify watch and instance limit, execute:
-
-```
-sudo sysctl fs.inotify.max_user_watches=131072
-sudo sysctl fs.inotify.max_user_instances=512
-sudo sysctl -p
-```
-
-If you wish, you can make the new limits permanent, by executing:
-
-```
-echo fs.inotify.max_user_watches=131072 | sudo tee -a /etc/sysctl.conf
-echo fs.inotify.max_user_instances=512 | sudo tee -a /etc/sysctl.conf
-sudo sysctl -p
-```
-
----
-
-When you make changes to `matrix-js-sdk` they should be automatically picked up by webpack and built.
-
-If any of these steps error with, `file table overflow`, you are probably on a mac
-which has a very low limit on max open files. Run `ulimit -Sn 1024` and try again.
-You'll need to do this in each new terminal you open before building Element.
-
-## Running the tests
-
-There are a number of application-level tests in the `tests` directory; these
-are designed to run with Jest and JSDOM. To run them
-
-```
-yarn test
-```
-
-### End-to-End tests
-
-See [matrix-react-sdk](https://github.com/matrix-org/matrix-react-sdk/#end-to-end-tests) for how to run the end-to-end tests.
-
-## General github guidelines
-
-1. **Pull requests must only be filed against the `develop` branch.**
-2. Try to keep your pull requests concise. Split them up if necessary.
-3. Ensure that you provide a description that explains the fix/feature and its intent.
-
-## Adding new code
-
-New code should be committed as follows:
-
-- All new components: https://github.com/element-hq/element-web/tree/develop/src/components
-- CSS: https://github.com/element-hq/element-web/tree/develop/res/css
-- Theme specific CSS & resources: https://github.com/element-hq/element-web/tree/develop/res/themes

docs/MVVM.md

@@ -1,67 +0,0 @@
-# MVVM
-
-General description of the pattern can be found [here](https://en.wikipedia.org/wiki/Model%E2%80%93view%E2%80%93viewmodel). But the gist of it is that you divide your code into three sections:
-
-1. Model: This is where the business logic and data resides.
-2. View Model: This code exists to provide the logic necessary for the UI. It directly uses the Model code.
-3. View: This is the UI code itself and depends on the view model.
-
-If you do MVVM right, your view should be dumb i.e it gets data from the view model and merely displays it.
-
-### Practical guidelines for MVVM in element-web
-
-#### Model
-
-This is anywhere your data or business logic comes from. If your view model is accessing something simple exposed from `matrix-js-sdk`, then the sdk is your model. If you're using something more high level in element-web to get your data/logic (eg: `MemberListStore`), then that becomes your model.
-
-#### View Model
-
-1. View model is always a custom react hook named like `useFooViewModel()`.
-2. The return type of your view model (known as view state) must be defined as a typescript interface:
-    ```ts
-    inteface FooViewState {
-    	somethingUseful: string;
-    	somethingElse: BarType;
-    	update: () => Promise<void>
-    	...
-    }
-    ```
-3. Any react state that your UI needs must be in the view model.
-
-#### View
-
-1. Views are simple react components (eg: `FooView`).
-2. Views usually start by calling the view model hook, eg:
-    ```tsx
-    const FooView: React.FC<IProps> = (props: IProps) => {
-    	const vm = useFooViewModel();
-    	....
-    	return(
-    		<div>
-    			{vm.somethingUseful}
-    		</div>
-    	);
-    }
-    ```
-3. Views are also allowed to accept the view model as a prop, eg:
-    ```tsx
-    const FooView: React.FC<IProps> = ({ vm }: IProps) => {
-    	....
-    	return(
-    		<div>
-    			{vm.somethingUseful}
-    		</div>
-    	);
-    }
-    ```
-4. Multiple views can share the same view model if necessary.
-
-### Benefits
-
-1. MVVM forces a separation of concern i.e we will no longer have large react components that have a lot of state and rendering code mixed together. This improves code readability and makes it easier to introduce changes.
-2. Introduces the possibility of code reuse. You can reuse an old view model with a new view or vice versa.
-3. Adding to the point above, in future you could import element-web view models to your project and supply your own views thus creating something similar to the [hydrogen sdk](https://github.com/element-hq/hydrogen-web/blob/master/doc/SDK.md).
-
-### Example
-
-We started experimenting with MVVM in the redesigned memberlist, you can see the code [here](https://github.com/vector-im/element-web/blob/develop/src/components/views/rooms/MemberList/MemberListView.tsx).

docs/SUMMARY.md

@@ -1,55 +1,41 @@
 # Summary
 
-- [Introduction](../README.md)
+-   [Introduction](../README.md)
 
 # Usage
 
-- [Betas](betas.md)
-- [Labs](labs.md)
+-   [Betas](betas.md)
+-   [Labs](labs.md)
 
 # Setup
 
-- [Install](install.md)
-- [Config](config.md)
-- [Custom home page](custom-home.md)
-- [Kubernetes](kubernetes.md)
-- [Jitsi](jitsi.md)
-- [Encryption](e2ee.md)
+-   [Install](install.md)
+-   [Config](config.md)
+-   [Custom home page](custom-home.md)
+-   [Kubernetes](kubernetes.md)
+-   [Jitsi](jitsi.md)
+-   [Encryption](e2ee.md)
 
 # Build
 
-- [Customisations](customisations.md)
-- [Modules](modules.md)
-- [Native Node modules](native-node-modules.md)
+-   [Customisations](customisations.md)
+-   [Modules](modules.md)
+-   [Native Node modules](native-node-modules.md)
 
 # Contribution
 
-- [Choosing an issue](choosing-an-issue.md)
-- [Translation](translating.md)
-- [Netlify builds](pr-previews.md)
-- [Code review](review.md)
+-   [Choosing an issue](choosing-an-issue.md)
+-   [Translation](translating.md)
+-   [Netlify builds](pr-previews.md)
+-   [Code review](review.md)
 
 # Development
 
-- [App load order](app-load.md)
-- [Translation](translating-dev.md)
-- [Theming](theming.md)
-- [Playwright end to end tests](playwright.md)
-- [Memory profiling](memory-profiles-and-leaks.md)
-- [Jitsi](jitsi-dev.md)
-- [Feature flags](feature-flags.md)
-- [OIDC and delegated authentication](oidc.md)
-- [Release Process](release.md)
-
-# Deep dive
-
-- [Skinning](skinning.md)
-- [Cider editor](ciderEditor.md)
-- [Iconography](icons.md)
-- [Jitsi](jitsi.md)
-- [Local echo](local-echo-dev.md)
-- [Media](media-handling.md)
-- [Room List Store](room-list-store.md)
-- [Scrolling](scrolling.md)
-- [Usercontent](usercontent.md)
-- [Widget layouts](widget-layouts.md)
+-   [App load order](app-load.md)
+-   [Translation](translating-dev.md)
+-   [Theming](theming.md)
+-   [Memory profiling](memory-profiles-and-leaks.md)
+-   [Jitsi](jitsi-dev.md)
+-   [Feature flags](feature-flags.md)
+-   [OIDC and delegated authentication](oidc.md)
+-   [Release Process](release.md)

docs/app-load.md

@@ -61,18 +61,18 @@ flowchart TD
 
 Key:
 
-- Parallelogram: async/await task
-- Box: sync task
-- Diamond: conditional branch
-- Circle: user interaction
-- Blue arrow: async task is allowed to settle but allowed to fail
-- Red arrow: async task success is asserted
+-   Parallelogram: async/await task
+-   Box: sync task
+-   Diamond: conditional branch
+-   Circle: user interaction
+-   Blue arrow: async task is allowed to settle but allowed to fail
+-   Red arrow: async task success is asserted
 
 Notes:
 
-- A task begins when all its dependencies (arrows going into it) are fulfilled.
-- The success of setting up rageshake is never asserted, element-web has a fallback path for running without IDB (and thus rageshake).
-- Everything is awaited to be settled before the Modernizr check, to allow it to make use of things like i18n if they are successful.
+-   A task begins when all its dependencies (arrows going into it) are fulfilled.
+-   The success of setting up rageshake is never asserted, element-web has a fallback path for running without IDB (and thus rageshake).
+-   Everything is awaited to be settled before the Modernizr check, to allow it to make use of things like i18n if they are successful.
 
 Underlying dependencies:
 

docs/choosing-an-issue.md

@@ -19,7 +19,8 @@ If you're looking for inspiration on where to start, keep reading!
 
 All the issues for Element Web live in the
 [element-web](https://github.com/element-hq/element-web) repository, including
-issues that actually need fixing in one of the related repos.
+issues that actually need fixing in `matrix-react-sdk` or one of the related
+repos.
 
 The first place to look is for
 [issues tagged with "good first issue"](https://github.com/element-hq/element-web/issues?q=is%3Aopen+is%3Aissue+label%3A%22good+first+issue%22).
@@ -32,19 +33,19 @@ someone to add something.
 When you're looking through the list, here are some things that might make an
 issue a **GOOD** choice:
 
-- It is a problem or feature you care about.
-- It concerns a type of code you know a little about.
-- You think you can understand what's needed.
-- It already has approval from Element Web's designers (look for comments from
-  members of the
-  [Product](https://github.com/orgs/element-hq/teams/product/members) or
-  [Design](https://github.com/orgs/element-hq/teams/design/members) teams).
+-   It is a problem or feature you care about.
+-   It concerns a type of code you know a little about.
+-   You think you can understand what's needed.
+-   It already has approval from Element Web's designers (look for comments from
+    members of the
+    [Product](https://github.com/orgs/element-hq/teams/product/members) or
+    [Design](https://github.com/orgs/element-hq/teams/design/members) teams).
 
 Here are some things that might make it a **BAD** choice:
 
-- You don't understand it (maybe add a comment asking a clarifying question).
-- It sounds difficult, or is part of a larger change you don't know about.
-- **It is tagged with `X-Needs-Design` or `X-Needs-Product`.**
+-   You don't understand it (maybe add a comment asking a clarifying question).
+-   It sounds difficult, or is part of a larger change you don't know about.
+-   **It is tagged with `X-Needs-Design` or `X-Needs-Product`.**
 
 **Element Web's Design and Product teams tend to be very busy**, so if you make
 changes that require approval from one of those teams, you will probably have

docs/ciderEditor.md

@@ -1,71 +0,0 @@
-# The CIDER (Contenteditable-Input-Diff-Error-Reconcile) editor
-
-The CIDER editor is a custom editor written for Element.
-Most of the code can be found in the `/editor/` directory.
-It is used to power the composer main composer (both to send and edit messages), and might be used for other usecases where autocomplete is desired (invite box, ...).
-
-## High-level overview.
-
-The editor is backed by a model that contains parts.
-A part has some text and a type (plain text, pill, ...). When typing in the editor,
-the model validates the input and updates the parts.
-The parts are then reconciled with the DOM.
-
-## Inner workings
-
-When typing in the `contenteditable` element, the `input` event fires and
-the DOM of the editor is turned into a string. The way this is done has
-some logic to it to deal with adding newlines for block elements, to make sure
-the caret offset is calculated in the same way as the content string, and to ignore
-caret nodes (more on that later).
-For these reasons it doesn't use `innerText`, `textContent` or anything similar.
-The model addresses any content in the editor within as an offset within this string.
-The caret position is thus also converted from a position in the DOM tree
-to an offset in the content string. This happens in `getCaretOffsetAndText` in `dom.ts`.
-
-Once the content string and caret offset is calculated, it is passed to the `update()`
-method of the model. The model first calculates the same content string of its current parts,
-basically just concatenating their text. It then looks for differences between
-the current and the new content string. The diffing algorithm is very basic,
-and assumes there is only one change around the caret offset,
-so this should be very inexpensive. See `diff.ts` for details.
-
-The result of the diffing is the strings that were added and/or removed from
-the current content. These differences are then applied to the parts,
-where parts can apply validation logic to these changes.
-
-For example, if you type an @ in some plain text, the plain text part rejects
-that character, and this character is then presented to the part creator,
-which will turn it into a pill candidate part.
-Pill candidate parts are what opens the auto completion, and upon picking a completion,
-replace themselves with an actual pill which can't be edited anymore.
-
-The diffing is needed to preserve state in the parts apart from their text
-(which is the only thing the model receives from the DOM), e.g. to build
-the model incrementally. Any text that didn't change is assumed
-to leave the parts it intersects alone.
-
-The benefit of this is that we can use the `input` event, which is broadly supported,
-to find changes in the editor. We don't have to rely on keyboard events,
-which relate poorly to text input or changes, and don't need the `beforeinput` event,
-which isn't broadly supported yet.
-
-Once the parts of the model are updated, the DOM of the editor is then reconciled
-with the new model state, see `renderModel` in `render.ts` for this.
-If the model didn't reject the input and didn't make any additional changes,
-this won't make any changes to the DOM at all, and should thus be fairly efficient.
-
-For the browser to allow the user to place the caret between two pills,
-or between a pill and the start and end of the line, we need some extra DOM nodes.
-These DOM nodes are called caret nodes, and contain an invisble character, so
-the caret can be placed into them. The model is unaware of caret nodes, and they
-are only added to the DOM during the render phase. Likewise, when calculating
-the content string, caret nodes need to be ignored, as they would confuse the model.
-
-As part of the reconciliation, the caret position is also adjusted to any changes
-the model made to the input. The caret is passed around in two formats.
-The model receives the caret _offset_ within the content string (which includes
-an atNodeEnd flag to make it unambiguous if it is at a part and or the next part start).
-The model converts this to a caret _position_ internally, which has a partIndex
-and an offset within the part text, which is more natural to work with.
-From there on, the caret _position_ is used, also during reconciliation.

docs/config.md

@@ -109,7 +109,7 @@ instance. As of writing those settings are not fully documented, however a few a
     }
     ```
     These values will take priority over the hardcoded defaults for the settings. For a list of available settings, see
-    [Settings.tsx](https://github.com/element-hq/element-web/blob/develop/src/settings/Settings.tsx).
+    [Settings.tsx](https://github.com/matrix-org/matrix-react-sdk/blob/develop/src/settings/Settings.tsx).
 
 ## Customisation & branding
 
@@ -137,7 +137,7 @@ complete re-branding/private labeling, a more personalised experience can be ach
    This setting is ignored if your homeserver provides `/.well-known/matrix/client` in its well-known location, and the JSON file
    at that location has a key `m.tile_server` (or the unstable version `org.matrix.msc3488.tile_server`). In this case, the
    configuration found in the well-known location is used instead.
-10. `welcome_user_id`: **DEPRECATED** An optional user ID to start a DM with after creating an account. Defaults to nothing (no DM created).
+10. `welcome_user_id`: An optional user ID to start a DM with after creating an account. Defaults to nothing (no DM created).
 11. `custom_translations_url`: An optional URL to allow overriding of translatable strings. The JSON file must be in a format of
     `{"affected|translation|key": {"languageCode": "new string"}}`. See https://github.com/matrix-org/matrix-react-sdk/pull/7886 for details.
 12. `branding`: Options for configuring various assets used within the app. Described in more detail down below.
@@ -154,8 +154,7 @@ complete re-branding/private labeling, a more personalised experience can be ach
     2. `description`: Required. The description to use for the notice.
     3. `show_once`: Optional. If true then the notice will only be shown once per device.
 18. `help_url`: The URL to point users to for help with the app, defaults to `https://element.io/help`.
-19. `help_encryption_url`: The URL to point users to for help with encryption, defaults to `https://element.io/help#encryption`.
-20. `force_verification`: If true, users must verify new logins (eg. with another device / their recovery key)
+19. `help_encrption_url`: The URL to point users to for help with encryption, defaults to `https://element.io/help#encryption`.
 
 ### `desktop_builds` and `mobile_builds`
 
@@ -163,15 +162,11 @@ These two options describe the various availability for the application. When th
 such as trying to get the user to use an Android app or the desktop app for encrypted search, the config options will be looked
 at to see if the link should be to somewhere else.
 
-Starting with `desktop_builds`, the following sub-properties are available:
+Starting with `desktop_builds`, the following subproperties are available:
 
 1. `available`: Required. When `true`, the desktop app can be downloaded from somewhere.
 2. `logo`: Required. A URL to a logo (SVG), intended to be shown at 24x24 pixels.
 3. `url`: Required. The download URL for the app. This is used as a hyperlink.
-4. `url_macos`: Optional. Direct link to download macOS desktop app.
-5. `url_win64`: Optional. Direct link to download Windows x86 64-bit desktop app.
-6. `url_win64arm`: Optional. Direct link to download Windows ARM 64-bit desktop app.
-7. `url_linux`: Optional. Direct link to download Linux desktop app.
 
 When `desktop_builds` is not specified at all, the app will assume desktop downloads are available from https://element.io
 
@@ -255,60 +250,17 @@ When Element is deployed alongside a homeserver with SSO-only login, some option
    user can be sent to in order to log them out of that system too, making logout symmetric between Element and the SSO system.
 2. `sso_redirect_options`: Options to define how to handle unauthenticated users. If the object contains `"immediate": true`, then
    all unauthenticated users will be automatically redirected to the SSO system to start their login. If instead you'd only like to
-   have users which land on the welcome page to be redirected, use `"on_welcome_page": true`. Additionally, there is an option to
-   redirect anyone landing on the login page, by using `"on_login_page": true`. As an example:
+   have users which land on the welcome page to be redirected, use `"on_welcome_page": true`. As an example:
     ```json
     {
         "sso_redirect_options": {
             "immediate": false,
-            "on_welcome_page": true,
-            "on_login_page": true
+            "on_welcome_page": true
         }
     }
     ```
     It is most common to use the `immediate` flag instead of `on_welcome_page`.
 
-## Native OIDC
-
-Native OIDC support is currently in labs and is subject to change.
-
-Static OIDC Client IDs are preferred and can be specified under `oidc_static_clients` as a mapping from `issuer` to configuration object containing `client_id`.
-Issuer must have a trailing forward slash. As an example:
-
-```json
-{
-    "oidc_static_clients": {
-        "https://auth.example.com/": {
-            "client_id": "example-client-id"
-        }
-    }
-}
-```
-
-If a matching static client is not found, the app will attempt to dynamically register a client using metadata specified under `oidc_metadata`.
-The app has sane defaults for the metadata properties below but on stricter policy identity providers they may not pass muster, e.g. `contacts` may be required.
-The following subproperties are available:
-
-1. `client_uri`: This is the base URI for the OIDC client registration, typically `logo_uri`, `tos_uri`, and `policy_uri` must be either on the same domain or a subdomain of this URI.
-2. `logo_uri`: Optional URI for the client logo.
-3. `tos_uri`: Optional URI for the client's terms of service.
-4. `policy_uri`: Optional URI for the client's privacy policy.
-5. `contacts`: Optional list of contact emails for the client.
-
-As an example:
-
-```json
-{
-    "oidc_metadata": {
-        "client_uri": "https://example.com",
-        "logo_uri": "https://example.com/logo.png",
-        "tos_uri": "https://example.com/tos",
-        "policy_uri": "https://example.com/policy",
-        "contacts": ["support@example.com"]
-    }
-}
-```
-
 ## VoIP / Jitsi calls
 
 Currently, Element uses Jitsi to offer conference calls in rooms, with an experimental Element Call implementation in the works.
@@ -379,8 +331,8 @@ The VoIP and Jitsi options are:
     }
     ```
     The `widget` is the `content` of a normal widget state event. The `layout` is the layout specifier for the widget being created,
-    as defined by the `io.element.widgets.layout` state event. By default this applies to all rooms, but the behaviour can be skipped for
-    2-person rooms, causing Element to fall back to 1:1 VoIP, by setting the option `widget_build_url_ignore_dm` to `true`.
+    as defined by the `io.element.widgets.layout` state event. By default this applies to all rooms, but the behaviour can be skipped for DMs
+    by setting the option `widget_build_url_ignore_dm` to `true`.
 5. `audio_stream_url`: Optional URL to pass to Jitsi to enable live streaming. This option is considered experimental and may be removed
    at any time without notice.
 6. `element_call`: Optional configuration for native group calls using Element Call, with the following subkeys:
@@ -392,12 +344,6 @@ The VoIP and Jitsi options are:
       this number is exceeded, the user will not be able to join a given call.
     - `brand`: Optional name for the app. Defaults to `Element Call`. This is
       used throughout the application in various strings/locations.
-    - `guest_spa_url`: Optional URL for an Element Call single-page app (SPA),
-      for guest links. If this is set, Element Web will expose a "join" link
-      for public video rooms, which can then be shared to non-matrix users.
-      The target Element Call SPA is typically set up to use a homeserver that
-      allows users to register without email ("passwordless guest users") and to
-      federate.
 
 ## Bug reporting
 
@@ -453,12 +399,6 @@ If you would like to use Scalar, the integration manager maintained by Element,
 }
 ```
 
-For widgets in general (from an integration manager or not) there is also:
-
-- `default_widget_container_height`
-
-This controls the height that the top widget panel initially appears as and is the height in pixels, default 280.
-
 ## Administrative options
 
 If you would like to include a custom message when someone is reporting an event, set the following Markdown-capable field:
@@ -551,38 +491,38 @@ preferences.
 
 Currently, the following UI feature flags are supported:
 
-- `UIFeature.urlPreviews` - Whether URL previews are enabled across the entire application.
-- `UIFeature.feedback` - Whether prompts to supply feedback are shown.
-- `UIFeature.voip` - Whether or not VoIP is shown readily to the user. When disabled,
-  Jitsi widgets will still work though they cannot easily be added.
-- `UIFeature.widgets` - Whether or not widgets will be shown.
-- `UIFeature.advancedSettings` - Whether or not sections titled "advanced" in room and
-  user settings are shown to the user.
-- `UIFeature.shareQrCode` - Whether or not the QR code on the share room/event dialog
-  is shown.
-- `UIFeature.shareSocial` - Whether or not the social icons on the share room/event dialog
-  are shown.
-- `UIFeature.identityServer` - Whether or not functionality requiring an identity server
-  is shown. When disabled, the user will not be able to interact with the identity
-  server (sharing email addresses, 3PID invites, etc).
-- `UIFeature.thirdPartyId` - Whether or not UI relating to third party identifiers (3PIDs)
-  is shown. Typically this is considered "contact information" on the homeserver, and is
-  not directly related to the identity server.
-- `UIFeature.registration` - Whether or not the registration page is accessible. Typically
-  useful if accounts are managed externally.
-- `UIFeature.passwordReset` - Whether or not the password reset page is accessible. Typically
-  useful if accounts are managed externally.
-- `UIFeature.deactivate` - Whether or not the deactivate account button is accessible. Typically
-  useful if accounts are managed externally.
-- `UIFeature.advancedEncryption` - Whether or not advanced encryption options are shown to the
-  user.
-- `UIFeature.roomHistorySettings` - Whether or not the room history settings are shown to the user.
-  This should only be used if the room history visibility options are managed by the server.
-- `UIFeature.TimelineEnableRelativeDates` - Display relative date separators (eg: 'Today', 'Yesterday') in the
-  timeline for recent messages. When false day dates will be used.
-- `UIFeature.BulkUnverifiedSessionsReminder` - Display popup reminders to verify or remove unverified sessions. Defaults
-  to true.
-- `UIFeature.locationSharing` - Whether or not location sharing menus will be shown.
+-   `UIFeature.urlPreviews` - Whether URL previews are enabled across the entire application.
+-   `UIFeature.feedback` - Whether prompts to supply feedback are shown.
+-   `UIFeature.voip` - Whether or not VoIP is shown readily to the user. When disabled,
+    Jitsi widgets will still work though they cannot easily be added.
+-   `UIFeature.widgets` - Whether or not widgets will be shown.
+-   `UIFeature.advancedSettings` - Whether or not sections titled "advanced" in room and
+    user settings are shown to the user.
+-   `UIFeature.shareQrCode` - Whether or not the QR code on the share room/event dialog
+    is shown.
+-   `UIFeature.shareSocial` - Whether or not the social icons on the share room/event dialog
+    are shown.
+-   `UIFeature.identityServer` - Whether or not functionality requiring an identity server
+    is shown. When disabled, the user will not be able to interact with the identity
+    server (sharing email addresses, 3PID invites, etc).
+-   `UIFeature.thirdPartyId` - Whether or not UI relating to third party identifiers (3PIDs)
+    is shown. Typically this is considered "contact information" on the homeserver, and is
+    not directly related to the identity server.
+-   `UIFeature.registration` - Whether or not the registration page is accessible. Typically
+    useful if accounts are managed externally.
+-   `UIFeature.passwordReset` - Whether or not the password reset page is accessible. Typically
+    useful if accounts are managed externally.
+-   `UIFeature.deactivate` - Whether or not the deactivate account button is accessible. Typically
+    useful if accounts are managed externally.
+-   `UIFeature.advancedEncryption` - Whether or not advanced encryption options are shown to the
+    user.
+-   `UIFeature.roomHistorySettings` - Whether or not the room history settings are shown to the user.
+    This should only be used if the room history visibility options are managed by the server.
+-   `UIFeature.TimelineEnableRelativeDates` - Display relative date separators (eg: 'Today', 'Yesterday') in the
+    timeline for recent messages. When false day dates will be used.
+-   `UIFeature.BulkUnverifiedSessionsReminder` - Display popup reminders to verify or remove unverified sessions. Defaults
+    to true.
+-   `UIFeature.locationSharing` - Whether or not location sharing menus will be shown.
 
 ## Undocumented / developer options
 
@@ -592,4 +532,4 @@ The following are undocumented or intended for developer use only.
 2. `sync_timeline_limit`
 3. `dangerously_allow_unsafe_and_insecure_passwords`
 4. `latex_maths_delims`: An optional setting to override the default delimiters used for maths parsing. See https://github.com/matrix-org/matrix-react-sdk/pull/5939 for details. Only used when `feature_latex_maths` is enabled.
-5. `modules`: An optional list of modules to load. This is used for testing and development purposes only.
+5. `voice_broadcast.chunk_length`: Target chunk length in seconds for the Voice Broadcast feature currently under development.

docs/customisations.md

@@ -11,8 +11,8 @@ Customisations will be removed from the codebase in a future release.
 Element Web and the React SDK support "customisation points" that can be used to
 easily add custom logic specific to a particular deployment of Element Web.
 
-An example of this is the [media customisations
-module](https://github.com/element-hq/element-web/blob/develop/src/customisations/Media.ts).
+An example of this is the [security customisations
+module](https://github.com/matrix-org/matrix-react-sdk/blob/develop/src/customisations/Security.ts).
 This module in the React SDK only defines some empty functions and their types:
 it does not do anything by default.
 
@@ -21,14 +21,14 @@ Web so that you can add your own code. Even though the default module is part of
 the React SDK, you can still override it from the Element Web layer:
 
 1. Copy the default customisation module to
-   `element-web/src/customisations/YourNameMedia.ts`
+   `element-web/src/customisations/YourNameSecurity.ts`
 2. Edit customisations points and make sure export the ones you actually want to
    activate
 3. Create/add an entry to `customisations.json` next to the webpack config:
 
 ```json
 {
-    "src/customisations/Media.ts": "src/customisations/YourNameMedia.ts"
+    "src/customisations/Security.ts": "src/customisations/YourNameSecurity.ts"
 }
 ```
 
@@ -50,11 +50,11 @@ that properties/state machines won't change.
 
 UI for some actions can be hidden via the ComponentVisibility customisation:
 
-- inviting users to rooms and spaces,
-- creating rooms,
-- creating spaces,
+-   inviting users to rooms and spaces,
+-   creating rooms,
+-   creating spaces,
 
-To customise visibility create a customisation module from [ComponentVisibility](https://github.com/element-hq/element-web/blob/master/src/customisations/ComponentVisibility.ts) following the instructions above.
+To customise visibility create a customisation module from [ComponentVisibility](https://github.com/matrix-org/matrix-react-sdk/blob/master/src/customisations/ComponentVisibility.ts) following the instructions above.
 
 `shouldShowComponent` determines whether the active MatrixClient user should be able to use
 the given UI component. When `shouldShowComponent` returns falsy all UI components for that feature will be hidden.

docs/e2ee.md

@@ -31,9 +31,9 @@ Set the following on your homeserver's
 
 When `force_disable` is true:
 
-- all rooms will be created with encryption disabled, and it will not be possible to enable
-  encryption from room settings.
-- any `io.element.e2ee.default` value will be disregarded.
+-   all rooms will be created with encryption disabled, and it will not be possible to enable
+    encryption from room settings.
+-   any `io.element.e2ee.default` value will be disregarded.
 
 Note: If the server is configured to forcibly enable encryption for some or all rooms,
 this behaviour will be overridden.

docs/feature-flags.md

@@ -5,10 +5,10 @@ flexibility and control over when and where those features are enabled.
 
 For example, flags make the following things possible:
 
-- Extended testing of a feature via labs on develop
-- Enabling features when ready instead of the first moment the code is released
-- Testing a feature with a specific set of users (by enabling only on a specific
-  Element instance)
+-   Extended testing of a feature via labs on develop
+-   Enabling features when ready instead of the first moment the code is released
+-   Testing a feature with a specific set of users (by enabling only on a specific
+    Element instance)
 
 The size of the feature controlled by a feature flag may vary widely: it could
 be a large project like reactions or a smaller change to an existing algorithm.
@@ -35,7 +35,7 @@ clients commit to doing the associated clean up work once a feature stabilises.
 When starting work on a feature, we should create a matching feature flag:
 
 1. Add a new
-   [setting](https://github.com/element-hq/element-web/blob/develop/src/settings/Settings.tsx)
+   [setting](https://github.com/matrix-org/matrix-react-sdk/blob/develop/src/settings/Settings.tsx)
    of the form:
 
 ```js
@@ -93,14 +93,14 @@ Once we're confident that a feature is working well, we should remove or convert
 
 If the feature is meant to be turned off/on by the user:
 
-1. Remove `isFeature` from the [setting](https://github.com/element-hq/element-web/blob/develop/src/settings/Settings.ts)
+1. Remove `isFeature` from the [setting](https://github.com/matrix-org/matrix-react-sdk/blob/develop/src/settings/Settings.ts)
 2. Change the `default` to `true` (if desired).
 3. Remove the feature from the [labs documentation](https://github.com/element-hq/element-web/blob/develop/docs/labs.md)
 4. Celebrate! 🥳
 
 If the feature is meant to be forced on (non-configurable):
 
-1. Remove the [setting](https://github.com/element-hq/element-web/blob/develop/src/settings/Settings.ts)
+1. Remove the [setting](https://github.com/matrix-org/matrix-react-sdk/blob/develop/src/settings/Settings.ts)
 2. Remove all `getValue` lines that test for the feature.
 3. Remove the feature from the [labs documentation](https://github.com/element-hq/element-web/blob/develop/docs/labs.md)
 4. If applicable, remove the feature state from

docs/features/README.md

@@ -1,6 +0,0 @@
-# Feature documention
-
-The idea of this folder is to document the features we support in different parts of the app.
-In case anyone needs to work on a given part, and isn't aware of all the features in the area,
-they will hopefully get an idea for all the supported functionality to know what to take into account
-when making changes.

docs/features/composer.md

@@ -1,38 +0,0 @@
-# Composer Features
-
-## Auto Complete
-
-- Hitting tab tries to auto-complete the word before the caret as a room member
-    - If no matching name is found, a visual bell is shown
-- @ + a letter opens auto complete for members starting with the given letter
-    - When inserting a user pill at the start in the composer, a colon and space is appended to the pill
-    - When inserting a user pill anywhere else in composer, only a space is appended to the pill
-- # + a letter opens auto complete for rooms starting with the given letter
-- : open auto complete for emoji
-- Pressing arrow-up/arrow-down while the autocomplete is open navigates between auto complete options
-- Pressing tab while the autocomplete is open goes to the next autocomplete option,
-  wrapping around at the end after reverting to the typed text first.
-
-## Formatting
-
-- When selecting text, a formatting bar appears above the selection.
-- The formatting bar allows to format the selected test as:
-  bold, italic, strikethrough, a block quote, and a code block (inline if no linebreak is selected).
-- Formatting is applied as markdown syntax.
-- Hitting ctrl/cmd+B also marks the selected text as bold
-- Hitting ctrl/cmd+I also marks the selected text as italic
-- Hitting ctrl/cmd+> also marks the selected text as a blockquote
-
-## Misc
-
-- When hitting the arrow-up button while having the caret at the start in the composer,
-  the last message sent by the syncing user is edited.
-- Clicking a display name on an event in the timeline inserts a user pill into the composer
-- Emoticons (like :-), >:-), :-/, ...) are replaced by emojis while typing if the relevant setting is enabled
-- Typing in the composer sends typing notifications in the room
-- Pressing ctrl/mod+z and ctrl/mod+y undoes/redoes modifications
-- Pressing shift+enter inserts a line break
-- Pressing enter sends the message.
-- Choosing "Quote" in the context menu of an event inserts a quote of the event body in the composer.
-- Choosing "Reply" in the context menu of an event shows a preview above the composer to reply to.
-- Pressing alt+arrow up/arrow down navigates in previously sent messages, putting them in the composer.

docs/features/keyboardShortcuts.md

@@ -1,59 +0,0 @@
-# Keyboard shortcuts
-
-## Using the `KeyBindingManager`
-
-The `KeyBindingManager` (accessible using `getKeyBindingManager()`) is a class
-with several methods that allow you to get a `KeyBindingAction` based on a
-`KeyboardEvent | React.KeyboardEvent`.
-
-The event passed to the `KeyBindingManager` gets compared to the list of
-shortcuts that are retrieved from the `IKeyBindingsProvider`s. The
-`IKeyBindingsProvider` is in `KeyBindingDefaults`.
-
-### Examples
-
-Let's say we want to close a menu when the correct keys were pressed:
-
-```ts
-const onKeyDown = (ev: KeyboardEvent): void => {
-    let handled = true;
-    const action = getKeyBindingManager().getAccessibilityAction(ev);
-    switch (action) {
-        case KeyBindingAction.Escape:
-            closeMenu();
-            break;
-        default:
-            handled = false;
-            break;
-    }
-
-    if (handled) {
-        ev.preventDefault();
-        ev.stopPropagation();
-    }
-};
-```
-
-## Managing keyboard shortcuts
-
-There are a few things at play when it comes to keyboard shortcuts. The
-`KeyBindingManager` gets `IKeyBindingsProvider`s one of which is
-`defaultBindingsProvider` defined in `KeyBindingDefaults`. In
-`KeyBindingDefaults` a `getBindingsByCategory()` method is used to create
-`KeyBinding`s based on `KeyboardShortcutSetting`s defined in
-`KeyboardShortcuts`.
-
-### Adding keyboard shortcuts
-
-To add a keyboard shortcut there are two files we have to look at:
-`KeyboardShortcuts.ts` and `KeyBindingDefaults.ts`. In most cases we only need
-to edit `KeyboardShortcuts.ts`: add a `KeyBindingAction` and add the
-`KeyBindingAction` to the `KEYBOARD_SHORTCUTS` object.
-
-Though, to make matters worse, sometimes we want to add a shortcut that has
-multiple keybindings associated with. This keyboard shortcut won't be
-customizable as it would be rather difficult to manage both from the point of
-the settings and the UI. To do this, we have to add a `KeyBindingAction` and add
-the UI representation of that keyboard shortcut to the `getUIOnlyShortcuts()`
-method. Then, we also need to add the keybinding to the correct method in
-`KeyBindingDefaults`.

docs/icons.md

@@ -1,56 +0,0 @@
-# Icons
-
-Icons are loaded using [@svgr/webpack](https://www.npmjs.com/package/@svgr/webpack).
-This is configured in [element-web](https://github.com/vector-im/element-web/blob/develop/webpack.config.js#L458).
-
-Each `.svg` exports a `ReactComponent` at the named export `Icon`.
-Icons have `role="presentation"` and `aria-hidden` automatically applied. These can be overriden by passing props to the icon component.
-
-SVG file recommendations:
-
-- Colours should not be defined absolutely. Use `currentColor` instead.
-- SVG files should be taken from the design compound as they are. Some icons contain special padding.
-  This means that there should be icons for each size, e.g. warning-16px and warning-32px.
-
-Example usage:
-
-```
-import { Icon as FavoriteIcon } from 'res/img/element-icons/favorite.svg';
-
-const MyComponent = () => {
-    return <>
-        <FavoriteIcon className="mx_Icon mx_Icon_16">
-    </>;
-}
-```
-
-If possible, use the icon classes from [here](../res/css/compound/_Icon.pcss).
-
-## Custom styling
-
-Icon components are svg elements and may be custom styled as usual.
-
-`_MyComponents.pcss`:
-
-```css
-.mx_MyComponent-icon {
-    height: 20px;
-    width: 20px;
-
-    * {
-        fill: $accent;
-    }
-}
-```
-
-`MyComponent.tsx`:
-
-```typescript
-import { Icon as FavoriteIcon } from 'res/img/element-icons/favorite.svg';
-
-const MyComponent = () => {
-    return <>
-        <FavoriteIcon className="mx_MyComponent-icon" role="img" aria-hidden="false">
-    </>;
-}
-```

docs/install.md

@@ -41,15 +41,7 @@ The Docker image can be used to serve element-web as a web server. The easiest w
 it is to use the prebuilt image:
 
 ```bash
-docker run --rm -p 127.0.0.1:80:80 vectorim/element-web
-```
-
-A server can also be made available to clients outside the local host by omitting the
-explicit local address as described in
-[docker run documentation](https://docs.docker.com/engine/reference/commandline/run/#publish-or-expose-port--p---expose):
-
-```bash
-docker run --rm -p 80:80 vectorim/element-web
+docker run -p 80:80 vectorim/element-web
 ```
 
 To supply your own custom `config.json`, map a volume to `/app/config.json`. For example,
@@ -57,25 +49,9 @@ if your custom config was located at `/etc/element-web/config.json` then your Do
 would be:
 
 ```bash
-docker run --rm -p 127.0.0.1:80:80 -v /etc/element-web/config.json:/app/config.json vectorim/element-web
+docker run -p 80:80 -v /etc/element-web/config.json:/app/config.json vectorim/element-web
 ```
 
-The Docker image is configured to run as an unprivileged (non-root) user by
-default. This should be fine on modern Docker runtimes, but binding to port 80
-on other runtimes may require root privileges. To resolve this, either run the
-image as root (`docker run --user 0`) or, better, change the port that nginx
-listens on via the `ELEMENT_WEB_PORT` environment variable.
-
-The behaviour of the docker image can be customised via the following
-environment variables:
-
-- `ELEMENT_WEB_PORT`
-
-    The port to listen on (within the docker container) for HTTP
-    traffic. Defaults to `80`.
-
-### Building the docker image
-
 To build the image yourself:
 
 ```bash
@@ -91,6 +67,8 @@ element-web branch and then run:
 ```bash
 docker build -t \
     --build-arg USE_CUSTOM_SDKS=true \
+    --build-arg REACT_SDK_REPO="https://github.com/matrix-org/matrix-react-sdk.git" \
+    --build-arg REACT_SDK_BRANCH="develop" \
     --build-arg JS_SDK_REPO="https://github.com/matrix-org/matrix-js-sdk.git" \
     --build-arg JS_SDK_BRANCH="develop" \
     .

docs/jitsi.md

@@ -70,41 +70,3 @@ The domain used is the one specified by the `/.well-known/matrix/client` endpoin
 For active Jitsi widgets in the room, a native Jitsi widget UI is created and points to the instance specified in the `domain` key of the widget content data.
 
 Element Android manages allowed native widgets permissions a bit differently than web widgets (as the data shared are different and never shared with the widget URL). For Jitsi widgets, permissions are requested only once per domain (consent saved in account data).
-
-# Jitsi Wrapper
-
-**Note**: These are developer docs. Please consult your client's documentation for
-instructions on setting up Jitsi.
-
-The react-sdk wraps all Jitsi call widgets in a local wrapper called `jitsi.html`
-which takes several parameters:
-
-_Query string_:
-
-- `widgetId`: The ID of the widget. This is needed for communication back to the
-  react-sdk.
-- `parentUrl`: The URL of the parent window. This is also needed for
-  communication back to the react-sdk.
-
-_Hash/fragment (formatted as a query string)_:
-
-- `conferenceDomain`: The domain to connect Jitsi Meet to.
-- `conferenceId`: The room or conference ID to connect Jitsi Meet to.
-- `isAudioOnly`: Boolean for whether this is a voice-only conference. May not
-  be present, should default to `false`.
-- `startWithAudioMuted`: Boolean for whether the calls start with audio
-  muted. May not be present.
-- `startWithVideoMuted`: Boolean for whether the calls start with video
-  muted. May not be present.
-- `displayName`: The display name of the user viewing the widget. May not
-  be present or could be null.
-- `avatarUrl`: The HTTP(S) URL for the avatar of the user viewing the widget. May
-  not be present or could be null.
-- `userId`: The MXID of the user viewing the widget. May not be present or could
-  be null.
-
-The react-sdk will assume that `jitsi.html` is at the path of wherever it is currently
-being served. For example, `https://develop.element.io/jitsi.html` or `vector://webapp/jitsi.html`.
-
-The `jitsi.html` wrapper can use the react-sdk's `WidgetApi` to communicate, making
-it easier to actually implement the feature.

docs/labs.md

@@ -72,13 +72,18 @@ theme definition.
 
 For some sample themes, check out [aaronraimist/element-themes](https://github.com/aaronraimist/element-themes).
 
+## Dehydrated devices (`feature_dehydration`)
+
+Allows users to receive encrypted messages by creating a device that is stored
+encrypted on the server, as described in [MSC2697](https://github.com/matrix-org/matrix-doc/pull/2697).
+
 ## Live location sharing (`feature_location_share_live`) [In Development]
 
 Enables sharing your current location to the timeline, with live updates.
 
 ## Video rooms (`feature_video_rooms`)
 
-Enables support for creating video rooms, which are persistent video chats that users can jump in and out of.
+Enables support for creating and joining video rooms, which are persistent video chats that users can jump in and out of.
 
 ## Element Call video rooms (`feature_element_call_video_rooms`) [In Development]
 
@@ -88,7 +93,7 @@ This flag will not have any effect unless `feature_video_rooms` is also enabled.
 
 ## New group call experience (`feature_group_calls`) [In Development]
 
-This feature allows users to place native [MSC3401](https://github.com/matrix-org/matrix-spec-proposals/pull/3401) group calls in compatible rooms, using Element Call.
+This feature allows users to place and join native [MSC3401](https://github.com/matrix-org/matrix-spec-proposals/pull/3401) group calls in compatible rooms, using Element Call.
 
 If you're enabling this at the deployment level, you may also want to reference the docs for the `element_call` config section.
 
@@ -105,6 +110,16 @@ This is useful while we experiment with encryption and to make calling compatibl
 
 Enables rendering of MD / HTML in room topics.
 
+## Use the Rust cryptography implementation (`feature_rust_crypto`) [In Development]
+
+Configures Element to use a new cryptography implementation based on the [matrix-rust-sdk](https://github.com/matrix-org/matrix-rust-sdk).
+
+This setting is (currently) _sticky_ to a user's session: it only takes effect when the user logs in to a new session. Likewise, even after disabling the setting in `config.json`, the Rust implementation will remain in use until users log out.
+
+## New room header & details (`feature_new_room_decoration_ui`) [In Development]
+
+Refactors visually the room header and room sidebar
+
 ## Enable the notifications panel in the room header (`feature_notifications`)
 
 Unreliable in encrypted rooms.
@@ -112,7 +127,3 @@ Unreliable in encrypted rooms.
 ## Knock rooms (`feature_ask_to_join`) [In Development]
 
 Enables knock feature for rooms. This allows users to ask to join a room.
-
-## New room list (`feature_new_room_list`) [In Development]
-
-Enable the new room list that is currently in development.

docs/local-echo-dev.md

@@ -1,38 +0,0 @@
-# Local echo (developer docs)
-
-The React SDK provides some local echo functionality to allow for components to do something
-quickly and fall back when it fails. This is all available in the `local-echo` directory within
-`stores`.
-
-Echo is handled in EchoChambers, with `GenericEchoChamber` being the base implementation for all
-chambers. The `EchoChamber` class is provided as semantic access to a `GenericEchoChamber`
-implementation, such as the `RoomEchoChamber` (which handles echoable details of a room).
-
-Anything that can be locally echoed will be provided by the `GenericEchoChamber` implementation.
-The echo chamber will also need to deal with external changes, and has full control over whether
-or not something has successfully been echoed.
-
-An `EchoContext` is provided to echo chambers (usually with a matching type: `RoomEchoContext`
-gets provided to a `RoomEchoChamber` for example) with details about their intended area of
-effect, as well as manage `EchoTransaction`s. An `EchoTransaction` is simply a unit of work that
-needs to be locally echoed.
-
-The `EchoStore` manages echo chamber instances, builds contexts, and is generally less semantically
-accessible than the `EchoChamber` class. For separation of concerns, and to try and keep things
-tidy, this is an intentional design decision.
-
-**Note**: The local echo stack uses a "whenable" pattern, which is similar to thenables and
-`EventEmitter`. Whenables are ways of actioning a changing condition without having to deal
-with listeners being torn down. Once the reference count of the Whenable causes garbage collection,
-the Whenable's listeners will also be torn down. This is accelerated by the `IDestroyable` interface
-usage.
-
-## Audit functionality
-
-The UI supports a "Server isn't responding" dialog which includes a partial audit log-like
-structure to it. This is partially the reason for added complexity of `EchoTransaction`s
-and `EchoContext`s - this information feeds the UI states which then provide direct retry
-mechanisms.
-
-The `EchoStore` is responsible for ensuring that the appropriate non-urgent toast (lower left)
-is set up, where the dialog then drives through the contexts and transactions.

docs/media-handling.md

@@ -1,19 +0,0 @@
-# Media handling
-
-Surely media should be as easy as just putting a URL into an `img` and calling it good, right?
-Not quite. Matrix uses something called a Matrix Content URI (better known as MXC URI) to identify
-content, which is then converted to a regular HTTPS URL on the homeserver. However, sometimes that
-URL can change depending on deployment considerations.
-
-The react-sdk features a [customisation endpoint](https://github.com/vector-im/element-web/blob/develop/docs/customisations.md)
-for media handling where all conversions from MXC URI to HTTPS URL happen. This is to ensure that
-those obscure deployments can route all their media to the right place.
-
-For development, there are currently two functions available: `mediaFromMxc` and `mediaFromContent`.
-The `mediaFromMxc` function should be self-explanatory. `mediaFromContent` takes an event content as
-a parameter and will automatically parse out the source media and thumbnail. Both functions return
-a `Media` object with a number of options on it, such as getting various common HTTPS URLs for the
-media.
-
-**It is extremely important that all media calls are put through this customisation endpoint.** So
-much so it's a lint rule to avoid accidental use of the wrong functions.

docs/modules.md

@@ -23,11 +23,11 @@ the current directory as the build context (the `.` in `docker build -t my-eleme
 ## Writing modules
 
 While writing modules is meant to be easy, not everything is possible yet. For modules which want to do something we haven't
-exposed in the module API, the module API will need to be updated. This means a PR to both this repo
-and [`matrix-react-sdk-module-api`](https://github.com/matrix-org/matrix-react-sdk-module-api).
+exposed in the module API, the module API will need to be updated. This means a PR to both the
+[`matrix-react-sdk`](https://github.com/matrix-org/matrix-react-sdk) and [`matrix-react-sdk-module-api`](https://github.com/matrix-org/matrix-react-sdk-module-api).
 
 Once your change to the module API is accepted, the `@matrix-org/react-sdk-module-api` dependency gets updated at the
-`element-web` layer (usually by us, the maintainers) to ensure your module can operate.
+`matrix-react-sdk` and `element-web` layers (usually by us, the maintainers) to ensure your module can operate.
 
 If you're not adding anything to the module API, or your change was accepted per above, then start off with a clone of
 our [ILAG module](https://github.com/element-hq/element-web-ilag-module) which will give you a general idea for what the

docs/oidc.md

@@ -1,9 +1,29 @@
 # OIDC and delegated authentication
 
+## Compatibility/OIDC-aware mode
+
+[MSC2965: OIDC provider discovery](https://github.com/matrix-org/matrix-spec-proposals/pull/2965)
+[MSC3824: OIDC aware clients](https://github.com/matrix-org/matrix-spec-proposals/pull/3824)
+This mode uses an SSO flow to gain a `loginToken` from the authentication provider, then continues with SSO login.
+Element Web uses [MSC2965: OIDC provider discovery](https://github.com/matrix-org/matrix-spec-proposals/pull/2965) to discover the configured provider.
+Wherever valid MSC2965 configuration is discovered, OIDC-aware login flow will be the only option offered.
+
+## (🧪Experimental) OIDC-native flow
+
+Can be enabled by a config-level-only setting in `config.json`
+
+```json
+{
+    "features": {
+        "feature_oidc_native_flow": true
+    }
+}
+```
+
 See https://areweoidcyet.com/client-implementation-guide/ for implementation details.
 
 Element Web uses [MSC2965: OIDC provider discovery](https://github.com/matrix-org/matrix-spec-proposals/pull/2965) to discover the configured provider.
-Where a valid MSC2965 configuration is discovered, OIDC native login flow will be the only login option offered.
+Where OIDC native login flow is enabled and valid MSC2965 configuration is discovered, OIDC native login flow will be the only login option offered.
 Element Web will attempt to [dynamically register](https://openid.net/specs/openid-connect-registration-1_0.html) with the configured OP.
 Then, authentication will be completed [as described here](https://areweoidcyet.com/client-implementation-guide/).