Merge branch 'develop' into renovate/react-types

.github/cfp_headers

@@ -1,4 +1,5 @@
 /*
+  ! Access-Control-Allow-Origin
   X-XSS-Protection: 1; mode=block
   X-Content-Type-Options: nosniff
   Strict-Transport-Security: max-age=31536000; includeSubDomains; preload

.github/workflows/dockerhub.yaml

@@ -18,22 +18,22 @@ jobs:
                   fetch-depth: 0 # needed for docker-package to be able to calculate the version
 
             - name: Set up QEMU
-              uses: docker/setup-qemu-action@e81a89b1732b9c48d79cd809d8d81d79c4647a18 # v2
+              uses: docker/setup-qemu-action@2b82ce82d56a2a04d2637cd93a637ae1b359c0a7 # v2
 
             - name: Set up Docker Buildx
-              uses: docker/setup-buildx-action@4b4e9c3e2d4531116a6f8ba8e71fc6e2cb6e6c8c # v2
+              uses: docker/setup-buildx-action@ecf95283f03858871ff00b787d79c419715afc34 # v2
               with:
                   install: true
 
             - name: Login to Docker Hub
-              uses: docker/login-action@f4ef78c080cd8ba55a85445d5b36e214a81df20a # v2
+              uses: docker/login-action@465a07811f14bebb1938fbed4728c6a1ff8901fc # v2
               with:
                   username: ${{ secrets.DOCKERHUB_USERNAME }}
                   password: ${{ secrets.DOCKERHUB_TOKEN }}
 
             - name: Docker meta
               id: meta
-              uses: docker/metadata-action@c4ee3adeed93b1fa6a762f209fb01608c1a22f1e # v4
+              uses: docker/metadata-action@818d4b7b91585d195f67373fd9cb0332e31a7175 # v4
               with:
                   images: |
                       vectorim/element-web
@@ -44,7 +44,7 @@ jobs:
                       latest=${{ contains(github.ref_name, '-rc.') && 'false' || 'auto' }}
 
             - name: Build and push
-              uses: docker/build-push-action@3b5e8027fcad23fda98b2e3ac259d8d67585f671 # v4
+              uses: docker/build-push-action@2eb1c1961a95fc15694676618e422e8ba1d63825 # v4
               with:
                   context: .
                   push: true
@@ -53,7 +53,7 @@ jobs:
                   labels: ${{ steps.meta.outputs.labels }}
 
             - name: Update repo description
-              uses: peter-evans/dockerhub-description@579f64ca0abced29dbbc44ab4c6a0b9e33ab3588 # v3
+              uses: peter-evans/dockerhub-description@dc67fad7001ef9e8e3c124cb7a64e16d0a63d864 # v3
               continue-on-error: true
               with:
                   username: ${{ secrets.DOCKERHUB_USERNAME }}

CHANGELOG.md

@@ -1,3 +1,25 @@
+Changes in [1.11.34](https://github.com/vector-im/element-web/releases/tag/v1.11.34) (2023-06-20)
+=================================================================================================
+
+## ✨ Features
+ * OIDC: add delegatedauthentication to validated server config ([\#11053](https://github.com/matrix-org/matrix-react-sdk/pull/11053)). Contributed by @kerryarchibald.
+ * Allow image pasting in plain mode in RTE ([\#11056](https://github.com/matrix-org/matrix-react-sdk/pull/11056)). Contributed by @alunturner.
+ * Show room options menu if "UIComponent.roomOptionsMenu" is enabled ([\#10365](https://github.com/matrix-org/matrix-react-sdk/pull/10365)). Contributed by @maheichyk.
+ * Allow image pasting in rich text mode in RTE ([\#11049](https://github.com/matrix-org/matrix-react-sdk/pull/11049)). Contributed by @alunturner.
+ * Update voice broadcast redaction to use MSC3912 `with_rel_type` instead of `with_relations` ([\#11014](https://github.com/matrix-org/matrix-react-sdk/pull/11014)). Fixes #25471.
+ * Add config to skip widget_build_url for DM rooms ([\#11044](https://github.com/matrix-org/matrix-react-sdk/pull/11044)). Fixes vector-im/customer-retainer#74.
+ * Inhibit interactions on forward dialog message previews ([\#11025](https://github.com/matrix-org/matrix-react-sdk/pull/11025)). Fixes #23459.
+ * Removed `DecryptionFailureBar.tsx` ([\#11027](https://github.com/matrix-org/matrix-react-sdk/pull/11027)). Fixes vector-im/element-meta#1358. Contributed by @florianduros.
+
+## 🐛 Bug Fixes
+ * Fix translucent `TextualEvent` on search results panel ([\#10810](https://github.com/matrix-org/matrix-react-sdk/pull/10810)). Fixes #25292. Contributed by @luixxiul.
+ * Matrix matrix scheme permalink constructor not stripping query params ([\#11060](https://github.com/matrix-org/matrix-react-sdk/pull/11060)). Fixes #25535.
+ * Fix: "manually verify by text" does nothing ([\#11059](https://github.com/matrix-org/matrix-react-sdk/pull/11059)). Fixes #25375. Contributed by @kerryarchibald.
+ * Make group calls respect the ICE fallback setting ([\#11047](https://github.com/matrix-org/matrix-react-sdk/pull/11047)). Fixes vector-im/voip-internal#65.
+ * Align list items on the tooltip to the start ([\#11041](https://github.com/matrix-org/matrix-react-sdk/pull/11041)). Fixes #25355. Contributed by @luixxiul.
+ * Clear thread panel event permalink when changing rooms ([\#11024](https://github.com/matrix-org/matrix-react-sdk/pull/11024)). Fixes #25484.
+ * Fix spinner placement on pinned widgets being reloaded ([\#10970](https://github.com/matrix-org/matrix-react-sdk/pull/10970)). Fixes #25431. Contributed by @luixxiul.
+
 Changes in [1.11.33](https://github.com/vector-im/element-web/releases/tag/v1.11.33) (2023-06-09)
 =================================================================================================
 

docs/e2ee.md

@@ -16,6 +16,28 @@ Set the following on your homeserver's
 }
 ```
 
+## Disabling encryption
+
+Set the following on your homeserver's
+`/.well-known/matrix/client` config:
+
+```json
+{
+    "io.element.e2ee": {
+        "force_disable": true
+    }
+}
+```
+
+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.
+
+Note: If the server is configured to forcibly enable encryption for some or all rooms,
+this behaviour will be overriden.
+
 # Secure backup
 
 By default, Element strongly encourages (but does not require) users to set up

docs/labs.md

@@ -105,11 +105,6 @@ For some sample themes, check out [aaronraimist/element-themes](https://github.c
 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).
 
-## Breadcrumbs v2 (`feature_breadcrumbs_v2`)
-
-Instead of showing the horizontal list of breadcrumbs under the filter field, the new UX is an interactive context menu
-triggered by the button to the right of the filter field.
-
 ## Spotlight search (`feature_spotlight`) [In Development]
 
 Switches to a new room search experience.

element.io/develop/config.json

@@ -44,7 +44,7 @@
         "feature_video_rooms": true
     },
     "element_call": {
-        "url": "https://element-call.netlify.app"
+        "url": "https://element-call-livekit.netlify.app"
     },
     "map_style_url": "https://api.maptiler.com/maps/streets/style.json?key=fU3vlMsMn4Jb6dnEIFsx"
 }

package.json

@@ -1,6 +1,6 @@
 {
     "name": "element-web",
-    "version": "1.11.33",
+    "version": "1.11.34",
     "description": "A feature-rich client for Matrix.org",
     "author": "New Vector Ltd.",
     "repository": {
@@ -166,7 +166,7 @@
         "prettier": "2.8.8",
         "raw-loader": "^4.0.2",
         "rimraf": "^5.0.0",
-        "semver": "^7.3.7",
+        "semver": "^7.5.2",
         "simple-proxy-agent": "^1.1.0",
         "string-replace-loader": "3",
         "style-loader": "2",

src/i18n/strings/nn.json

@@ -8,8 +8,8 @@
     "The message from the parser is: %(message)s": "Meldinga frå kodetolkaren er: %(message)s",
     "Invalid JSON": "Ugyldig JSON",
     "Unexpected error preparing the app. See console for details.": "Uventa feil under lasting av programmet. Sjå konsollen for detaljar.",
-    "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Ugyldig oppsett: berre muleg å berre spesifiere ein av default_server_config, default_server_name eller default_hs_url.",
-    "Invalid configuration: no default server specified.": "Ugyldig oppsett: Ingen standardserver er spesifisert.",
+    "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Ugyldig oppsett: du kan berre spesifiere ein av default_server_config, default_server_name eller default_hs_url.",
+    "Invalid configuration: no default server specified.": "Ugyldig oppsett: Ingen standardtener er spesifisert.",
     "Your Element configuration contains invalid JSON. Please correct the problem and reload the page.": "Oppsettet for din Element inneheld ugyldig JSON. Sjekk konfigurasjonsfila, deretter last om sida.",
     "Unable to load config file: please refresh the page to try again.": "Fekk ikkje til å lasta konfigurasjonsfila: last inn sida for å prøva om att.",
     "Go to your browser to complete Sign In": "Opna nettlesaren din for å fullføra innlogginga",
@@ -22,7 +22,7 @@
     "%(brand)s uses advanced browser features which aren't supported by your current browser.": "%(brand)s brukar avanserte nettlesarfunksjonar som ikkje er støtta av den gjeldande nettlesaren din.",
     "Use %(brand)s on mobile": "Bruk %(brand)s på mobil",
     "Powered by Matrix": "Driven av Matrix",
-    "Your Element is misconfigured": "Element er feilkonfigurert",
+    "Your Element is misconfigured": "Din Element-klient er sett opp feil",
     "Failed to start": "Klarte ikkje å starta",
     "Open": "Opna",
     "Download Completed": "Nedlasting Fullført",

src/i18n/strings/pt.json

@@ -14,7 +14,7 @@
     "Open": "Abrir",
     "Download Completed": "Transferência concluída",
     "Unable to load config file: please refresh the page to try again.": "Não foi possível carregar o ficheiro de configuração: atualize a página para tentar novamente.",
-    "Your Element configuration contains invalid JSON. Please correct the problem and reload the page.": "A configuração do Element contém um JSON inválido. Corrija o problema e recarregue a página.",
+    "Your Element configuration contains invalid JSON. Please correct the problem and reload the page.": "A sua configuração do Element contém JSON inválido. Por favor, corrija o problema e recarregue a página.",
     "Your Element is misconfigured": "O Element está configurado incorretamente",
     "Powered by Matrix": "Desenvolvido por Matrix",
     "Go to element.io": "Visite element.io",
@@ -23,7 +23,7 @@
     "Please install <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, or <safariLink>Safari</safariLink> for the best experience.": "Por favor, instala <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, ou <safariLink>Safari</safariLink> para uma melhor experiência.",
     "Unsupported browser": "Browser não suportado",
     "Failed to start": "Erro ao iniciar",
-    "%(brand)s uses advanced browser features which aren't supported by your current browser.": "%(brand)s utiliza funções avançadas que não são suportadas pelo teu atual browser.",
+    "%(brand)s uses advanced browser features which aren't supported by your current browser.": "%(brand)s utiliza funcionalidades avançadas que o seu Navegador actual não suporta.",
     "Your browser can't run %(brand)s": "O teu browser não consegue executar %(brand)s",
     "Use %(brand)s on mobile": "Usar %(brand)s no telemóvel",
     "Decentralised, encrypted chat &amp; collaboration powered by $matrixLogo": "Chat descentralizado e encriptado &amp; colaboração alimentada por $matrixLogo",

src/vector/app.tsx

@@ -75,13 +75,17 @@ function makeRegistrationUrl(params: QueryDict): string {
 
 function onTokenLoginCompleted(): void {
     // if we did a token login, we're now left with the token, hs and is
-    // url as query params in the url; a little nasty but let's redirect to
-    // clear them.
+    // url as query params in the url;
+    // if we did an oidc authorization code flow login, we're left with the auth code and state
+    // as query params in the url;
+    // a little nasty but let's redirect to clear them.
     const url = new URL(window.location.href);
 
     url.searchParams.delete("loginToken");
+    url.searchParams.delete("state");
+    url.searchParams.delete("code");
 
-    logger.log(`Redirecting to ${url.href} to drop loginToken from queryparams`);
+    logger.log(`Redirecting to ${url.href} to drop delegated authentication params from queryparams`);
     window.history.replaceState(null, "", url.href);
 }