diff --git a/.eslintrc.js b/.eslintrc.js index b59ea416ad7..bb3a06d3552 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -25,6 +25,39 @@ module.exports = { // We disable this while we're transitioning "@typescript-eslint/no-explicit-any": "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", + }], + }], }, }], }; diff --git a/.github/workflows/triage-labelled.yml b/.github/workflows/triage-labelled.yml index 28f5307b8db..a2de4f29fa4 100644 --- a/.github/workflows/triage-labelled.yml +++ b/.github/workflows/triage-labelled.yml @@ -188,3 +188,49 @@ jobs: env: PROJECT_ID: "PN_kwDOAM0swc3m-g" GITHUB_TOKEN: ${{ secrets.ELEMENT_BOT_TOKEN }} + + move_ftue_issues: + name: Z-FTUE issues to the FTUE project board + runs-on: ubuntu-latest + if: > + contains(github.event.issue.labels.*.name, 'Z-FTUE') + steps: + - uses: octokit/graphql-action@v2.x + with: + headers: '{"GraphQL-Features": "projects_next_graphql"}' + query: | + mutation add_to_project($projectid:ID!,$contentid:ID!) { + addProjectNextItem(input:{projectId:$projectid contentId:$contentid}) { + projectNextItem { + id + } + } + } + projectid: ${{ env.PROJECT_ID }} + contentid: ${{ github.event.issue.node_id }} + env: + PROJECT_ID: "PN_kwDOAM0swc4AAqVx" + GITHUB_TOKEN: ${{ secrets.ELEMENT_BOT_TOKEN }} + + move_WTF_issues: + name: Z-WTF issues to the WTF project board + runs-on: ubuntu-latest + if: > + contains(github.event.issue.labels.*.name, 'Z-WTF') + steps: + - uses: octokit/graphql-action@v2.x + with: + headers: '{"GraphQL-Features": "projects_next_graphql"}' + query: | + mutation add_to_project($projectid:ID!,$contentid:ID!) { + addProjectNextItem(input:{projectId:$projectid contentId:$contentid}) { + projectNextItem { + id + } + } + } + projectid: ${{ env.PROJECT_ID }} + contentid: ${{ github.event.issue.node_id }} + env: + PROJECT_ID: "PN_kwDOAM0swc4AArk0" + GITHUB_TOKEN: ${{ secrets.ELEMENT_BOT_TOKEN }} diff --git a/CHANGELOG.md b/CHANGELOG.md index 55d826e1f33..5aa75a5bcf2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,155 @@ +Changes in [1.10.7](https://github.com/vector-im/element-web/releases/tag/v1.10.7) (2022-03-15) +=============================================================================================== + +## 🔒 SECURITY FIXES + + * Fix a bug where URL previews could be enabled in the left-panel when they + should not have been. + +## ✨ Features + * Add a config.json option to skip the built-in Jitsi welcome screen ([\#21190](https://github.com/vector-im/element-web/pull/21190)). + * Add unexposed account setting for hiding poll creation ([\#7972](https://github.com/matrix-org/matrix-react-sdk/pull/7972)). + * Allow pinning polls ([\#7922](https://github.com/matrix-org/matrix-react-sdk/pull/7922)). Fixes #20152. + * Make trailing `:` into a setting ([\#6711](https://github.com/matrix-org/matrix-react-sdk/pull/6711)). Fixes #16682. Contributed by @SimonBrandner. + * Location sharing > back button ([\#7958](https://github.com/matrix-org/matrix-react-sdk/pull/7958)). + * use LocationAssetType ([\#7965](https://github.com/matrix-org/matrix-react-sdk/pull/7965)). + * Location share type UI ([\#7924](https://github.com/matrix-org/matrix-react-sdk/pull/7924)). + * Add a few more UIComponent flags, and ensure they are used in existing code ([\#7937](https://github.com/matrix-org/matrix-react-sdk/pull/7937)). + * Add support for overriding strings in the app ([\#7886](https://github.com/matrix-org/matrix-react-sdk/pull/7886)). + * Add support for redirecting to external pages after logout ([\#7905](https://github.com/matrix-org/matrix-react-sdk/pull/7905)). + * Expose redaction power level in room settings ([\#7599](https://github.com/matrix-org/matrix-react-sdk/pull/7599)). Fixes #20590. Contributed by @SimonBrandner. + * Update and expand ways to access pinned messages ([\#7906](https://github.com/matrix-org/matrix-react-sdk/pull/7906)). Fixes #21209 and #21211. + * Add slash command to switch to a room's virtual room ([\#7839](https://github.com/matrix-org/matrix-react-sdk/pull/7839)). + +## 🐛 Bug Fixes + * Remove Lojban translation ([\#21302](https://github.com/vector-im/element-web/pull/21302)). + * Merge pull request from GHSA-qmf4-7w7j-vf23 ([\#8059](https://github.com/matrix-org/matrix-react-sdk/pull/8059)). + * Add another null guard for member ([\#7984](https://github.com/matrix-org/matrix-react-sdk/pull/7984)). Fixes #21319. + * Fix room account settings ([\#7999](https://github.com/matrix-org/matrix-react-sdk/pull/7999)). + * Fix missing summary text for pinned message changes ([\#7989](https://github.com/matrix-org/matrix-react-sdk/pull/7989)). Fixes #19823. + * Pass room to getRoomTombstone to avoid racing with setState ([\#7986](https://github.com/matrix-org/matrix-react-sdk/pull/7986)). + * Hide composer and call buttons when the room is tombstoned ([\#7975](https://github.com/matrix-org/matrix-react-sdk/pull/7975)). Fixes #21286. + * Fix bad ternary statement in autocomplete user pill insertions ([\#7977](https://github.com/matrix-org/matrix-react-sdk/pull/7977)). Fixes #21307. + * Fix sending locations into threads and fix i18n ([\#7943](https://github.com/matrix-org/matrix-react-sdk/pull/7943)). Fixes #21267. + * Fix location map attribution rendering over message action bar ([\#7974](https://github.com/matrix-org/matrix-react-sdk/pull/7974)). Fixes #21297. + * Fix wrongly asserting that PushRule::conditions is non-null ([\#7973](https://github.com/matrix-org/matrix-react-sdk/pull/7973)). Fixes #21305. + * Fix account & room settings race condition ([\#7953](https://github.com/matrix-org/matrix-react-sdk/pull/7953)). Fixes #21163. + * Fix bug with some space selections not being applied ([\#7971](https://github.com/matrix-org/matrix-react-sdk/pull/7971)). Fixes #21290. + * Revert "replace all require(.svg) with esm import" ([\#7969](https://github.com/matrix-org/matrix-react-sdk/pull/7969)). Fixes #21293. + * Hide unpinnable pinned messages in more cases ([\#7921](https://github.com/matrix-org/matrix-react-sdk/pull/7921)). + * Fix room list being laggy while scrolling 🐌 ([\#7939](https://github.com/matrix-org/matrix-react-sdk/pull/7939)). Fixes #21262. + * Make pinned messages more reliably reflect edits ([\#7920](https://github.com/matrix-org/matrix-react-sdk/pull/7920)). Fixes #17098. + * Improve accessibility of the BetaPill ([\#7949](https://github.com/matrix-org/matrix-react-sdk/pull/7949)). Fixes #21255. + * Autofocus correct composer after sending reaction ([\#7950](https://github.com/matrix-org/matrix-react-sdk/pull/7950)). Fixes #21273. + * Consider polls as message events for rendering redactions ([\#7944](https://github.com/matrix-org/matrix-react-sdk/pull/7944)). Fixes #21125. + * Prevent event tiles being shrunk/collapsed by flexbox ([\#7942](https://github.com/matrix-org/matrix-react-sdk/pull/7942)). Fixes #21269. + * Fix ExportDialog title on export cancellation ([\#7936](https://github.com/matrix-org/matrix-react-sdk/pull/7936)). Fixes #21260. Contributed by @luixxiul. + * Mandate use of js-sdk/src/matrix import over js-sdk/src ([\#7933](https://github.com/matrix-org/matrix-react-sdk/pull/7933)). Fixes #21253. + * Fix backspace not working in the invite dialog ([\#7931](https://github.com/matrix-org/matrix-react-sdk/pull/7931)). Fixes #21249. Contributed by @SimonBrandner. + * Fix right panel soft crashes due to missing room prop ([\#7923](https://github.com/matrix-org/matrix-react-sdk/pull/7923)). Fixes #21243. + * fix color of location share caret ([\#7917](https://github.com/matrix-org/matrix-react-sdk/pull/7917)). + * Wrap all EventTiles with a TileErrorBoundary and guard parsePermalink ([\#7916](https://github.com/matrix-org/matrix-react-sdk/pull/7916)). Fixes #21216. + * Fix changing space sometimes bouncing to the wrong space ([\#7910](https://github.com/matrix-org/matrix-react-sdk/pull/7910)). Fixes #20425. + * Ensure EventListSummary key does not change during backpagination ([\#7915](https://github.com/matrix-org/matrix-react-sdk/pull/7915)). Fixes #9192. + * Fix positioning of the thread context menu ([\#7918](https://github.com/matrix-org/matrix-react-sdk/pull/7918)). Fixes #21236. + * Inject sender into pinned messages ([\#7904](https://github.com/matrix-org/matrix-react-sdk/pull/7904)). Fixes #20314. + * Tweak info message padding in right panel timeline ([\#7901](https://github.com/matrix-org/matrix-react-sdk/pull/7901)). Fixes #21212. + * Fix another freeze on room switch ([\#7900](https://github.com/matrix-org/matrix-react-sdk/pull/7900)). Fixes #21127. + * Fix out of memory error when failing to acquire location ([\#7902](https://github.com/matrix-org/matrix-react-sdk/pull/7902)). Fixes #21213. + * Fix edge case in context menu chevron positioning ([\#7899](https://github.com/matrix-org/matrix-react-sdk/pull/7899)). + * Fix composer format buttons on WebKit ([\#7898](https://github.com/matrix-org/matrix-react-sdk/pull/7898)). Fixes #20868. + * manage voicerecording state when deleting or sending a voice message ([\#7896](https://github.com/matrix-org/matrix-react-sdk/pull/7896)). Fixes #21151. + * Fix bug with useRoomHierarchy tight-looping loadMore on error ([\#7893](https://github.com/matrix-org/matrix-react-sdk/pull/7893)). + * Fix upload button & shortcut not working for narrow composer mode ([\#7894](https://github.com/matrix-org/matrix-react-sdk/pull/7894)). Fixes #21175 and #21142. + * Fix emoji insertion in thread composer going to the main composer ([\#7895](https://github.com/matrix-org/matrix-react-sdk/pull/7895)). Fixes #21202. + * Try harder to keep context menus inside the window ([\#7863](https://github.com/matrix-org/matrix-react-sdk/pull/7863)). Fixes #17527 and #18377. + * Fix edge case around event list summary layout ([\#7891](https://github.com/matrix-org/matrix-react-sdk/pull/7891)). Fixes #21180. + * Fix event list summary 1 hidden message pluralisation ([\#7890](https://github.com/matrix-org/matrix-react-sdk/pull/7890)). Fixes #21196. + * Fix vanishing recently viewed menu ([\#7887](https://github.com/matrix-org/matrix-react-sdk/pull/7887)). Fixes #20827. + * Fix freeze on room switch ([\#7884](https://github.com/matrix-org/matrix-react-sdk/pull/7884)). Fixes #21127. + * Check 'useSystemTheme' in quick settings theme switcher ([\#7809](https://github.com/matrix-org/matrix-react-sdk/pull/7809)). Fixes #21061. + * Fix 'my threads' filtering to include participated threads ([\#7882](https://github.com/matrix-org/matrix-react-sdk/pull/7882)). Fixes #20877. + * Remove log line to try to fix freeze on answering VoIP call ([\#7883](https://github.com/matrix-org/matrix-react-sdk/pull/7883)). + * Support social login & password on soft logout page ([\#7879](https://github.com/matrix-org/matrix-react-sdk/pull/7879)). Fixes #21099. + * Fix missing padding on server picker ([\#7864](https://github.com/matrix-org/matrix-react-sdk/pull/7864)). + * Throttle RoomState.members handlers ([\#7876](https://github.com/matrix-org/matrix-react-sdk/pull/7876)). Fixes #21127. + * Only show joined/invited in search dialog ([\#7875](https://github.com/matrix-org/matrix-react-sdk/pull/7875)). Fixes #21161. + * Don't pillify code blocks ([\#7861](https://github.com/matrix-org/matrix-react-sdk/pull/7861)). Fixes #20851 and #18687. + * Fix keyboard shortcut icons on macOS ([\#7869](https://github.com/matrix-org/matrix-react-sdk/pull/7869)). + +Changes in [1.10.7-rc.1](https://github.com/vector-im/element-web/releases/tag/v1.10.7-rc.1) (2022-03-08) +========================================================================================================= + +## ✨ Features + * Add a config.json option to skip the built-in Jitsi welcome screen ([\#21190](https://github.com/vector-im/element-web/pull/21190)). + * Add unexposed account setting for hiding poll creation ([\#7972](https://github.com/matrix-org/matrix-react-sdk/pull/7972)). + * Allow pinning polls ([\#7922](https://github.com/matrix-org/matrix-react-sdk/pull/7922)). Fixes #20152. + * Make trailing `:` into a setting ([\#6711](https://github.com/matrix-org/matrix-react-sdk/pull/6711)). Fixes #16682. Contributed by @SimonBrandner. + * Location sharing > back button ([\#7958](https://github.com/matrix-org/matrix-react-sdk/pull/7958)). + * use LocationAssetType ([\#7965](https://github.com/matrix-org/matrix-react-sdk/pull/7965)). + * Location share type UI ([\#7924](https://github.com/matrix-org/matrix-react-sdk/pull/7924)). + * Add a few more UIComponent flags, and ensure they are used in existing code ([\#7937](https://github.com/matrix-org/matrix-react-sdk/pull/7937)). + * Add support for overriding strings in the app ([\#7886](https://github.com/matrix-org/matrix-react-sdk/pull/7886)). + * Add support for redirecting to external pages after logout ([\#7905](https://github.com/matrix-org/matrix-react-sdk/pull/7905)). + * Expose redaction power level in room settings ([\#7599](https://github.com/matrix-org/matrix-react-sdk/pull/7599)). Fixes #20590. Contributed by @SimonBrandner. + * Update and expand ways to access pinned messages ([\#7906](https://github.com/matrix-org/matrix-react-sdk/pull/7906)). Fixes #21209 and #21211. + * Add slash command to switch to a room's virtual room ([\#7839](https://github.com/matrix-org/matrix-react-sdk/pull/7839)). + +## 🐛 Bug Fixes + * Remove Lojban translation ([\#21302](https://github.com/vector-im/element-web/pull/21302)). + * Add another null guard for member ([\#7984](https://github.com/matrix-org/matrix-react-sdk/pull/7984)). Fixes #21319. + * Fix room account settings ([\#7999](https://github.com/matrix-org/matrix-react-sdk/pull/7999)). + * Fix missing summary text for pinned message changes ([\#7989](https://github.com/matrix-org/matrix-react-sdk/pull/7989)). Fixes #19823. + * Pass room to getRoomTombstone to avoid racing with setState ([\#7986](https://github.com/matrix-org/matrix-react-sdk/pull/7986)). + * Hide composer and call buttons when the room is tombstoned ([\#7975](https://github.com/matrix-org/matrix-react-sdk/pull/7975)). Fixes #21286. + * Fix bad ternary statement in autocomplete user pill insertions ([\#7977](https://github.com/matrix-org/matrix-react-sdk/pull/7977)). Fixes #21307. + * Fix sending locations into threads and fix i18n ([\#7943](https://github.com/matrix-org/matrix-react-sdk/pull/7943)). Fixes #21267. + * Fix location map attribution rendering over message action bar ([\#7974](https://github.com/matrix-org/matrix-react-sdk/pull/7974)). Fixes #21297. + * Fix wrongly asserting that PushRule::conditions is non-null ([\#7973](https://github.com/matrix-org/matrix-react-sdk/pull/7973)). Fixes #21305. + * Fix account & room settings race condition ([\#7953](https://github.com/matrix-org/matrix-react-sdk/pull/7953)). Fixes #21163. + * Fix bug with some space selections not being applied ([\#7971](https://github.com/matrix-org/matrix-react-sdk/pull/7971)). Fixes #21290. + * Revert "replace all require(.svg) with esm import" ([\#7969](https://github.com/matrix-org/matrix-react-sdk/pull/7969)). Fixes #21293. + * Hide unpinnable pinned messages in more cases ([\#7921](https://github.com/matrix-org/matrix-react-sdk/pull/7921)). + * Fix room list being laggy while scrolling 🐌 ([\#7939](https://github.com/matrix-org/matrix-react-sdk/pull/7939)). Fixes #21262. + * Make pinned messages more reliably reflect edits ([\#7920](https://github.com/matrix-org/matrix-react-sdk/pull/7920)). Fixes #17098. + * Improve accessibility of the BetaPill ([\#7949](https://github.com/matrix-org/matrix-react-sdk/pull/7949)). Fixes #21255. + * Autofocus correct composer after sending reaction ([\#7950](https://github.com/matrix-org/matrix-react-sdk/pull/7950)). Fixes #21273. + * Consider polls as message events for rendering redactions ([\#7944](https://github.com/matrix-org/matrix-react-sdk/pull/7944)). Fixes #21125. + * Prevent event tiles being shrunk/collapsed by flexbox ([\#7942](https://github.com/matrix-org/matrix-react-sdk/pull/7942)). Fixes #21269. + * Fix ExportDialog title on export cancellation ([\#7936](https://github.com/matrix-org/matrix-react-sdk/pull/7936)). Fixes #21260. Contributed by @luixxiul. + * Mandate use of js-sdk/src/matrix import over js-sdk/src ([\#7933](https://github.com/matrix-org/matrix-react-sdk/pull/7933)). Fixes #21253. + * Fix backspace not working in the invite dialog ([\#7931](https://github.com/matrix-org/matrix-react-sdk/pull/7931)). Fixes #21249. Contributed by @SimonBrandner. + * Fix right panel soft crashes due to missing room prop ([\#7923](https://github.com/matrix-org/matrix-react-sdk/pull/7923)). Fixes #21243. + * fix color of location share caret ([\#7917](https://github.com/matrix-org/matrix-react-sdk/pull/7917)). + * Wrap all EventTiles with a TileErrorBoundary and guard parsePermalink ([\#7916](https://github.com/matrix-org/matrix-react-sdk/pull/7916)). Fixes #21216. + * Fix changing space sometimes bouncing to the wrong space ([\#7910](https://github.com/matrix-org/matrix-react-sdk/pull/7910)). Fixes #20425. + * Ensure EventListSummary key does not change during backpagination ([\#7915](https://github.com/matrix-org/matrix-react-sdk/pull/7915)). Fixes #9192. + * Fix positioning of the thread context menu ([\#7918](https://github.com/matrix-org/matrix-react-sdk/pull/7918)). Fixes #21236. + * Inject sender into pinned messages ([\#7904](https://github.com/matrix-org/matrix-react-sdk/pull/7904)). Fixes #20314. + * Tweak info message padding in right panel timeline ([\#7901](https://github.com/matrix-org/matrix-react-sdk/pull/7901)). Fixes #21212. + * Fix another freeze on room switch ([\#7900](https://github.com/matrix-org/matrix-react-sdk/pull/7900)). Fixes #21127. + * Fix out of memory error when failing to acquire location ([\#7902](https://github.com/matrix-org/matrix-react-sdk/pull/7902)). Fixes #21213. + * Fix edge case in context menu chevron positioning ([\#7899](https://github.com/matrix-org/matrix-react-sdk/pull/7899)). + * Fix composer format buttons on WebKit ([\#7898](https://github.com/matrix-org/matrix-react-sdk/pull/7898)). Fixes #20868. + * manage voicerecording state when deleting or sending a voice message ([\#7896](https://github.com/matrix-org/matrix-react-sdk/pull/7896)). Fixes #21151. + * Fix bug with useRoomHierarchy tight-looping loadMore on error ([\#7893](https://github.com/matrix-org/matrix-react-sdk/pull/7893)). + * Fix upload button & shortcut not working for narrow composer mode ([\#7894](https://github.com/matrix-org/matrix-react-sdk/pull/7894)). Fixes #21175 and #21142. + * Fix emoji insertion in thread composer going to the main composer ([\#7895](https://github.com/matrix-org/matrix-react-sdk/pull/7895)). Fixes #21202. + * Try harder to keep context menus inside the window ([\#7863](https://github.com/matrix-org/matrix-react-sdk/pull/7863)). Fixes #17527 and #18377. + * Fix edge case around event list summary layout ([\#7891](https://github.com/matrix-org/matrix-react-sdk/pull/7891)). Fixes #21180. + * Fix event list summary 1 hidden message pluralisation ([\#7890](https://github.com/matrix-org/matrix-react-sdk/pull/7890)). Fixes #21196. + * Fix vanishing recently viewed menu ([\#7887](https://github.com/matrix-org/matrix-react-sdk/pull/7887)). Fixes #20827. + * Fix freeze on room switch ([\#7884](https://github.com/matrix-org/matrix-react-sdk/pull/7884)). Fixes #21127. + * Check 'useSystemTheme' in quick settings theme switcher ([\#7809](https://github.com/matrix-org/matrix-react-sdk/pull/7809)). Fixes #21061. + * Fix 'my threads' filtering to include participated threads ([\#7882](https://github.com/matrix-org/matrix-react-sdk/pull/7882)). Fixes #20877. + * Remove log line to try to fix freeze on answering VoIP call ([\#7883](https://github.com/matrix-org/matrix-react-sdk/pull/7883)). + * Support social login & password on soft logout page ([\#7879](https://github.com/matrix-org/matrix-react-sdk/pull/7879)). Fixes #21099. + * Fix missing padding on server picker ([\#7864](https://github.com/matrix-org/matrix-react-sdk/pull/7864)). + * Throttle RoomState.members handlers ([\#7876](https://github.com/matrix-org/matrix-react-sdk/pull/7876)). Fixes #21127. + * Only show joined/invited in search dialog ([\#7875](https://github.com/matrix-org/matrix-react-sdk/pull/7875)). Fixes #21161. + * Don't pillify code blocks ([\#7861](https://github.com/matrix-org/matrix-react-sdk/pull/7861)). Fixes #20851 and #18687. + * Fix keyboard shortcut icons on macOS ([\#7869](https://github.com/matrix-org/matrix-react-sdk/pull/7869)). + Changes in [1.10.6](https://github.com/vector-im/element-web/releases/tag/v1.10.6) (2022-03-01) =============================================================================================== diff --git a/README.md b/README.md index 93ed231ed7c..ebb70dbc70b 100644 --- a/README.md +++ b/README.md @@ -386,7 +386,7 @@ yarn test ### End-to-End tests -See [matrix-react-sdk](https://github.com/matrix-org/matrix-react-sdk/#end-to-end-tests) how to run the 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 ============ diff --git a/docs/config.md b/docs/config.md index 556b2ed1dcf..79055774ec6 100644 --- a/docs/config.md +++ b/docs/config.md @@ -35,6 +35,9 @@ For a good example, see https://develop.element.io/config.json. users to the SSO to log in if the user lands on the welcome page or no specific page. For example, https://app.element.io/#/welcome and https://app.element.io would redirect if set up to use this option. This can be useful to maintain guest experience until an account is needed. +1. `logout_redirect_url`: After Element has cleared the user's storage, the user will be redirected to this URL. + Typically most useful in environments where the account users will be logging into is managed for them, such + as in cases of some SSO deployments. For example: this page might log the user out of the SSO system too. 1. `features`: Lookup of optional features that may be force-enabled (`true`) or force-disabled (`false`). When features are not listed here, their defaults will be used, and users can turn them on/off if `showLabsSettings` allows them to. The available optional experimental features vary from release to release and are @@ -125,7 +128,12 @@ For a good example, see https://develop.element.io/config.json. `/.well-known/matrix/client` in its well-known location, and the JSON file at that location has a key `m.vector.riot.jitsi`. In this case, the configuration found in the well-known location is used instead. - +1. `jitsiWidget`: Options to change the built-in Jitsi widget behaviour. `jitsi` controls + how the widget gets created, but not how it behaves. + 1. `skipBuiltInWelcomeScreen`: If you'd like to skip the default "Join Conference" + behaviour, set this to `true`. This will cause the widget to assume that there's + a Jitsi welcome screen set up and point the user towards that. Note that this can + cause the camera/microphone to flicker as "in use" while Jitsi tests the devices. 1. `enable_presence_by_hs_url`: The property key should be the URL of the homeserver and its value defines whether to enable/disable the presence status display from that homeserver. If no options are configured, presence is shown for all @@ -184,6 +192,9 @@ For a good example, see https://develop.element.io/config.json. when explaining to the user where data is being sent. If not set, defaults to `brand`. 1. `defaultDeviceDisplayName`: The default device display name to use for new logins and registrations. If not set then a calculated version will be used. +1. `custom_translations_url`: An optional URL to allow overriding of translatable strings. + The JSON file must be in a format of `{"affected string": {"languageCode": "new string"}}`. + See https://github.com/matrix-org/matrix-react-sdk/pull/7886 for details. Note that `index.html` also has an og:image meta tag that is set to an image hosted on riot.im. This is the image used if links to your copy of Element diff --git a/docs/customisations.md b/docs/customisations.md index 979c81889d6..5af98a01f94 100644 --- a/docs/customisations.md +++ b/docs/customisations.md @@ -16,24 +16,30 @@ the React SDK, you can still override it from the Element Web layer: `element-web/src/customisations/YourNameSecurity.ts` 2. Edit customisations points and make sure export the ones you actually want to activate -3. Tweak the Element build process to use the customised module instead of the - default by adding this to the `additionalPlugins` array in `webpack.config.js`: - -```js -new webpack.NormalModuleReplacementPlugin( - /src[\/\\]customisations[\/\\]Security\.ts/, - path.resolve(__dirname, 'src/customisations/YourNameSecurity.ts'), -), -``` +3. Create/add an entry to `customisations.json` next to the webpack config: -If we add more customisation modules in the future, we'll likely improve these -steps to remove the need for build changes like the above. +```json +{ + "src/customisations/Security.ts": "src/customisations/YourNameSecurity.ts" +} +``` By isolating customisations to their own module, this approach should remove the chance of merge conflicts when updating your fork, and thus simplify ongoing maintenance. +**Note**: The project deliberately does not exclude `customisations.json` from Git. +This is to ensure that in shared projects it's possible to have a common config. By +default, Element Web does *not* ship with this file to prevent conflicts. + +### Custom components + +Instead of implementing skinning from the react-sdk, maintainers can use the above system to override components +if they wish. Maintenance and API surface compatibility are left as a responsibility for the project - the layering +in Element Web (including the react-sdk) do not make guarantees that properties/state machines won't change. + ### Component visibility customisation + UI for some actions can be hidden via the ComponentVisibility customisation: - inviting users to rooms and spaces, - creating rooms, @@ -41,21 +47,22 @@ UI for some actions can be hidden via the ComponentVisibility customisation: 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 or not the active MatrixClient user should be able to use +`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. If shown, the user might still not be able to use the component depending on their contextual permissions. For example, invite options -might be shown to the user but they won't have permission to invite users to +might be shown to the user, but they won't have permission to invite users to the current room: the button will appear disabled. For example, to only allow users who meet a certain condition to create spaces: -``` +```typescript function shouldShowComponent(component: UIComponent): boolean { - if (component === UIComponent.CreateSpaces) { - const userMeetsCondition = <> - return userMeetsCondition; - } - return true; + if (component === UIComponent.CreateSpaces) { + // customConditionCheck() is a function of your own creation + const userMeetsCondition = customConditionCheck(MatrixClientPeg.get().getUserId()); + return userMeetsCondition; + } + return true; } ``` -In this example, all UI related to creating a space will be hidden unless the users meets a custom condition. \ No newline at end of file +In this example, all UI related to creating a space will be hidden unless the users meets the custom condition. diff --git a/docs/labs.md b/docs/labs.md index 4ad65ea1d45..6e98a59d993 100644 --- a/docs/labs.md +++ b/docs/labs.md @@ -184,3 +184,19 @@ name and avatar (profile) were shown on historical messages instead of the profi at the time when the message was sent. When enabled, historical messages will use the current profile for the sender. + +## Pin drop location sharing (`feature_location_share_pin_drop`) [In Development] + +Enables sharing a pin drop location to the timeline. + +## Live location sharing (`feature_location_share_live`) [In Development] + +Enables sharing your current location to the timeline, with live updates. + +## Threaded Messaging (`feature_thread`) + +Threading allows users to branch out a new conversation from the main timeline of a room. This is particularly useful in high traffic rooms where multiple conversations can happen in parallel or when a single discussion might stretch over a very long period of time. + +Threads can be access by clicking their summary below the root event on the room timeline. Users can find a comprehensive list of threads by click the icon on the room header button. + +This feature might work in degraded mode if the homeserver a user is connected to does not advertise support for the unstable feature `org.matrix.msc3440` when calling the `/versions` API endpoint. diff --git a/docs/translating-dev.md b/docs/translating-dev.md index cac5174d770..505558bc3d1 100644 --- a/docs/translating-dev.md +++ b/docs/translating-dev.md @@ -30,7 +30,7 @@ function getColorName(hex) { ## Adding new strings - 1. Check if the import ``import { _t } from 'matrix-react-sdk/lib/languageHandler';`` is present. If not add it to the other import statements. Also import `_td` if needed. + 1. Check if the import ``import { _t } from 'matrix-react-sdk/src/languageHandler';`` is present. If not add it to the other import statements. Also import `_td` if needed. 1. Add ``_t()`` to your string. (Don't forget curly braces when you assign an expression to JSX attributes in the render method). If the string is introduced at a point before the translation system has not yet been initialized, use `_td()` instead, and call `_t()` at the appropriate time. 1. Run `yarn i18n` to update ``src/i18n/strings/en_EN.json`` 1. If you added a string with a plural, you can add other English plural variants to ``src/i18n/strings/en_EN.json`` (remeber to edit the one in the same project as the source file containing your new translation). diff --git a/package.json b/package.json index 6bd6b328b63..e8283af0903 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "element-web", - "version": "1.10.6", + "version": "1.10.7", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "repository": { @@ -60,8 +60,8 @@ "gfm.css": "^1.1.2", "jsrsasign": "^10.2.0", "katex": "^0.12.0", - "matrix-js-sdk": "15.6.0", - "matrix-react-sdk": "3.41.1", + "matrix-js-sdk": "16.0.0", + "matrix-react-sdk": "3.42.0", "matrix-widget-api": "^0.1.0-beta.18", "prop-types": "^15.7.2", "react": "17.0.2", @@ -90,6 +90,7 @@ "@pmmmwh/react-refresh-webpack-plugin": "^0.4.3", "@principalstudio/html-webpack-inject-preload": "^1.2.7", "@sentry/webpack-plugin": "^1.18.1", + "@svgr/webpack": "^5.5.0", "@types/flux": "^3.1.9", "@types/jest": "^27.0.2", "@types/modernizr": "^3.5.3", @@ -97,6 +98,7 @@ "@types/react": "17.0.14", "@types/react-dom": "17.0.9", "@types/sanitize-html": "^2.3.1", + "@types/ua-parser-js": "^0.7.36", "@typescript-eslint/eslint-plugin": "^5.6.0", "@typescript-eslint/parser": "^5.6.0", "allchange": "^1.0.6", @@ -108,12 +110,12 @@ "cpx": "^1.5.0", "css-loader": "^3.6.0", "dotenv": "^10.0.0", - "eslint": "7.18.0", + "eslint": "8.9.0", "eslint-config-google": "^0.14.0", "eslint-plugin-import": "^2.25.4", "eslint-plugin-matrix-org": "^0.4.0", - "eslint-plugin-react": "^7.22.0", - "eslint-plugin-react-hooks": "^4.2.0", + "eslint-plugin-react": "^7.28.0", + "eslint-plugin-react-hooks": "^4.3.0", "extract-text-webpack-plugin": "^4.0.0-beta.0", "fake-indexeddb": "^3.1.2", "file-loader": "^5.1.0", @@ -174,7 +176,8 @@ ], "moduleNameMapper": { "\\.(css|scss)$": "/__mocks__/cssMock.js", - "\\.(gif|png|svg|ttf|woff2)$": "/node_modules/matrix-react-sdk/__mocks__/imageMock.js", + "\\.(gif|png|ttf|woff2)$": "/node_modules/matrix-react-sdk/__mocks__/imageMock.js", + "\\.svg$": "/node_modules/matrix-react-sdk/__mocks__/svg.js", "\\$webapp/i18n/languages.json": "/node_modules/matrix-react-sdk/__mocks__/languages.json", "^browser-request$": "/node_modules/matrix-react-sdk/__mocks__/browser-request.js", "^react$": "/node_modules/react", diff --git a/scripts/copy-res.js b/scripts/copy-res.js index 2cd35e4241c..8d91092fdb7 100755 --- a/scripts/copy-res.js +++ b/scripts/copy-res.js @@ -33,7 +33,6 @@ const INCLUDE_LANGS = [ {'value': 'is', 'label': 'íslenska'}, {'value': 'it', 'label': 'Italiano'}, {'value': 'ja', 'label': '日本語'}, - {'value': 'jbo', 'label': 'banjubu\'o'}, {'value': 'kab', 'label': 'Taqbaylit'}, {'value': 'ko', 'label': '한국어'}, {'value': 'lt', 'label': 'Lietuvių'}, diff --git a/src/@types/svg.d.ts b/src/@types/svg.d.ts new file mode 100644 index 00000000000..29c2f555e31 --- /dev/null +++ b/src/@types/svg.d.ts @@ -0,0 +1,21 @@ +/* +Copyright 2022 The Matrix.org Foundation C.I.C. + +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. +*/ + +declare module "*.svg" { + const path: string; + export const Icon: React.FC>; + export default path; +} diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json index e15cc96eac8..24cdd0fc3dd 100644 --- a/src/i18n/strings/en_EN.json +++ b/src/i18n/strings/en_EN.json @@ -10,10 +10,6 @@ "Download Completed": "Download Completed", "Open": "Open", "Dismiss": "Dismiss", - "Switch to space by number": "Switch to space by number", - "Open user settings": "Open user settings", - "Previous recently visited room or community": "Previous recently visited room or community", - "Next recently visited room or community": "Next recently visited room or community", "%(brand)s Desktop (%(platformName)s)": "%(brand)s Desktop (%(platformName)s)", "Go to your browser to complete Sign In": "Go to your browser to complete Sign In", "Unknown device": "Unknown device", diff --git a/src/i18n/strings/fa.json b/src/i18n/strings/fa.json index 4e307331842..746df56a80c 100644 --- a/src/i18n/strings/fa.json +++ b/src/i18n/strings/fa.json @@ -2,15 +2,15 @@ "powered by Matrix": "قدرت‌یافته از ماتریکس", "Unknown device": "دستگاه ناشناخته", "Welcome to Element": "به Element خوش‌آمدید", - "Decentralised, encrypted chat & collaboration powered by [matrix]": "چت غیر‌متمرکز، رمزنگاری‌شده & قدرت‌گرفته از ماتریکس", + "Decentralised, encrypted chat & collaboration powered by [matrix]": "چت غیر‌متمرکز، رمزنگاری‌شده & راه اندازی شده با استفاده از ماتریکس", "Dismiss": "نادیده بگیر", - "You need to be using HTTPS to place a screen-sharing call.": "شما باید از ارتباط امن HTTPS برای به‌راه‌اندازی یک چتِ شامل به اشتراک‌گذاری صفحه‌ی کامیپوتر استفاده کنید.", + "You need to be using HTTPS to place a screen-sharing call.": "برای راه اندازی تماس با اشتراک صفحه باید از HTTPS استفاده کنید.", "Invalid JSON": "JSON اشتباه", "Open user settings": "تنظیمات کاربر", "Go to your browser to complete Sign In": "برای تکمیل ورود به مرورگر خود بروید", "Sign In": "ورود", - "Create Account": "ایجاد اکانت", - "Explore rooms": "کاوش اتاق", + "Create Account": "ایجاد حساب کاربری", + "Explore rooms": "جستجو در اتاق ها", "Missing indexeddb worker script!": "اسکریپت کارگر نمایه پایگاه داده از دست رفته است!", "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 را مشخص کنید.", "Invalid configuration: no default server specified.": "پیکربندی نامعتبر: سرور پیشفرض مشخص نشده است.", @@ -23,17 +23,17 @@ "Open": "باز", "Previous/next recently visited room or community": "قبلی/بعدی اتاق ها یا اجتماع های اخیرا بازدید شده", "%(brand)s Desktop (%(platformName)s)": "%(brand)s میزکار %(platformName)s", - "%(appName)s (%(browserName)s, %(osName)s)": "%(appName)s%(browserName)s، %(osName)s", - "Unsupported browser": "مرورگر پش‬تبانی نشده", - "Your browser can't run %(brand)s": "مرورگر شما نمیتواند %(brand)s را اجرا کند", - "%(brand)s uses advanced browser features which aren't supported by your current browser.": "%(brand)s از ویژگی های پیشرفته مرورگر استفاده میکند که در مرورگر فعلی شما پشتیبانی نمیشوند.", + "%(appName)s (%(browserName)s, %(osName)s)": "%(appName)s (%(browserName)s, %(osName)s)", + "Unsupported browser": "مرورگر پش‬تبانی نمی شود", + "Your browser can't run %(brand)s": "مرورگر شما نمی تواند %(brand)s را اجرا کند", + "%(brand)s uses advanced browser features which aren't supported by your current browser.": "%(brand)s از ویژگی های پیشرفته مرورگر استفاده می کند که در مرورگر فعلی شما پشتیبانی نمی شوند.", "Please install Chrome, Firefox, or Safari for the best experience.": "لطفا برای تجربه بهتر کروم، فایرفاکس، یا سافاری را نصب کنید.", - "You can continue using your current browser, but some or all features may not work and the look and feel of the application may be incorrect.": "شما میتوانید با مرورگر فعلی خود ادامه دهید، اما ممکن است برخی یا کل ویژگی ها کار نکنند و نگاه و احساس از برنامه ممکن است درست نباشد.", + "You can continue using your current browser, but some or all features may not work and the look and feel of the application may be incorrect.": "شما می توانید با مرورگر فعلی خود ادامه دهید، اما ممکن است عملکرد تمامی یا برخی از قابلیت ها با اشکال روبرو شود و نمایش برنامه صحیح نباشد.", "I understand the risks and wish to continue": "از خطرات این کار آگاهم و مایلم که ادامه بدهم", "Go to element.io": "برو به element.io", - "Failed to start": "مشکل در آغاز", - "Powered by Matrix": "قدرت‌گرفته از ماتریکس", - "Use %(brand)s on mobile": "استفاده از %(brand)s روی گوشی", + "Failed to start": "خطا در شروع", + "Powered by Matrix": "راه اندازی شده با استفاده از ماتریکس", + "Use %(brand)s on mobile": "از %(brand)s گوشی استفاده کنید", "Switch to space by number": "تغییر به فضا با شماره", "Previous recently visited room or community": "جلسه یا اتاق قبلی که اخیرا مشاهده شده است", "Next recently visited room or community": "جلسه یا اتاق بعدی که اخیرا مشاهده شده است" diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json index cca499ae441..032ad0528c0 100644 --- a/src/i18n/strings/fr.json +++ b/src/i18n/strings/fr.json @@ -9,14 +9,14 @@ "Create Account": "Créer un compte", "Explore rooms": "Parcourir les salons", "Unexpected error preparing the app. See console for details.": "Une erreur inattendue est survenue pendant la préparation de l’application. Consultez la console pour avoir des détails.", - "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Configuration invalide : il ne faut spécifier qu’un des trois champs parmis default_server_config, default_server_name et default_hs_url.", - "Invalid configuration: no default server specified.": "Configuration invalide : aucun serveur par défaut spécifié.", + "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Configuration invalide : il ne faut spécifier qu’un des trois champs parmi default_server_config, default_server_name et default_hs_url.", + "Invalid configuration: no default server specified.": "Configuration invalide : aucun serveur par défaut indiqué.", "The message from the parser is: %(message)s": "Le message de l’analyseur est : %(message)s", "Invalid JSON": "JSON non valide", "Go to your browser to complete Sign In": "Utilisez votre navigateur pour terminer la connexion", "Open user settings": "Ouvrir les paramètres utilisateur", "Missing indexeddb worker script!": "Script du worker IndexedDB manquant !", - "Unable to load config file: please refresh the page to try again.": "Impossible de charger le fichier de configuration : rafraichissez la page pour réessayer.", + "Unable to load config file: please refresh the page to try again.": "Impossible de charger le fichier de configuration : rechargez la page pour réessayer.", "Previous/next recently visited room or community": "Salon ou communauté visité récemment précédent/suivant", "%(appName)s (%(browserName)s, %(osName)s)": "%(appName)s (%(browserName)s, %(osName)s)", "Unsupported browser": "Navigateur non pris en charge", diff --git a/src/i18n/strings/he.json b/src/i18n/strings/he.json index 9af61b1d273..3fc6e263d53 100644 --- a/src/i18n/strings/he.json +++ b/src/i18n/strings/he.json @@ -2,9 +2,9 @@ "Dismiss": "התעלם", "powered by Matrix": "מופעל ע\"י Matrix", "Unknown device": "מכשיר לא ידוע", - "You need to be using HTTPS to place a screen-sharing call.": "עליך להשתמש ב HTTPS בכדי לבצע שיחת ווידאו משותפת.", + "You need to be using HTTPS to place a screen-sharing call.": "עליך להיות מחובר ב-HTTPS בכדי לבצע שיחה עם שיתוף מסך.", "Welcome to Element": "ברוכים הבאים ל Element", - "Decentralised, encrypted chat & collaboration powered by [matrix]": "צא'ט וכלי שיתוף פעולה מבוזר ומוצפן & מופעל באמצעות [matrix]", + "Decentralised, encrypted chat & collaboration powered by [matrix]": "צ'אט וכלי שיתוף פעולה מבוזר ומוצפן - מופעל באמצעות [matrix]", "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.", "Invalid configuration: no default server specified.": "תצורה שגויה: לא צוין שרת ברירת מחדל.", @@ -19,7 +19,7 @@ "Unexpected error preparing the app. See console for details.": "שגיאה לא צפויה במהלך טעינת האפליקציה. ראו קונסול לפרטים נוספים.", "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.": "האלמנט מכיל הגדרת JSON שגויה, אנא תקנו את הבעיה ואתחלו את הדף.", - "Your Element is misconfigured": "האלמנט מוגדר באופן שגוי", + "Your Element is misconfigured": "Element אינו מוגדר תקין", "Go to element.io": "חזור לאתר הראשי: element.io", "I understand the risks and wish to continue": "הסיכונים מובנים לי ואני מעוניינ/ת להמשיך", "You can continue using your current browser, but some or all features may not work and the look and feel of the application may be incorrect.": "ניתן להמשיך ולהשתמש בדפדפן זה, אך ייתכן שחלק מן התכונות והמאפיינים לא יעבדו כשורה או ייראו כשגויים.", diff --git a/src/i18n/strings/ja.json b/src/i18n/strings/ja.json index 11a7e5d37b4..37512ae3e38 100644 --- a/src/i18n/strings/ja.json +++ b/src/i18n/strings/ja.json @@ -1,5 +1,5 @@ { - "Welcome to Element": "Elementへようこそ", + "Welcome to Element": "Elementにようこそ", "Unknown device": "不明な端末", "Dismiss": "閉じる", "powered by Matrix": "powered by Matrix", @@ -10,25 +10,25 @@ "Sign In": "サインイン", "Create Account": "アカウントを作成", "Explore rooms": "ルームを探索", - "The message from the parser is: %(message)s": "パーザーのメッセージ: %(message)s", + "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のいずれか一つのみを指定できます。", - "Please install Chrome, Firefox, or Safari for the best experience.": "最高のユーザー体験を得るためには、ChromeやFirefox、もしくはSafariをインストールしてください。", + "Please install Chrome, Firefox, or Safari for the best experience.": "最高のユーザー体験を得るためには、ChromeかFirefox、もしくはSafariをインストールしてください。", "You can continue using your current browser, but some or all features may not work and the look and feel of the application may be incorrect.": "現在のブラウザーを使い続けることもできますが、いくつか（もしくは全ての）機能が動作しなかったり、外観が崩れたりする可能性があります。", "I understand the risks and wish to continue": "リスクを理解して続行", "Missing indexeddb worker script!": "IndexedDBのワーカースクリプトがありません！", - "Unable to load config file: please refresh the page to try again.": "設定ファイルの読み込みに失敗しました: ページを再読み込みしてもう一度お試しください。", - "Download Completed": "ダウンロード完了", + "Unable to load config file: please refresh the page to try again.": "設定ファイルの読み込みに失敗しました：ページを再読み込みしてもう一度お試しください。", + "Download Completed": "ダウンロードが完了しました", "Open": "開く", "Open user settings": "ユーザー設定を開く", "%(brand)s Desktop (%(platformName)s)": "%(brand)sデスクトップ版（%(platformName)s）", "Go to your browser to complete Sign In": "ブラウザーに移動してサインインを完了してください", - "%(appName)s (%(browserName)s, %(osName)s)": "%(appName)s(%(browserName)s, %(osName)s)", + "%(appName)s (%(browserName)s, %(osName)s)": "%(appName)s（%(browserName)s、%(osName)s）", "Unsupported browser": "サポートされていないブラウザー", "Go to element.io": "element.ioへ移動", "Failed to start": "起動に失敗しました", "Your Element is misconfigured": "Elementの設定が誤っています", - "Your Element configuration contains invalid JSON. Please correct the problem and reload the page.": "Elementの設定ファイルに不正なJSONが含まれています。問題を修正してからページを再読込してください。", + "Your Element configuration contains invalid JSON. Please correct the problem and reload the page.": "Elementの設定ファイルに不正なJSONが含まれています。問題を修正してからページを再読み込みしてください。", "Your browser can't run %(brand)s": "このブラウザーでは%(brand)sが動きません", "%(brand)s uses advanced browser features which aren't supported by your current browser.": "%(brand)sはブラウザーの高度な機能を使う必要がありますが、このブラウザーではその機能がサポートされていないようです。", "Powered by Matrix": "Powered by Matrix", diff --git a/src/vector/app.tsx b/src/vector/app.tsx index 61069fa2368..e92ad90136a 100644 --- a/src/vector/app.tsx +++ b/src/vector/app.tsx @@ -19,7 +19,7 @@ limitations under the License. */ import React from 'react'; -import * as sdk from 'matrix-react-sdk'; +import * as sdk from 'matrix-react-sdk/src/index'; import PlatformPeg from 'matrix-react-sdk/src/PlatformPeg'; import { _td, newTranslatableError } from 'matrix-react-sdk/src/languageHandler'; import AutoDiscoveryUtils from 'matrix-react-sdk/src/utils/AutoDiscoveryUtils'; diff --git a/src/vector/index.html b/src/vector/index.html index 388d849a50f..4bef2f126a4 100644 --- a/src/vector/index.html +++ b/src/vector/index.html @@ -64,14 +64,14 @@ - - - - - - - - + + + + + + + +