Merge tag 'v1.11.23' into sc

* Description of QR code sign in labs feature ([\element-hq#23513](element-hq#23513)). Contributed by @hughns. * Add option to find own location in map views ([\element-hq#10083](matrix-org/matrix-react-sdk#10083)). * Render poll end events in timeline ([\element-hq#10027](matrix-org/matrix-react-sdk#10027)). Contributed by @kerryarchibald. * Indicate unread messages in tab title ([\element-hq#10096](matrix-org/matrix-react-sdk#10096)). Contributed by @tnt7864. * Open message in editing mode when keyboard up is pressed (RTE) ([\element-hq#10079](matrix-org/matrix-react-sdk#10079)). Contributed by @florianduros. * Hide superseded rooms from the room list using dynamic room predecessors ([\element-hq#10068](matrix-org/matrix-react-sdk#10068)). Contributed by @andybalaam. * Support MSC3946 in RoomListStore ([\element-hq#10054](matrix-org/matrix-react-sdk#10054)). Fixes element-hq#24325. Contributed by @andybalaam. * Auto focus security key field ([\element-hq#10048](matrix-org/matrix-react-sdk#10048)). * use Poll model with relations API in poll rendering ([\element-hq#9877](matrix-org/matrix-react-sdk#9877)). Contributed by @kerryarchibald. * Support MSC3946 in the RoomCreate tile ([\element-hq#10041](matrix-org/matrix-react-sdk#10041)). Fixes element-hq#24323. Contributed by @andybalaam. * Update labs flag description for RTE ([\#10058](matrix-org/matrix-react-sdk#10058)). Contributed by @florianduros. * Change ul list style to disc when editing message ([\element-hq#10043](matrix-org/matrix-react-sdk#10043)). Contributed by @alunturner. * Improved click detection within PiP windows ([\element-hq#10040](matrix-org/matrix-react-sdk#10040)). Fixes element-hq#24371. * Add RTE keyboard navigation in editing ([\element-hq#9980](matrix-org/matrix-react-sdk#9980)). Fixes element-hq#23621. Contributed by @florianduros. * Paragraph integration for rich text editor ([\element-hq#10008](matrix-org/matrix-react-sdk#10008)). Contributed by @alunturner. * Add indentation increasing/decreasing to RTE ([\element-hq#10034](matrix-org/matrix-react-sdk#10034)). Contributed by @florianduros. * Add ignore user confirmation dialog ([\element-hq#6116](matrix-org/matrix-react-sdk#6116)). Fixes element-hq#14746. * Use monospace font for room, message IDs in View Source modal ([\element-hq#9956](matrix-org/matrix-react-sdk#9956)). Fixes element-hq#21937. Contributed by @paragpoddar. * Implement MSC3946 for AdvancedRoomSettingsTab ([\#9995](matrix-org/matrix-react-sdk#9995)). Fixes element-hq#24322. Contributed by @andybalaam. * Implementation of MSC3824 to make the client OIDC-aware ([\element-hq#8681](matrix-org/matrix-react-sdk#8681)). Contributed by @hughns. * Improves a11y for avatar uploads ([\element-hq#9985](matrix-org/matrix-react-sdk#9985)). Contributed by @GoodGuyMarco. * Add support for [token authenticated registration](https ([\element-hq#7275](matrix-org/matrix-react-sdk#7275)). Fixes element-hq#18931. Contributed by @govynnus. * Jitsi requests 'requires_client' capability if auth token is provided ([\element-hq#24294](element-hq#24294)). Contributed by @maheichyk. * Remove duplicate white space characters from translation keys ([\element-hq#10152](matrix-org/matrix-react-sdk#10152)). Contributed by @luixxiul. * Fix the caption of new sessions manager on Labs settings page for localization ([\element-hq#10143](matrix-org/matrix-react-sdk#10143)). Contributed by @luixxiul. * Prevent start another DM with a user if one already exists ([\element-hq#10127](matrix-org/matrix-react-sdk#10127)). Fixes element-hq#23138. * Remove white space characters before the horizontal ellipsis ([\element-hq#10130](matrix-org/matrix-react-sdk#10130)). Contributed by @luixxiul. * Fix Selectable Text on 'Delete All' and 'Retry All' Buttons ([\element-hq#10128](matrix-org/matrix-react-sdk#10128)). Fixes element-hq#23232. Contributed by @akshattchhabra. * Correctly Identify emoticons ([\element-hq#10108](matrix-org/matrix-react-sdk#10108)). Fixes element-hq#19472. Contributed by @adarsh-sgh. * Should open new 1:1 chat room after leaving the old one ([\element-hq#9880](matrix-org/matrix-react-sdk#9880)). Contributed by @ahmadkadri. * Remove a redundant white space ([\element-hq#10129](matrix-org/matrix-react-sdk#10129)). Contributed by @luixxiul. * Fix a crash when removing persistent widgets (updated) ([\element-hq#10099](matrix-org/matrix-react-sdk#10099)). Fixes element-hq#24412. Contributed by @andybalaam. * Fix wrongly grouping 3pid invites into a single repeated transition ([\element-hq#10087](matrix-org/matrix-react-sdk#10087)). Fixes element-hq#24432. * Fix scrollbar colliding with checkbox in add to space section ([\element-hq#10093](matrix-org/matrix-react-sdk#10093)). Fixes element-hq#23189. Contributed by @Arnabdaz. * Add a whitespace character after 'broadcast?' ([\element-hq#10097](matrix-org/matrix-react-sdk#10097)). Contributed by @luixxiul. * Seekbar in broadcast PiP view is now updated when switching between different broadcasts ([\element-hq#10072](matrix-org/matrix-react-sdk#10072)). Fixes element-hq#24415. * Add border to "reject" button on room preview card for clickable area indication. It fixes element-hq#22623 ([\element-hq#9205](matrix-org/matrix-react-sdk#9205)). Contributed by @gefgu. * Element-R: fix rageshages ([\element-hq#10081](matrix-org/matrix-react-sdk#10081)). Fixes element-hq#24430. * Fix markdown paragraph display in timeline ([\element-hq#10071](matrix-org/matrix-react-sdk#10071)). Fixes element-hq#24419. Contributed by @alunturner. * Prevent the remaining broadcast time from being exceeded ([\#10070](matrix-org/matrix-react-sdk#10070)). * Fix cursor position when new line is created by pressing enter (RTE) ([\element-hq#10064](matrix-org/matrix-react-sdk#10064)). Contributed by @florianduros. * Ensure room is actually in space hierarchy when resolving its latest version ([\element-hq#10010](matrix-org/matrix-react-sdk#10010)). * Fix new line for inline code ([\element-hq#10062](matrix-org/matrix-react-sdk#10062)). Contributed by @florianduros. * Member avatars without canvas ([\element-hq#9990](matrix-org/matrix-react-sdk#9990)). Contributed by @clarkf. * Apply more general fix for base avatar regressions ([\element-hq#10045](matrix-org/matrix-react-sdk#10045)). Fixes element-hq#24382 and element-hq#24370. * Replace list, code block and quote icons by new icons ([\element-hq#10035](matrix-org/matrix-react-sdk#10035)). Contributed by @florianduros. * fix regional emojis converted to flags ([\element-hq#9294](matrix-org/matrix-react-sdk#9294)). Fixes element-hq#19000. Contributed by @grimhilt. * resolved emoji description text overflowing issue ([\element-hq#10028](matrix-org/matrix-react-sdk#10028)). Contributed by @fahadNoufal. * Fix MessageEditHistoryDialog crashing on complex input ([\element-hq#10018](matrix-org/matrix-react-sdk#10018)). Fixes element-hq#23665. Contributed by @clarkf. * Unify unread notification state determination ([\element-hq#9941](matrix-org/matrix-react-sdk#9941)). Contributed by @clarkf. * Fix layout and visual regressions around default avatars ([\element-hq#10031](matrix-org/matrix-react-sdk#10031)). Fixes element-hq#24375 and element-hq#24369. * Fix useUnreadNotifications exploding with falsey room, like in notif panel ([\element-hq#10030](matrix-org/matrix-react-sdk#10030)). Fixes matrix-org/element-web-rageshakes#19334. * Fix "[object Promise]" appearing in HTML exports ([\element-hq#9975](matrix-org/matrix-react-sdk#9975)). Fixes element-hq#24272. Contributed by @clarkf. * changing the color of message time stamp ([\element-hq#10016](matrix-org/matrix-react-sdk#10016)). Contributed by @nawarajshah. * Fix link creation with backward selection ([\element-hq#9986](matrix-org/matrix-react-sdk#9986)). Fixes element-hq#24315. Contributed by @florianduros. * Misaligned reply preview in thread composer element-hq#23396 ([\element-hq#9977](matrix-org/matrix-react-sdk#9977)). Fixes element-hq#23396. Contributed by @mustafa-kapadia1483.
SchildiChat · Feb 14, 2023 · 2f22522 · 2f22522
2 parents e7b4ae3 + 0909eb4
commit 2f22522
Show file tree

Hide file tree

Showing 10 changed files with 129 additions and 37 deletions.
diff --git a/.github/workflows/triage-assigned.yml b/.github/workflows/triage-assigned.yml
@@ -9,7 +9,8 @@ jobs:
         runs-on: ubuntu-latest
         if: |
             contains(github.event.issue.assignees.*.login, 't3chguy') ||
-            contains(github.event.issue.assignees.*.login, 'andybalaam')
+            contains(github.event.issue.assignees.*.login, 'andybalaam') ||
+            contains(github.event.issue.assignees.*.login, 'justjanne')
         steps:
             - uses: octokit/[email protected]
               id: add_to_project

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,66 @@
+Changes in [1.11.23](https://github.com/vector-im/element-web/releases/tag/v1.11.23) (2023-02-14)
+=================================================================================================
+
+## ✨ Features
+ * Description of QR code sign in labs feature ([\#23513](https://github.com/vector-im/element-web/pull/23513)). Contributed by @hughns.
+ * Add option to find own location in map views ([\#10083](https://github.com/matrix-org/matrix-react-sdk/pull/10083)).
+ * Render poll end events in timeline ([\#10027](https://github.com/matrix-org/matrix-react-sdk/pull/10027)). Contributed by @kerryarchibald.
+ * Indicate unread messages in tab title ([\#10096](https://github.com/matrix-org/matrix-react-sdk/pull/10096)). Contributed by @tnt7864.
+ * Open message in editing mode when keyboard up is pressed (RTE) ([\#10079](https://github.com/matrix-org/matrix-react-sdk/pull/10079)). Contributed by @florianduros.
+ * Hide superseded rooms from the room list using dynamic room predecessors ([\#10068](https://github.com/matrix-org/matrix-react-sdk/pull/10068)). Contributed by @andybalaam.
+ * Support MSC3946 in RoomListStore ([\#10054](https://github.com/matrix-org/matrix-react-sdk/pull/10054)). Fixes #24325. Contributed by @andybalaam.
+ * Auto focus security key field ([\#10048](https://github.com/matrix-org/matrix-react-sdk/pull/10048)).
+ * use Poll model with relations API in poll rendering ([\#9877](https://github.com/matrix-org/matrix-react-sdk/pull/9877)). Contributed by @kerryarchibald.
+ * Support MSC3946 in the RoomCreate tile ([\#10041](https://github.com/matrix-org/matrix-react-sdk/pull/10041)). Fixes #24323. Contributed by @andybalaam.
+ * Update labs flag description for RTE ([\#10058](https://github.com/matrix-org/matrix-react-sdk/pull/10058)). Contributed by @florianduros.
+ * Change ul list style to disc when editing message ([\#10043](https://github.com/matrix-org/matrix-react-sdk/pull/10043)). Contributed by @alunturner.
+ * Improved click detection within PiP windows ([\#10040](https://github.com/matrix-org/matrix-react-sdk/pull/10040)). Fixes #24371.
+ * Add RTE keyboard navigation in editing ([\#9980](https://github.com/matrix-org/matrix-react-sdk/pull/9980)). Fixes #23621. Contributed by @florianduros.
+ * Paragraph integration for rich text editor ([\#10008](https://github.com/matrix-org/matrix-react-sdk/pull/10008)). Contributed by @alunturner.
+ * Add  indentation increasing/decreasing to RTE ([\#10034](https://github.com/matrix-org/matrix-react-sdk/pull/10034)). Contributed by @florianduros.
+ * Add ignore user confirmation dialog ([\#6116](https://github.com/matrix-org/matrix-react-sdk/pull/6116)). Fixes #14746.
+ * Use monospace font for room, message IDs in View Source modal ([\#9956](https://github.com/matrix-org/matrix-react-sdk/pull/9956)). Fixes #21937. Contributed by @paragpoddar.
+ * Implement MSC3946 for AdvancedRoomSettingsTab ([\#9995](https://github.com/matrix-org/matrix-react-sdk/pull/9995)). Fixes #24322. Contributed by @andybalaam.
+ * Implementation of MSC3824 to make the client OIDC-aware ([\#8681](https://github.com/matrix-org/matrix-react-sdk/pull/8681)). Contributed by @hughns.
+ * Improves a11y for avatar uploads ([\#9985](https://github.com/matrix-org/matrix-react-sdk/pull/9985)). Contributed by @GoodGuyMarco.
+ * Add support for [token authenticated registration](https ([\#7275](https://github.com/matrix-org/matrix-react-sdk/pull/7275)). Fixes #18931. Contributed by @govynnus.
+
+## 🐛 Bug Fixes
+ * Jitsi requests 'requires_client' capability if auth token is provided ([\#24294](https://github.com/vector-im/element-web/pull/24294)). Contributed by @maheichyk.
+ * Remove duplicate white space characters from translation keys ([\#10152](https://github.com/matrix-org/matrix-react-sdk/pull/10152)). Contributed by @luixxiul.
+ * Fix the caption of new sessions manager on Labs settings page for localization ([\#10143](https://github.com/matrix-org/matrix-react-sdk/pull/10143)). Contributed by @luixxiul.
+ * Prevent start another DM with a user if one already exists ([\#10127](https://github.com/matrix-org/matrix-react-sdk/pull/10127)). Fixes #23138.
+ * Remove white space characters before the horizontal ellipsis ([\#10130](https://github.com/matrix-org/matrix-react-sdk/pull/10130)). Contributed by @luixxiul.
+ * Fix Selectable Text on 'Delete All' and 'Retry All' Buttons ([\#10128](https://github.com/matrix-org/matrix-react-sdk/pull/10128)). Fixes #23232. Contributed by @akshattchhabra.
+ * Correctly Identify emoticons ([\#10108](https://github.com/matrix-org/matrix-react-sdk/pull/10108)). Fixes #19472. Contributed by @adarsh-sgh.
+ * Should open new 1:1 chat room after leaving the old one ([\#9880](https://github.com/matrix-org/matrix-react-sdk/pull/9880)). Contributed by @ahmadkadri.
+ * Remove a redundant white space ([\#10129](https://github.com/matrix-org/matrix-react-sdk/pull/10129)). Contributed by @luixxiul.
+ * Fix a crash when removing persistent widgets (updated) ([\#10099](https://github.com/matrix-org/matrix-react-sdk/pull/10099)). Fixes #24412. Contributed by @andybalaam.
+ * Fix wrongly grouping 3pid invites into a single repeated transition ([\#10087](https://github.com/matrix-org/matrix-react-sdk/pull/10087)). Fixes #24432.
+ * Fix scrollbar colliding with checkbox in add to space section ([\#10093](https://github.com/matrix-org/matrix-react-sdk/pull/10093)). Fixes #23189. Contributed by @Arnabdaz.
+ * Add a whitespace character after 'broadcast?' ([\#10097](https://github.com/matrix-org/matrix-react-sdk/pull/10097)). Contributed by @luixxiul.
+ * Seekbar in broadcast PiP view is now updated when switching between different broadcasts ([\#10072](https://github.com/matrix-org/matrix-react-sdk/pull/10072)). Fixes #24415.
+ * Add border to "reject" button on room preview card for clickable area indication. It fixes vector-im/element-web#22623 ([\#9205](https://github.com/matrix-org/matrix-react-sdk/pull/9205)). Contributed by @gefgu.
+ * Element-R: fix rageshages ([\#10081](https://github.com/matrix-org/matrix-react-sdk/pull/10081)). Fixes #24430.
+ * Fix markdown paragraph display in timeline ([\#10071](https://github.com/matrix-org/matrix-react-sdk/pull/10071)). Fixes #24419. Contributed by @alunturner.
+ * Prevent the remaining broadcast time from being exceeded ([\#10070](https://github.com/matrix-org/matrix-react-sdk/pull/10070)).
+ * Fix cursor position when new line is created by pressing enter (RTE) ([\#10064](https://github.com/matrix-org/matrix-react-sdk/pull/10064)). Contributed by @florianduros.
+ * Ensure room is actually in space hierarchy when resolving its latest version ([\#10010](https://github.com/matrix-org/matrix-react-sdk/pull/10010)).
+ * Fix new line for inline code ([\#10062](https://github.com/matrix-org/matrix-react-sdk/pull/10062)). Contributed by @florianduros.
+ * Member avatars without canvas ([\#9990](https://github.com/matrix-org/matrix-react-sdk/pull/9990)). Contributed by @clarkf.
+ * Apply more general fix for base avatar regressions ([\#10045](https://github.com/matrix-org/matrix-react-sdk/pull/10045)). Fixes #24382 and #24370.
+ * Replace list, code block and quote icons by new icons ([\#10035](https://github.com/matrix-org/matrix-react-sdk/pull/10035)). Contributed by @florianduros.
+ * fix regional emojis converted to flags ([\#9294](https://github.com/matrix-org/matrix-react-sdk/pull/9294)). Fixes #19000. Contributed by @grimhilt.
+ * resolved emoji description text overflowing issue ([\#10028](https://github.com/matrix-org/matrix-react-sdk/pull/10028)). Contributed by @fahadNoufal.
+ * Fix MessageEditHistoryDialog crashing on complex input ([\#10018](https://github.com/matrix-org/matrix-react-sdk/pull/10018)). Fixes #23665. Contributed by @clarkf.
+ * Unify unread notification state determination ([\#9941](https://github.com/matrix-org/matrix-react-sdk/pull/9941)). Contributed by @clarkf.
+ * Fix layout and visual regressions around default avatars ([\#10031](https://github.com/matrix-org/matrix-react-sdk/pull/10031)). Fixes #24375 and #24369.
+ * Fix useUnreadNotifications exploding with falsey room, like in notif panel ([\#10030](https://github.com/matrix-org/matrix-react-sdk/pull/10030)). Fixes matrix-org/element-web-rageshakes#19334.
+ * Fix "[object Promise]" appearing in HTML exports ([\#9975](https://github.com/matrix-org/matrix-react-sdk/pull/9975)). Fixes #24272. Contributed by @clarkf.
+ * changing the color of message time stamp ([\#10016](https://github.com/matrix-org/matrix-react-sdk/pull/10016)). Contributed by @nawarajshah.
+ * Fix link creation with backward selection ([\#9986](https://github.com/matrix-org/matrix-react-sdk/pull/9986)). Fixes #24315. Contributed by @florianduros.
+ * Misaligned reply preview in thread composer #23396 ([\#9977](https://github.com/matrix-org/matrix-react-sdk/pull/9977)). Fixes #23396. Contributed by @mustafa-kapadia1483.
+
 Changes in [1.11.22](https://github.com/vector-im/element-web/releases/tag/v1.11.22) (2023-01-31)
 =================================================================================================
 

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -19,7 +19,6 @@ ask you to make any refinements needed or merge it and make them ourselves.
 
 Things that should go into your PR description:
 
--   A changelog entry in the `Notes` section (see below)
 -   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
@@ -41,11 +40,14 @@ Things that should go into your PR description:
 -   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.
 
-We rely on information in pull request to populate the information that goes into
-the changelogs our users see, both for Element Web itself and other projects on
-which it is based. This is picked up from both labels on the pull request and
-the `Notes:` annotation in the description. By default, the PR title will be
-used for the changelog entry, but you can specify more options, as follows.
+### Changelogs
+
+There's no need to manually add Changelog entries: we use information in the
+pull request to populate the information that goes into the changelogs our
+users see, both for Element Web itself and other projects on which it is based.
+This is picked up from both labels on the pull request and the `Notes:`
+annotation in the description. By default, the PR title will be used for the
+changelog entry, but you can specify more options, as follows.
 
 To add a longer, more detailed description of the change for the changelog:
 
@@ -280,3 +282,10 @@ When stacking pull requests, you may wish to do the following:
 3. Merge the first PR using a merge commit otherwise your stacked PR will need a rebase. Github will automatically adjust the base branch of your other PR to be develop.
 
 [1]: https://github.com/gotwarlost/istanbul/blob/master/ignoring-code-for-coverage.md
+
+# Decoding Stack Traces
+
+Element Web has crashed and given you an obfuscated stack trace? Don't panic:
+use the [Decoder Ring](https://app.element.io/decoder-ring/) (or /decoder-ring/
+on any Element Web deploy). It is somewhat of a manual process, but it should
+tell you what lines the stack trace corresponds to from the source maps.
diff --git a/docs/config.md b/docs/config.md
@@ -516,9 +516,6 @@ Currently, the following UI feature flags are supported:
 -   `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.flair` - Whether or not community flair is shown in rooms.
--   `UIFeature.communities` - Whether or not to show any UI related to communities. Implicitly
-    disables `UIFeature.flair` when disabled.
 -   `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

diff --git a/docs/labs.md b/docs/labs.md
@@ -189,3 +189,7 @@ have [MSC3827](https://github.com/matrix-org/matrix-spec-proposals/pull/3827) en
 ## Favourite Messages (`feature_favourite_messages`) [In Development]
 
 Enables users to bookmark a message or content for a later reference.
+
+## Sign in another device by showing a QR code (`feature_qr_signin_reciprocate_show`)
+
+Add capability to the session/device manager screens to generate a QR code to sign in another device + set up E2EE. This requires the homeserver to have support for [MSC3882](https://github.com/matrix-org/matrix-spec-proposals/pull/3882) and [MSC3886](https://github.com/matrix-org/matrix-spec-proposals/pull/3886) enabled.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "element-web",
-    "version": "1.11.22",
+    "version": "1.11.23",
     "description": "A feature-rich client for Matrix.org",
     "author": "New Vector Ltd.",
     "repository": {
@@ -60,8 +60,8 @@
         "gfm.css": "^1.1.2",
         "jsrsasign": "^10.5.25",
         "katex": "^0.16.0",
-        "matrix-js-sdk": "23.2.0",
-        "matrix-react-sdk": "3.65.0",
+        "matrix-js-sdk": "23.3.0",
+        "matrix-react-sdk": "3.66.0",
         "matrix-widget-api": "^1.1.1",
         "react": "17.0.2",
         "react-dom": "17.0.2",

diff --git a/src/i18n/strings/en_US.json b/src/i18n/strings/en_US.json
@@ -24,5 +24,9 @@
     "Download Completed": "Download Completed",
     "Unable to load config file: please refresh the page to try again.": "Unable to load config file: please refresh the page to try again.",
     "Your Element configuration contains invalid JSON. Please correct the problem and reload the page.": "Your Element configuration contains invalid JSON. Please correct the problem and reload the page.",
-    "Your Element is misconfigured": "Your Element is misconfigured"
+    "Your Element is misconfigured": "Your Element is misconfigured",
+    "Decentralised, encrypted chat &amp; collaboration powered by $matrixLogo": "Decentralised, encrypted chat &amp; collaboration powered by $matrixLogo",
+    "Use %(brand)s on mobile": "Use %(brand)s on mobile",
+    "%(appName)s: %(browserName)s on %(osName)s": "%(appName)s: %(browserName)s on %(osName)s",
+    "%(brand)s Desktop: %(platformName)s": "%(brand)s Desktop: %(platformName)s"
 }
diff --git a/src/i18n/strings/ja.json b/src/i18n/strings/ja.json
@@ -6,7 +6,7 @@
     "Invalid configuration: no default server specified.": "不正な設定：デフォルトのサーバーが設定されていません。",
     "Sign In": "サインイン",
     "Create Account": "アカウントを作成",
-    "Explore rooms": "ルームを探索",
+    "Explore rooms": "ルームを探す",
     "The message from the parser is: %(message)s": "パーサーのメッセージ：%(message)s",
     "Invalid JSON": "不正なJSON",
     "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "不正な設定：default_server_config、default_server_name、またはdefault_hs_urlのいずれか一つのみを指定できます。",

diff --git a/src/vector/jitsi/index.ts b/src/vector/jitsi/index.ts
@@ -28,6 +28,7 @@ import { ElementWidgetActions } from "matrix-react-sdk/src/stores/widgets/Elemen
 import { logger } from "matrix-js-sdk/src/logger";
 import { IConfigOptions } from "matrix-react-sdk/src/IConfigOptions";
 import { SnakedObject } from "matrix-react-sdk/src/utils/SnakedObject";
+import { ElementWidgetCapabilities } from "matrix-react-sdk/src/stores/widgets/ElementWidgetCapabilities";
 
 import { getVectorConfig } from "../getconfig";
 
@@ -98,6 +99,13 @@ const setupCompleted = (async (): Promise<string | void> => {
 
             widgetApiReady = new Promise<void>((resolve) => widgetApi.once("ready", resolve));
             widgetApi.requestCapabilities(VideoConferenceCapabilities);
+
+            // jitsi cannot work in a popup if auth token is provided because widgetApi is not available there
+            // so check the token and request the 'requires_client' capability to hide the popup icon in the Element
+            if (qsParam("auth", true) === "openidtoken-jwt") {
+                widgetApi.requestCapability(ElementWidgetCapabilities.RequiresClient);
+            }
+
             widgetApi.start();
 
             const handleAction = (