From 6103f4a9d302caba44423131c369ca1002a881e4 Mon Sep 17 00:00:00 2001 From: Robin Date: Tue, 22 Mar 2022 18:14:27 -0400 Subject: [PATCH 01/43] Voice rooms prototype (#21476) * Document voice rooms labs flag Signed-off-by: Robin Townsend * Add join and mute handlers to Jitsi wrapper Signed-off-by: Robin Townsend * Document voice rooms labs flag Signed-off-by: Robin Townsend * Mark voice rooms as in development Signed-off-by: Robin Townsend * ack at the end of widget event handlers Signed-off-by: Robin Townsend * Move acks back before suspend points Signed-off-by: Robin Townsend --- docs/labs.md | 4 +++ src/vector/jitsi/index.ts | 74 +++++++++++++++++++++++++++++++++++---- 2 files changed, 71 insertions(+), 7 deletions(-) diff --git a/docs/labs.md b/docs/labs.md index 06a6efd0d14..3fe37115073 100644 --- a/docs/labs.md +++ b/docs/labs.md @@ -196,3 +196,7 @@ Threading allows users to branch out a new conversation from the main timeline o 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. + +## Voice & video rooms (`feature_voice_rooms`) [In Development] + +Enables support for creating and joining voice & video rooms, which are persistent voice chats that users can jump in and out of. diff --git a/src/vector/jitsi/index.ts b/src/vector/jitsi/index.ts index c6783d5a6ba..d62b76f5acc 100644 --- a/src/vector/jitsi/index.ts +++ b/src/vector/jitsi/index.ts @@ -56,6 +56,8 @@ let widgetApi: WidgetApi; let meetApi: any; // JitsiMeetExternalAPI let skipOurWelcomeScreen = false; +const ack = (ev: CustomEvent) => widgetApi.transport.reply(ev.detail, {}); + (async function() { try { // Queue a config.json lookup asap, so we can use it later on. We want this to be concurrent with @@ -133,7 +135,6 @@ let skipOurWelcomeScreen = false; if (widgetApi) { await readyPromise; - await widgetApi.setAlwaysOnScreen(false); // start off as detachable from the screen // See https://github.com/matrix-org/prosody-mod-auth-matrix-user-verification if (jitsiAuth === JITSI_OPENIDTOKEN_JWT_AUTH) { @@ -142,12 +143,48 @@ let skipOurWelcomeScreen = false; logger.log("Got OpenID Connect token"); } - // TODO: register widgetApi listeners for PTT controls (https://github.com/vector-im/element-web/issues/12795) - + widgetApi.on(`action:${ElementWidgetActions.JoinCall}`, + (ev: CustomEvent) => { + joinConference(); + ack(ev); + }, + ); widgetApi.on(`action:${ElementWidgetActions.HangupCall}`, (ev: CustomEvent) => { - if (meetApi) meetApi.executeCommand('hangup'); - widgetApi.transport.reply(ev.detail, {}); // ack + meetApi?.executeCommand('hangup'); + ack(ev); + }, + ); + widgetApi.on(`action:${ElementWidgetActions.MuteAudio}`, + async (ev: CustomEvent) => { + ack(ev); + if (meetApi && !await meetApi.isAudioMuted()) { + meetApi.executeCommand('toggleAudio'); + } + }, + ); + widgetApi.on(`action:${ElementWidgetActions.UnmuteAudio}`, + async (ev: CustomEvent) => { + ack(ev); + if (meetApi && await meetApi.isAudioMuted()) { + meetApi.executeCommand('toggleAudio'); + } + }, + ); + widgetApi.on(`action:${ElementWidgetActions.MuteVideo}`, + async (ev: CustomEvent) => { + ack(ev); + if (meetApi && !await meetApi.isVideoMuted()) { + meetApi.executeCommand('toggleVideo'); + } + }, + ); + widgetApi.on(`action:${ElementWidgetActions.UnmuteVideo}`, + async (ev: CustomEvent) => { + ack(ev); + if (meetApi && await meetApi.isVideoMuted()) { + meetApi.executeCommand('toggleVideo'); + } }, ); widgetApi.on(`action:${ElementWidgetActions.StartLiveStream}`, @@ -160,7 +197,7 @@ let skipOurWelcomeScreen = false; //rtmpStreamKey: ev.detail.data.rtmpStreamKey, youtubeStreamKey: ev.detail.data.rtmpStreamKey, }); - widgetApi.transport.reply(ev.detail, {}); // ack + ack(ev); } else { widgetApi.transport.reply(ev.detail, { error: { message: "Conference not joined" } }); } @@ -293,6 +330,7 @@ function joinConference() { // event handler bound in HTML // ignored promise because we don't care if it works // noinspection JSIgnoredPromiseFromCall widgetApi.setAlwaysOnScreen(true); + widgetApi.transport.send(ElementWidgetActions.JoinCall, {}); } }); @@ -300,9 +338,13 @@ function joinConference() { // event handler bound in HTML switchVisibleContainers(); if (widgetApi) { + // We send the hangup event before setAlwaysOnScreen, because the latter + // can cause the receiving side to instantly stop listening. // ignored promise because we don't care if it works // noinspection JSIgnoredPromiseFromCall - widgetApi.setAlwaysOnScreen(false); + widgetApi.transport.send(ElementWidgetActions.HangupCall, {}).then(() => + widgetApi.setAlwaysOnScreen(false), + ); } document.getElementById("jitsiContainer").innerHTML = ""; @@ -312,4 +354,22 @@ function joinConference() { // event handler bound in HTML skipToJitsiSplashScreen(); } }); + + meetApi.on("audioMuteStatusChanged", ({ muted }) => { + const action = muted ? ElementWidgetActions.MuteAudio : ElementWidgetActions.UnmuteAudio; + widgetApi.transport.send(action, {}); + }); + + meetApi.on("videoMuteStatusChanged", ({ muted }) => { + const action = muted ? ElementWidgetActions.MuteVideo : ElementWidgetActions.UnmuteVideo; + widgetApi.transport.send(action, {}); + }); + + ["videoConferenceJoined", "participantJoined", "participantLeft"].forEach(event => { + meetApi.on(event, () => { + widgetApi?.transport.send(ElementWidgetActions.CallParticipants, { + participants: meetApi.getParticipantsInfo(), + }); + }); + }); } From 072f87a06a866b88975e14b48b446730f0941b9f Mon Sep 17 00:00:00 2001 From: Travis Ralston Date: Tue, 22 Mar 2022 16:48:26 -0600 Subject: [PATCH 02/43] Delete documentation relating to legacy communities (#21385) * Remove deprecated feature_communities_v2_prototypes * Fix typo * Remove now-unused docs Co-authored-by: Michael Telatynski <7t3chguy@gmail.com> --- docs/labs.md | 14 -------------- webpack.config.js | 2 +- 2 files changed, 1 insertion(+), 15 deletions(-) diff --git a/docs/labs.md b/docs/labs.md index 3fe37115073..e6e74db94ce 100644 --- a/docs/labs.md +++ b/docs/labs.md @@ -39,13 +39,6 @@ Also adds the `/jumptodate 2022-01-31` slash command. An experimental approach for supporting custom status messages across DMs. To set a status, click on your avatar next to the message composer. -## Custom tags (`feature_custom_tags`) - -An experimental approach for dealing with custom tags. Custom tags will appear in the bottom portion -of the community filter panel. - -Setting custom tags is not supported by Element. - ## Render simple counters in room header (`feature_state_counters`) Allows rendering of labelled counters above the message list. @@ -118,13 +111,6 @@ For some sample themes, check out [aaronraimist/element-themes](https://github.c To enable message previews for reactions in all rooms, enable `feature_roomlist_preview_reactions_all`. To enable message previews for reactions in DMs, enable `feature_roomlist_preview_reactions_dms`, ignored when it is enabled for all rooms. -## Communities v2 prototyping (`feature_communities_v2_prototypes`) [In Development] - -**This is a highly experimental implementation for parts of the communities v2 experience.** It does not -represent what communities v2 will look/feel like and can/will change without notice. Due to the early -stages this feature is in and the requirement for a compatible homeserver, we will not be accepting issues -or feedback for this functionality at this time. - ## Dehydrated devices (`feature_dehydration`) Allows users to receive encrypted messages by creating a device that is stored diff --git a/webpack.config.js b/webpack.config.js index fe72386a31d..ad64899c947 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -64,7 +64,7 @@ module.exports = (env, argv) => { // // argv.mode is always set to "production" by yarn build // (called to build prod, nightly and develop.element.io) - // arg.mode is set to "delopment" by yarn start + // arg.mode is set to "development" by yarn start // (called by developers, runs the continuous reload script) // process.env.CI_PACKAGE is set when yarn build is called from scripts/ci_package.sh // (called to build nightly and develop.element.io) From e638abf7c253e2de37c6bcd60a6b028e313bdefb Mon Sep 17 00:00:00 2001 From: Robin Date: Tue, 22 Mar 2022 19:29:11 -0400 Subject: [PATCH 03/43] Add voice rooms to labs labels (#21512) --- .github/workflows/triage-labelled.yml | 3 ++- .github/workflows/triage-unlabelled.yml | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/triage-labelled.yml b/.github/workflows/triage-labelled.yml index a2de4f29fa4..b57cf96eb84 100644 --- a/.github/workflows/triage-labelled.yml +++ b/.github/workflows/triage-labelled.yml @@ -16,7 +16,8 @@ jobs: contains(github.event.issue.labels.*.name, 'Z-IA') || contains(github.event.issue.labels.*.name, 'A-Themes-Custom') || contains(github.event.issue.labels.*.name, 'A-E2EE-Dehydration') || - contains(github.event.issue.labels.*.name, 'A-Tags') + contains(github.event.issue.labels.*.name, 'A-Tags') || + contains(github.event.issue.labels.*.name, 'A-Voice-Rooms') steps: - uses: actions/github-script@v5 with: diff --git a/.github/workflows/triage-unlabelled.yml b/.github/workflows/triage-unlabelled.yml index d6120a8b1a5..3a78dbb66e9 100644 --- a/.github/workflows/triage-unlabelled.yml +++ b/.github/workflows/triage-unlabelled.yml @@ -47,7 +47,8 @@ jobs: contains(github.event.issue.labels.*.name, 'Z-IA') || contains(github.event.issue.labels.*.name, 'A-Themes-Custom') || contains(github.event.issue.labels.*.name, 'A-E2EE-Dehydration') || - contains(github.event.issue.labels.*.name, 'A-Tags')) && + contains(github.event.issue.labels.*.name, 'A-Tags')) || + contains(github.event.issue.labels.*.name, 'A-Voice-Rooms')) && contains(github.event.issue.labels.*.name, 'Z-Labs') steps: - uses: actions/github-script@v5 From f2c3f880c711e3f9c6e3aacb8f829e67bed2ef1a Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Fri, 25 Mar 2022 10:34:25 +0000 Subject: [PATCH 04/43] Update Posthog URLs (#21559) --- element.io/app/config.json | 2 +- element.io/develop/config.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/element.io/app/config.json b/element.io/app/config.json index 6b94699ef16..a5ee01f9c74 100644 --- a/element.io/app/config.json +++ b/element.io/app/config.json @@ -52,7 +52,7 @@ }, "posthog": { "projectApiKey": "phc_Jzsm6DTm6V2705zeU5dcNvQDlonOR68XvX2sh1sEOHO", - "apiHost": "https://posthog.hss.element.io" + "apiHost": "https://posthog.element.io" }, "map_style_url": "https://api.maptiler.com/maps/streets/style.json?key=fU3vlMsMn4Jb6dnEIFsx" } diff --git a/element.io/develop/config.json b/element.io/develop/config.json index e945556c9d6..4be795fd3fd 100644 --- a/element.io/develop/config.json +++ b/element.io/develop/config.json @@ -56,7 +56,7 @@ }, "posthog": { "projectApiKey": "phc_Jzsm6DTm6V2705zeU5dcNvQDlonOR68XvX2sh1sEOHO", - "apiHost": "https://posthog.hss.element.io" + "apiHost": "https://posthog.element.io" }, "features": { "feature_spotlight": true From fe6a9c257b8915f1dd47b89abbaf5293461efb20 Mon Sep 17 00:00:00 2001 From: Travis Ralston Date: Fri, 25 Mar 2022 09:13:22 -0600 Subject: [PATCH 05/43] Fix style lint on Windows (#21557) --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 30facb3d7a0..226f78ab587 100644 --- a/package.json +++ b/package.json @@ -51,7 +51,7 @@ "lint:js": "eslint --max-warnings 0 src", "lint:js-fix": "eslint --fix src", "lint:types": "tsc --noEmit --jsx react", - "lint:style": "stylelint 'res/css/**/*.scss'", + "lint:style": "stylelint \"res/css/**/*.scss\"", "test": "jest" }, "dependencies": { From 6ae7d60f4ae1469b8244f66203cbe59b408505ec Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 25 Mar 2022 15:23:00 +0000 Subject: [PATCH 06/43] Bump minimist from 1.2.5 to 1.2.6 (#21561) Bumps [minimist](https://github.com/substack/minimist) from 1.2.5 to 1.2.6. - [Release notes](https://github.com/substack/minimist/releases) - [Commits](https://github.com/substack/minimist/compare/1.2.5...1.2.6) --- updated-dependencies: - dependency-name: minimist dependency-type: direct:development ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 226f78ab587..4955ecb7281 100644 --- a/package.json +++ b/package.json @@ -130,7 +130,7 @@ "matrix-react-test-utils": "^0.2.3", "matrix-web-i18n": "^1.2.0", "mini-css-extract-plugin": "^0.12.0", - "minimist": "^1.2.5", + "minimist": "^1.2.6", "mkdirp": "^1.0.4", "modernizr": "^3.12.0", "node-fetch": "^2.6.7", diff --git a/yarn.lock b/yarn.lock index c5a0abb6bfe..e3e19316b42 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8589,10 +8589,10 @@ minimist-options@4.1.0: is-plain-obj "^1.1.0" kind-of "^6.0.3" -minimist@>=1.2.2, minimist@^1.1.0, minimist@^1.1.1, minimist@^1.2.0, minimist@^1.2.5: - version "1.2.5" - resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602" - integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw== +minimist@>=1.2.2, minimist@^1.1.0, minimist@^1.1.1, minimist@^1.2.0, minimist@^1.2.5, minimist@^1.2.6: + version "1.2.6" + resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.6.tgz#8637a5b759ea0d6e98702cfb3a9283323c93af44" + integrity sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q== minipass-collect@^1.0.2: version "1.0.2" From 14f46a8ca99494cc6095e8a6ed788499552d2af8 Mon Sep 17 00:00:00 2001 From: Travis Ralston Date: Fri, 25 Mar 2022 10:43:03 -0600 Subject: [PATCH 07/43] Update location of Settings.ts in labs docs (#21562) --- docs/feature-flags.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/feature-flags.md b/docs/feature-flags.md index 1e7e5cce372..ddca7d40bd7 100644 --- a/docs/feature-flags.md +++ b/docs/feature-flags.md @@ -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/matrix-org/matrix-react-sdk/blob/develop/src/settings/Settings.ts) + [setting](https://github.com/matrix-org/matrix-react-sdk/blob/develop/src/settings/Settings.tsx) of the form: ```js "feature_cats": { @@ -81,7 +81,7 @@ configs. **Note:** The above will only enable the feature for https://app.element.io and official Element Desktop builds. It will not be enabled for self-hosted installed, custom desktop builds, etc. To -cover these cases, change the setting's `default` in `Settings.ts` to `true`. +cover these cases, change the setting's `default` in `Settings.tsx` to `true`. ## Feature deployed successfully From 7ce2538778b1227e2fd76c696acea434f73d0104 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Mon, 28 Mar 2022 16:28:55 +0100 Subject: [PATCH 08/43] Reset matrix-js-sdk back to develop branch --- package.json | 2 +- yarn.lock | 18 +++++++++++++++++- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 5158dc3a0d9..21034b4ce99 100644 --- a/package.json +++ b/package.json @@ -60,7 +60,7 @@ "gfm.css": "^1.1.2", "jsrsasign": "^10.2.0", "katex": "^0.12.0", - "matrix-js-sdk": "16.0.1", + "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop", "matrix-react-sdk": "3.42.1", "matrix-widget-api": "^0.1.0-beta.18", "prop-types": "^15.7.2", diff --git a/yarn.lock b/yarn.lock index 47d780cced1..ca73958fe54 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8211,7 +8211,7 @@ mathml-tag-names@^2.1.3: resolved "https://registry.yarnpkg.com/mathml-tag-names/-/mathml-tag-names-2.1.3.tgz#4ddadd67308e780cf16a47685878ee27b736a0a3" integrity sha512-APMBEanjybaPzUrfqU0IMU5I0AswKMH7k8OTLs0vvV4KZpExkTkY87nR/zpbuTPj+gARop7aGUbl11pnDfW6xg== -"matrix-analytics-events@github:matrix-org/matrix-analytics-events#daad3faed54f0b1f1e026a7498b4653e4d01cd90": +"matrix-analytics-events@github:matrix-org/matrix-analytics-events.git#daad3faed54f0b1f1e026a7498b4653e4d01cd90": version "0.0.1" resolved "https://codeload.github.com/matrix-org/matrix-analytics-events/tar.gz/daad3faed54f0b1f1e026a7498b4653e4d01cd90" @@ -8237,6 +8237,22 @@ matrix-js-sdk@16.0.1: request "^2.88.2" unhomoglyph "^1.0.6" +"matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop": + version "16.0.1" + resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/bdc3da1fac3cb454b409325b6a50cd869b3d5d57" + dependencies: + "@babel/runtime" "^7.12.5" + another-json "^0.2.0" + browser-request "^0.3.3" + bs58 "^4.0.1" + content-type "^1.0.4" + loglevel "^1.7.1" + matrix-events-sdk "^0.0.1-beta.7" + p-retry "^4.5.0" + qs "^6.9.6" + request "^2.88.2" + unhomoglyph "^1.0.6" + matrix-mock-request@^1.2.3: version "1.2.3" resolved "https://registry.yarnpkg.com/matrix-mock-request/-/matrix-mock-request-1.2.3.tgz#56b15d86e2601a9b48a854844396d18caab649c8" From 951fdaf3ab9ed7587e5ee1277f7adfba36b8700c Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Mon, 28 Mar 2022 16:29:08 +0100 Subject: [PATCH 09/43] Reset matrix-react-sdk back to develop branch --- package.json | 2 +- yarn.lock | 50 +++++++++++++++++++------------------------------- 2 files changed, 20 insertions(+), 32 deletions(-) diff --git a/package.json b/package.json index 21034b4ce99..97b3ac6c895 100644 --- a/package.json +++ b/package.json @@ -61,7 +61,7 @@ "jsrsasign": "^10.2.0", "katex": "^0.12.0", "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop", - "matrix-react-sdk": "3.42.1", + "matrix-react-sdk": "github:matrix-org/matrix-react-sdk#develop", "matrix-widget-api": "^0.1.0-beta.18", "prop-types": "^15.7.2", "react": "17.0.2", diff --git a/yarn.lock b/yarn.lock index ca73958fe54..901e436ebd9 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4676,15 +4676,20 @@ emoji-regex@^8.0.0: resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37" integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A== -emojibase-data@^6.2.0: - version "6.2.0" - resolved "https://registry.yarnpkg.com/emojibase-data/-/emojibase-data-6.2.0.tgz#db6c75c36905284fa623f4aa5f468d2be6ed364a" - integrity sha512-SWKaXD2QeQs06IE7qfJftsI5924Dqzp+V9xaa5RzZIEWhmlrG6Jt2iKwfgOPHu+5S8MEtOI7GdpKsXj46chXOw== +emojibase-data@7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/emojibase-data/-/emojibase-data-7.0.0.tgz#5e16ed265871d58b3ca7c3b2bc7d80853a55f34f" + integrity sha512-ka3p06egA+jqWnUUjNfOwYAw4j9/+KyUcCpFjSItM0NjbL8n5qZfe1mskmGUP4TkuE5SbiOvG++CC1iN+53jKg== -emojibase-regex@^5.1.3: - version "5.1.3" - resolved "https://registry.yarnpkg.com/emojibase-regex/-/emojibase-regex-5.1.3.tgz#f0ef621ed6ec624becd2326f999fd4ea01b94554" - integrity sha512-gT8T9LxLA8VJdI+8KQtyykB9qKzd7WuUL3M2yw6y9tplFeufOUANg3UKVaKUvkMcRNvZsSElWhxcJrx8WPE12g== +emojibase-regex@6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/emojibase-regex/-/emojibase-regex-6.0.0.tgz#2d236f6bd38e6aa69089707eb06fe1f6a3270198" + integrity sha512-vpo76XcjjFapY4Q1vZAp8fu07p9lNCZi0TMtpZ3XyHYRqnqYZTzHgSI7tMvpYmnD8xt9o4XC5oUaSJXT4Ky9Tw== + +emojibase@6.0.2: + version "6.0.2" + resolved "https://registry.yarnpkg.com/emojibase/-/emojibase-6.0.2.tgz#1e76996b2bd9e6927e51f54c3995245b03eacb02" + integrity sha512-2h2eblOm86tj+lsJLgLYmEni13H74KNNu1NI1ZgMOX9ByWuvjFZLhETEUH1edpcd8srAlzhfJSD892UbpxfwsA== emojis-list@^3.0.0: version "3.0.0" @@ -8220,23 +8225,6 @@ matrix-events-sdk@^0.0.1-beta.7: resolved "https://registry.yarnpkg.com/matrix-events-sdk/-/matrix-events-sdk-0.0.1-beta.7.tgz#5ffe45eba1f67cc8d7c2377736c728b322524934" integrity sha512-9jl4wtWanUFSy2sr2lCjErN/oC8KTAtaeaozJtrgot1JiQcEI4Rda9OLgQ7nLKaqb4Z/QUx/fR3XpDzm5Jy1JA== -matrix-js-sdk@16.0.1: - version "16.0.1" - resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-16.0.1.tgz#9b389ef16677ba648efad2929a7802af6f1dc81f" - integrity sha512-GRYZY7JZRqsVFa2nKO2qJbU4gQail2+1PgX2QDcibWizTL5Gh8YS384twprpIKqzdLHJ3d7H7A0L+uqc562ZsQ== - dependencies: - "@babel/runtime" "^7.12.5" - another-json "^0.2.0" - browser-request "^0.3.3" - bs58 "^4.0.1" - content-type "^1.0.4" - loglevel "^1.7.1" - matrix-events-sdk "^0.0.1-beta.7" - p-retry "^4.5.0" - qs "^6.9.6" - request "^2.88.2" - unhomoglyph "^1.0.6" - "matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop": version "16.0.1" resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/bdc3da1fac3cb454b409325b6a50cd869b3d5d57" @@ -8261,10 +8249,9 @@ matrix-mock-request@^1.2.3: bluebird "^3.5.0" expect "^1.20.2" -matrix-react-sdk@3.42.1: +"matrix-react-sdk@github:matrix-org/matrix-react-sdk#develop": version "3.42.1" - resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.42.1.tgz#15aec8c01f54cf8badf4423d7b1b8c3dc31d643e" - integrity sha512-XLNgoBkPc5qhJPX9o6kb1azua0Tgg7+NJ9pVyTM3J1lHXsP37oR9aeVLK7fGugnZEDN+fn0Hy9ROguAWNXruAA== + resolved "https://codeload.github.com/matrix-org/matrix-react-sdk/tar.gz/2520d8178401f91a786c7c5d44c216b3bd34085b" dependencies: "@babel/runtime" "^7.12.5" "@sentry/browser" "^6.11.0" @@ -8280,8 +8267,9 @@ matrix-react-sdk@3.42.1: counterpart "^0.18.6" diff-dom "^4.2.2" diff-match-patch "^1.0.5" - emojibase-data "^6.2.0" - emojibase-regex "^5.1.3" + emojibase "6.0.2" + emojibase-data "7.0.0" + emojibase-regex "6.0.0" escape-html "^1.0.3" file-saver "^2.0.5" filesize "6.1.0" @@ -8301,7 +8289,7 @@ matrix-react-sdk@3.42.1: maplibre-gl "^1.15.2" matrix-analytics-events "github:matrix-org/matrix-analytics-events.git#daad3faed54f0b1f1e026a7498b4653e4d01cd90" matrix-events-sdk "^0.0.1-beta.7" - matrix-js-sdk "16.0.1" + matrix-js-sdk "github:matrix-org/matrix-js-sdk#develop" matrix-widget-api "^0.1.0-beta.18" minimist "^1.2.5" opus-recorder "^8.0.3" From 02a5789dd3624e060f83979ea6ba01d2eccf7c1a Mon Sep 17 00:00:00 2001 From: Robin Date: Mon, 28 Mar 2022 11:44:25 -0400 Subject: [PATCH 10/43] Fix typo in labs label workflow (#21582) --- .github/workflows/triage-unlabelled.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/triage-unlabelled.yml b/.github/workflows/triage-unlabelled.yml index 3a78dbb66e9..2fbbfbd9b53 100644 --- a/.github/workflows/triage-unlabelled.yml +++ b/.github/workflows/triage-unlabelled.yml @@ -47,7 +47,7 @@ jobs: contains(github.event.issue.labels.*.name, 'Z-IA') || contains(github.event.issue.labels.*.name, 'A-Themes-Custom') || contains(github.event.issue.labels.*.name, 'A-E2EE-Dehydration') || - contains(github.event.issue.labels.*.name, 'A-Tags')) || + contains(github.event.issue.labels.*.name, 'A-Tags') || contains(github.event.issue.labels.*.name, 'A-Voice-Rooms')) && contains(github.event.issue.labels.*.name, 'Z-Labs') steps: From 5eecc768a389b9f839edd5a4a6f14809e5e2618b Mon Sep 17 00:00:00 2001 From: Michael Kaye <1917473+michaelkaye@users.noreply.github.com> Date: Tue, 29 Mar 2022 16:40:07 +0100 Subject: [PATCH 11/43] Docs: Require creation of config.json as part of Getting Started (#21590) * Require creation of config.json Change the language from "If desired" to "Configure" to ensure people do not miss this step, as skipping this step will show the error "Invalid configuration: no default server specified." * Update README.md Rollback unintentioned bullet point `3` change --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 919d58a1a58..ec8a9f5a806 100644 --- a/README.md +++ b/README.md @@ -41,8 +41,8 @@ released version of Element: 1. Untar the tarball on your web server 1. Move (or symlink) the `element-x.x.x` directory to an appropriate name 1. Configure the correct caching headers in your webserver (see below) -1. If desired, copy `config.sample.json` to `config.json` and edit it - as desired. See the [configuration docs](docs/config.md) for details. +1. Configure the app by copying `config.sample.json` to `config.json` and + modifying it. See the [configuration docs](docs/config.md) for details. 1. Enter the URL into your browser and log into Element! Releases are signed using gpg and the OpenPGP standard, and can be checked against the public key located From a8e914ad9f69f890d29309fead802315e2ab4cd6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sven=20M=C3=A4der?= Date: Wed, 30 Mar 2022 14:41:23 +0200 Subject: [PATCH 12/43] Fix show_labs_settings config.md typo (#21600) * Fix typo show_labs_settings * Document latex_maths_delims developer option --- docs/config.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/config.md b/docs/config.md index 6d01fc1dea5..833754e107f 100644 --- a/docs/config.md +++ b/docs/config.md @@ -61,7 +61,7 @@ To force a labs flag on or off, use the following: } ``` -If you'd like the user to be able to self-select which labs flags they can turn on, add `"show_labs_flags": true` to +If you'd like the user to be able to self-select which labs flags they can turn on, add `"show_labs_settings": true` to your config. This will turn on the tab in user settings. **Note**: Feature support varies release-by-release. Check the [labs flag documentation](./labs.md) frequently if enabling @@ -541,4 +541,4 @@ The following are undocumented or intended for developer use only. 1. `fallback_hs_url` 2. `sync_timeline_limit` 3. `dangerously_allow_unsafe_and_insecure_passwords` -4. `latex_maths_delims` +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. From f029b68ad4b1536236291948ca85150247949239 Mon Sep 17 00:00:00 2001 From: Shreeya <82967080+ttheshreeyasingh@users.noreply.github.com> Date: Wed, 30 Mar 2022 18:22:15 +0530 Subject: [PATCH 13/43] Updated 'Setting up a dev environment' in README.md (#21597) --- README.md | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index ec8a9f5a806..75049acdaec 100644 --- a/README.md +++ b/README.md @@ -305,11 +305,19 @@ yarn install popd ``` -Finally, build and start Element itself: +Clone the repo and switch to the `element-web` directory: ```bash git clone https://github.com/vector-im/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 @@ -330,9 +338,6 @@ Wait a few seconds for the initial build to finish; you should see something lik and rebuilds source files when they change. This development server also disables caching, so do NOT use it in production. -Configure the app by copying `config.sample.json` to `config.json` and -modifying it. See the [configuration docs](docs/config.md) for details. - Open in your browser to see your newly built Element. **Note**: The build script uses inotify by default on Linux to monitor directories From 5077157282d1c543eb8eaab962b8e96c8eb68842 Mon Sep 17 00:00:00 2001 From: Robin Date: Wed, 30 Mar 2022 11:57:26 -0400 Subject: [PATCH 14/43] Remove React HMR (#21607) --- package.json | 2 -- webpack.config.js | 5 ----- yarn.lock | 48 +---------------------------------------------- 3 files changed, 1 insertion(+), 54 deletions(-) diff --git a/package.json b/package.json index 97b3ac6c895..3bd2a2ba11c 100644 --- a/package.json +++ b/package.json @@ -87,7 +87,6 @@ "@babel/preset-typescript": "^7.12.7", "@babel/register": "^7.12.10", "@babel/runtime": "^7.12.5", - "@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", @@ -146,7 +145,6 @@ "postcss-simple-vars": "^5.0.2", "postcss-strip-inline-comments": "^0.1.5", "raw-loader": "^4.0.2", - "react-refresh": "^0.10.0", "rimraf": "^3.0.2", "shell-escape": "^0.2.0", "simple-proxy-agent": "^1.1.0", diff --git a/webpack.config.js b/webpack.config.js index ad64899c947..0fd747a61d3 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -8,7 +8,6 @@ const MiniCssExtractPlugin = require('mini-css-extract-plugin'); const TerserPlugin = require('terser-webpack-plugin'); const OptimizeCSSAssetsPlugin = require('optimize-css-assets-webpack-plugin'); const HtmlWebpackInjectPreload = require('@principalstudio/html-webpack-inject-preload'); -const ReactRefreshWebpackPlugin = require('@pmmmwh/react-refresh-webpack-plugin'); const SentryCliPlugin = require("@sentry/webpack-plugin"); dotenv.config(); @@ -242,9 +241,6 @@ module.exports = (env, argv) => { loader: 'babel-loader', options: { cacheDirectory: true, - plugins: [ - useHMR && require.resolve('react-refresh/babel'), - ].filter(Boolean), }, }, { @@ -624,7 +620,6 @@ module.exports = (env, argv) => { new HtmlWebpackInjectPreload({ files: [{ match: /.*Inter.*\.woff2$/ }], }), - useHMR && new ReactRefreshWebpackPlugin(fullPageErrors ? undefined : { overlay: { entry: false } }), // upload to sentry if sentry env is present process.env.SENTRY_DSN && diff --git a/yarn.lock b/yarn.lock index 901e436ebd9..dc1d04d87d0 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1551,18 +1551,6 @@ dependencies: "@octokit/openapi-types" "^11.2.0" -"@pmmmwh/react-refresh-webpack-plugin@^0.4.3": - version "0.4.3" - resolved "https://registry.yarnpkg.com/@pmmmwh/react-refresh-webpack-plugin/-/react-refresh-webpack-plugin-0.4.3.tgz#1eec460596d200c0236bf195b078a5d1df89b766" - integrity sha512-br5Qwvh8D2OQqSXpd1g/xqXKnK0r+Jz6qVKBbWmpUcrbGOxUrf39V5oZ1876084CGn18uMdR5uvPqBv9UqtBjQ== - dependencies: - ansi-html "^0.0.7" - error-stack-parser "^2.0.6" - html-entities "^1.2.1" - native-url "^0.2.6" - schema-utils "^2.6.5" - source-map "^0.7.3" - "@principalstudio/html-webpack-inject-preload@^1.2.7": version "1.2.7" resolved "https://registry.yarnpkg.com/@principalstudio/html-webpack-inject-preload/-/html-webpack-inject-preload-1.2.7.tgz#0c1f0b32a34d814b36ce84111f89990441cc64e8" @@ -2453,11 +2441,6 @@ ansi-html-community@0.0.8: resolved "https://registry.yarnpkg.com/ansi-html-community/-/ansi-html-community-0.0.8.tgz#69fbc4d6ccbe383f9736934ae34c3f8290f1bf41" integrity sha512-1APHAyr3+PCamwNw3bXCPp4HFLONZt/yIH0sZp0/469KWNTEy+qN5jQ3GVX6DMZ1UXAi34yVwtTeaG/HpBuuzw== -ansi-html@^0.0.7: - version "0.0.7" - resolved "https://registry.yarnpkg.com/ansi-html/-/ansi-html-0.0.7.tgz#813584021962a9e9e6fd039f940d12f56ca7859e" - integrity sha1-gTWEAhliqenm/QOflA0S9WynhZ4= - ansi-regex@^2.0.0: version "2.1.1" resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df" @@ -4758,13 +4741,6 @@ error-ex@^1.3.1: dependencies: is-arrayish "^0.2.1" -error-stack-parser@^2.0.6: - version "2.0.6" - resolved "https://registry.yarnpkg.com/error-stack-parser/-/error-stack-parser-2.0.6.tgz#5a99a707bd7a4c58a797902d48d82803ede6aad8" - integrity sha512-d51brTeqC+BHlwF0BhPtcYgF5nlzf9ZZ0ZIUQNZpc9ZB9qw5IJ2diTrBY9jlCJkTLITYPjmiX6OWCwH+fuyNgQ== - dependencies: - stackframe "^1.1.1" - es-abstract@^1.17.2, es-abstract@^1.18.5, es-abstract@^1.19.0, es-abstract@^1.19.1: version "1.19.1" resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.19.1.tgz#d4885796876916959de78edaa0df456627115ec3" @@ -6267,7 +6243,7 @@ html-encoding-sniffer@^2.0.1: dependencies: whatwg-encoding "^1.0.5" -html-entities@^1.2.1, html-entities@^1.3.1, html-entities@^1.4.0: +html-entities@^1.3.1, html-entities@^1.4.0: version "1.4.0" resolved "https://registry.yarnpkg.com/html-entities/-/html-entities-1.4.0.tgz#cfbd1b01d2afaf9adca1b10ae7dffab98c71d2dc" integrity sha512-8nxjcBcd8wovbeKx7h3wTji4e6+rhaVuPNpMqwWgnHh+N9ToqsCs6XztWRBPQ+UtzsoMAdKZtUENoVzU/EMtZA== @@ -8749,13 +8725,6 @@ nanomatch@^1.2.9: snapdragon "^0.8.1" to-regex "^3.0.1" -native-url@^0.2.6: - version "0.2.6" - resolved "https://registry.yarnpkg.com/native-url/-/native-url-0.2.6.tgz#ca1258f5ace169c716ff44eccbddb674e10399ae" - integrity sha512-k4bDC87WtgrdD362gZz6zoiXQrl40kYlBmpfmSjwRO1VU0V5ccwJTlxuE72F6m3V0vc1xOf6n3UCP9QyerRqmA== - dependencies: - querystring "^0.2.0" - natural-compare@^1.4.0: version "1.4.0" resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7" @@ -10559,11 +10528,6 @@ querystring@0.2.0: resolved "https://registry.yarnpkg.com/querystring/-/querystring-0.2.0.tgz#b209849203bb25df820da756e747005878521620" integrity sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA= -querystring@^0.2.0: - version "0.2.1" - resolved "https://registry.yarnpkg.com/querystring/-/querystring-0.2.1.tgz#40d77615bb09d16902a85c3e38aa8b5ed761c2dd" - integrity sha512-wkvS7mL/JMugcup3/rMitHmd9ecIGd2lhFhK9N3UUQ450h66d1r3Y9nvXzQAW1Lq+wyx61k/1pfKS5KuKiyEbg== - querystringify@^2.1.1: version "2.2.0" resolved "https://registry.yarnpkg.com/querystringify/-/querystringify-2.2.0.tgz#3345941b4153cb9d082d8eee4cda2016a9aef7f6" @@ -10711,11 +10675,6 @@ react-redux@^7.2.0: prop-types "^15.7.2" react-is "^17.0.2" -react-refresh@^0.10.0: - version "0.10.0" - resolved "https://registry.yarnpkg.com/react-refresh/-/react-refresh-0.10.0.tgz#2f536c9660c0b9b1d500684d9e52a65e7404f7e3" - integrity sha512-PgidR3wST3dDYKr6b4pJoqQFpPGNKDSCDx4cZoshjXipw3LzO7mG1My2pwEzz2JVkF+inx3xRpDeQLFQGH/hsQ== - react-transition-group@^4.4.1: version "4.4.2" resolved "https://registry.yarnpkg.com/react-transition-group/-/react-transition-group-4.4.2.tgz#8b59a56f09ced7b55cbd53c36768b922890d5470" @@ -11756,11 +11715,6 @@ stack-utils@^2.0.2: dependencies: escape-string-regexp "^2.0.0" -stackframe@^1.1.1: - version "1.2.0" - resolved "https://registry.yarnpkg.com/stackframe/-/stackframe-1.2.0.tgz#52429492d63c62eb989804c11552e3d22e779303" - integrity sha512-GrdeshiRmS1YLMYgzF16olf2jJ/IzxXY9lhKOskuVziubpTYcYqyOwYeJKzQkwy7uN0fYSsbsC4RQaXf9LCrYA== - static-extend@^0.1.1: version "0.1.2" resolved "https://registry.yarnpkg.com/static-extend/-/static-extend-0.1.2.tgz#60809c39cbff55337226fd5e0b520f341f1fb5c6" From 8ce9488bb527fb1cab9cecd02198cfbf5b3201dd Mon Sep 17 00:00:00 2001 From: Kat Gerasimova Date: Thu, 31 Mar 2022 16:55:10 +0100 Subject: [PATCH 15/43] Add automation for "A-New-Search-Experience" label (#21622) Add A-New-Search-Experience label for automation to Delight board and to add Z-Labs label. This label is currently down as A-Spotlight-Search, but I will rename it. --- .github/workflows/triage-labelled.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/triage-labelled.yml b/.github/workflows/triage-labelled.yml index b57cf96eb84..041052e49cb 100644 --- a/.github/workflows/triage-labelled.yml +++ b/.github/workflows/triage-labelled.yml @@ -1,4 +1,4 @@ -name: Move labelled issues to correct boards and columns +name: Move labelled issues to correct projects on: issues: @@ -11,6 +11,7 @@ jobs: 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-New-Search-Experience') || contains(github.event.issue.labels.*.name, 'A-Threads') || contains(github.event.issue.labels.*.name, 'A-Location-Sharing') || contains(github.event.issue.labels.*.name, 'Z-IA') || @@ -99,6 +100,7 @@ jobs: name: Delight issues to project board runs-on: ubuntu-latest if: > + contains(github.event.issue.labels.*.name, 'A-New-Search-Experience') || contains(github.event.issue.labels.*.name, 'A-Spaces') || contains(github.event.issue.labels.*.name, 'A-Space-Settings') || contains(github.event.issue.labels.*.name, 'A-Subspaces') || From 58cca0a77ac9483c82e9bef3ad36377a74bb09e0 Mon Sep 17 00:00:00 2001 From: Robin Date: Thu, 31 Mar 2022 18:01:49 -0400 Subject: [PATCH 16/43] Update name of video rooms label (#21629) --- .github/workflows/triage-labelled.yml | 2 +- .github/workflows/triage-unlabelled.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/triage-labelled.yml b/.github/workflows/triage-labelled.yml index 041052e49cb..d95cccc730e 100644 --- a/.github/workflows/triage-labelled.yml +++ b/.github/workflows/triage-labelled.yml @@ -18,7 +18,7 @@ jobs: contains(github.event.issue.labels.*.name, 'A-Themes-Custom') || contains(github.event.issue.labels.*.name, 'A-E2EE-Dehydration') || contains(github.event.issue.labels.*.name, 'A-Tags') || - contains(github.event.issue.labels.*.name, 'A-Voice-Rooms') + contains(github.event.issue.labels.*.name, 'A-Video-Rooms') steps: - uses: actions/github-script@v5 with: diff --git a/.github/workflows/triage-unlabelled.yml b/.github/workflows/triage-unlabelled.yml index 2fbbfbd9b53..74ae5c22688 100644 --- a/.github/workflows/triage-unlabelled.yml +++ b/.github/workflows/triage-unlabelled.yml @@ -48,7 +48,7 @@ jobs: contains(github.event.issue.labels.*.name, 'A-Themes-Custom') || contains(github.event.issue.labels.*.name, 'A-E2EE-Dehydration') || contains(github.event.issue.labels.*.name, 'A-Tags') || - contains(github.event.issue.labels.*.name, 'A-Voice-Rooms')) && + contains(github.event.issue.labels.*.name, 'A-Video-Rooms')) && contains(github.event.issue.labels.*.name, 'Z-Labs') steps: - uses: actions/github-script@v5 From aeb6cddc2f150881ff59d9244d53604f5f3ceb5d Mon Sep 17 00:00:00 2001 From: Robin Date: Fri, 1 Apr 2022 11:28:47 -0400 Subject: [PATCH 17/43] Update video rooms to new design specs (#21623) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * "Voice room" → "video room" * Customize Jitsi behavior in video rooms --- docs/labs.md | 4 ++-- src/vector/jitsi/index.ts | 23 +++++++++++++++++++++-- 2 files changed, 23 insertions(+), 4 deletions(-) diff --git a/docs/labs.md b/docs/labs.md index e6e74db94ce..72b8b09baeb 100644 --- a/docs/labs.md +++ b/docs/labs.md @@ -183,6 +183,6 @@ Threads can be access by clicking their summary below the root event on the room 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. -## Voice & video rooms (`feature_voice_rooms`) [In Development] +## Voice & video rooms (`feature_video_rooms`) [In Development] -Enables support for creating and joining voice & video rooms, which are persistent voice 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. diff --git a/src/vector/jitsi/index.ts b/src/vector/jitsi/index.ts index d62b76f5acc..598d4f3e051 100644 --- a/src/vector/jitsi/index.ts +++ b/src/vector/jitsi/index.ts @@ -51,6 +51,7 @@ let roomId: string; let openIdToken: IOpenIDCredentials; let roomName: string; let startAudioOnly: boolean; +let isVideoChannel: boolean; let widgetApi: WidgetApi; let meetApi: any; // JitsiMeetExternalAPI @@ -120,12 +121,13 @@ const ack = (ev: CustomEvent) => widgetApi.transport.reply(ev roomId = qsParam('roomId', true); roomName = qsParam('roomName', true); startAudioOnly = qsParam('isAudioOnly', true) === "true"; + isVideoChannel = qsParam('isVideoChannel', true) === "true"; // We've reached the point where we have to wait for the config, so do that then parse it. const instanceConfig = new SnakedObject((await configPromise) ?? {}); const jitsiConfig = instanceConfig.get("jitsi_widget") ?? {}; skipOurWelcomeScreen = (new SnakedObject(jitsiConfig)) - .get("skip_built_in_welcome_screen") || false; + .get("skip_built_in_welcome_screen") || isVideoChannel; // If we're meant to skip our screen, skip to the part where we show Jitsi instead of us. // We don't set up the call yet though as this might lead to failure without the widget API. @@ -300,6 +302,7 @@ function joinConference() { // event handler bound in HTML "they mention 'external_api' or 'jitsi' in the stack. They're just Jitsi Meet trying to parse " + "our fragment values and not recognizing the options.", ); + const options = { width: "100%", height: "100%", @@ -313,10 +316,23 @@ function joinConference() { // event handler bound in HTML }, configOverwrite: { startAudioOnly, - }, + } as any, jwt: jwt, }; + // Video channel widgets need some more tailored config options + if (isVideoChannel) { + // Ensure that we start on Jitsi Meet's native prejoin screen, for + // deployments that skip straight to the conference by default + options.configOverwrite.prejoinConfig = { enabled: true }; + // Use a simplified set of toolbar buttons + options.configOverwrite.toolbarButtons = [ + "microphone", "camera", "desktop", "tileview", "hangup", + ]; + // Hide all top bar elements + options.configOverwrite.conferenceInfo = { autoHide: [] }; + } + meetApi = new JitsiMeetExternalAPI(jitsiDomain, options); if (displayName) meetApi.executeCommand("displayName", displayName); if (avatarUrl) meetApi.executeCommand("avatarUrl", avatarUrl); @@ -332,6 +348,9 @@ function joinConference() { // event handler bound in HTML widgetApi.setAlwaysOnScreen(true); widgetApi.transport.send(ElementWidgetActions.JoinCall, {}); } + + // Video rooms should start in tile mode + if (isVideoChannel) meetApi.executeCommand("setTileView", true); }); meetApi.on("readyToClose", () => { From b1a60b25b4c8e006328d13f1d73afe5f792d3041 Mon Sep 17 00:00:00 2001 From: "Shivrani A. Jadhav" <86149243+ShivraniAJ@users.noreply.github.com> Date: Mon, 4 Apr 2022 11:35:37 +0530 Subject: [PATCH 18/43] Fix typo in translation docs (#21653) * Correct typo * Removing extra lines --- docs/translating.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/translating.md b/docs/translating.md index a8d29a387d9..bfb97027513 100644 --- a/docs/translating.md +++ b/docs/translating.md @@ -62,4 +62,4 @@ You can use inside the translation field "Review needed" checkbox. It will be sh ### Further reading -The official Weblate doc provides some more in-deepth explanation on how to do translations and talks about do and don'ts. You can find it at: https://docs.weblate.org/en/latest/user/translating.html +The official Weblate doc provides some more in-depth explanation on how to do translations and talks about do and don'ts. You can find it at: https://docs.weblate.org/en/latest/user/translating.html \ No newline at end of file From b79133c6947b51233982e3d253cb869a1b3d078a Mon Sep 17 00:00:00 2001 From: Robin Date: Mon, 4 Apr 2022 07:32:12 -0400 Subject: [PATCH 19/43] Fix stuck persistence of Jitsi widgets (#21650) The hangup event may or may not be handled, so we need to account for cases where it throws an error. --- src/vector/jitsi/index.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/vector/jitsi/index.ts b/src/vector/jitsi/index.ts index 598d4f3e051..346c9dab0c2 100644 --- a/src/vector/jitsi/index.ts +++ b/src/vector/jitsi/index.ts @@ -361,7 +361,7 @@ function joinConference() { // event handler bound in HTML // can cause the receiving side to instantly stop listening. // ignored promise because we don't care if it works // noinspection JSIgnoredPromiseFromCall - widgetApi.transport.send(ElementWidgetActions.HangupCall, {}).then(() => + widgetApi.transport.send(ElementWidgetActions.HangupCall, {}).finally(() => widgetApi.setAlwaysOnScreen(false), ); } From eab8a19ec7e897e0834edf29ad15281798d6bda3 Mon Sep 17 00:00:00 2001 From: Robin Date: Tue, 5 Apr 2022 11:32:26 -0400 Subject: [PATCH 20/43] Avoid flashing the Jitsi prejoin screen at the user before skipping it (#21665) --- src/vector/jitsi/index.scss | 4 ++++ src/vector/jitsi/index.ts | 6 ++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/vector/jitsi/index.scss b/src/vector/jitsi/index.scss index 95a23c1772d..ac6aff16524 100644 --- a/src/vector/jitsi/index.scss +++ b/src/vector/jitsi/index.scss @@ -56,6 +56,10 @@ body, html { position: absolute; height: 100%; width: 100%; + + // Hidden by default to avoid flashing the prejoin screen at the user when + // we're supposed to skip it anyways + visibility: hidden; } .joinConferenceFloating { diff --git a/src/vector/jitsi/index.ts b/src/vector/jitsi/index.ts index 346c9dab0c2..055d4aff4f8 100644 --- a/src/vector/jitsi/index.ts +++ b/src/vector/jitsi/index.ts @@ -129,11 +129,9 @@ const ack = (ev: CustomEvent) => widgetApi.transport.reply(ev skipOurWelcomeScreen = (new SnakedObject(jitsiConfig)) .get("skip_built_in_welcome_screen") || isVideoChannel; - // If we're meant to skip our screen, skip to the part where we show Jitsi instead of us. + // Either reveal the prejoin screen, or skip straight to Jitsi depending on the config. // We don't set up the call yet though as this might lead to failure without the widget API. - if (skipOurWelcomeScreen) { - toggleConferenceVisibility(true); - } + toggleConferenceVisibility(skipOurWelcomeScreen); if (widgetApi) { await readyPromise; From 95de3c1b048b8921eac68a25213bba1b8e5f9897 Mon Sep 17 00:00:00 2001 From: Element Translate Bot Date: Tue, 5 Apr 2022 18:52:15 +0200 Subject: [PATCH 21/43] Translations update from Weblate (#21688) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Translated using Weblate (Frisian) Currently translated at 100.0% (34 of 34 strings) Translation: Element Web/element-web Translate-URL: https://translate.element.io/projects/element-web/element-web/fy/ * Translated using Weblate (Polish) Currently translated at 100.0% (34 of 34 strings) Translation: Element Web/element-web Translate-URL: https://translate.element.io/projects/element-web/element-web/pl/ * Translated using Weblate (Indonesian) Currently translated at 100.0% (34 of 34 strings) Translation: Element Web/element-web Translate-URL: https://translate.element.io/projects/element-web/element-web/id/ * Translated using Weblate (Dutch) Currently translated at 100.0% (34 of 34 strings) Translation: Element Web/element-web Translate-URL: https://translate.element.io/projects/element-web/element-web/nl/ * Translated using Weblate (Slovak) Currently translated at 97.0% (33 of 34 strings) Translation: Element Web/element-web Translate-URL: https://translate.element.io/projects/element-web/element-web/sk/ * Translated using Weblate (Hebrew) Currently translated at 97.0% (33 of 34 strings) Translation: Element Web/element-web Translate-URL: https://translate.element.io/projects/element-web/element-web/he/ * Translated using Weblate (Hebrew) Currently translated at 97.0% (33 of 34 strings) Translation: Element Web/element-web Translate-URL: https://translate.element.io/projects/element-web/element-web/he/ * Translated using Weblate (Hebrew) Currently translated at 100.0% (34 of 34 strings) Translation: Element Web/element-web Translate-URL: https://translate.element.io/projects/element-web/element-web/he/ * Translated using Weblate (Dutch) Currently translated at 100.0% (34 of 34 strings) Translation: Element Web/element-web Translate-URL: https://translate.element.io/projects/element-web/element-web/nl/ * Translated using Weblate (Slovak) Currently translated at 100.0% (34 of 34 strings) Translation: Element Web/element-web Translate-URL: https://translate.element.io/projects/element-web/element-web/sk/ * Translated using Weblate (Indonesian) Currently translated at 100.0% (34 of 34 strings) Translation: Element Web/element-web Translate-URL: https://translate.element.io/projects/element-web/element-web/id/ * Added translation using Weblate (Uzbek) * Translated using Weblate (Ukrainian) Currently translated at 100.0% (34 of 34 strings) Translation: Element Web/element-web Translate-URL: https://translate.element.io/projects/element-web/element-web/uk/ * Translated using Weblate (Slovak) Currently translated at 100.0% (34 of 34 strings) Translation: Element Web/element-web Translate-URL: https://translate.element.io/projects/element-web/element-web/sk/ * Translated using Weblate (Norwegian Nynorsk) Currently translated at 100.0% (34 of 34 strings) Translation: Element Web/element-web Translate-URL: https://translate.element.io/projects/element-web/element-web/nn/ * Translated using Weblate (Norwegian Nynorsk) Currently translated at 100.0% (34 of 34 strings) Translation: Element Web/element-web Translate-URL: https://translate.element.io/projects/element-web/element-web/nn/ * Translated using Weblate (Greek) Currently translated at 100.0% (34 of 34 strings) Translation: Element Web/element-web Translate-URL: https://translate.element.io/projects/element-web/element-web/el/ * Translated using Weblate (Vietnamese) Currently translated at 100.0% (34 of 34 strings) Translation: Element Web/element-web Translate-URL: https://translate.element.io/projects/element-web/element-web/vi/ * Translated using Weblate (Dutch) Currently translated at 100.0% (34 of 34 strings) Translation: Element Web/element-web Translate-URL: https://translate.element.io/projects/element-web/element-web/nl/ * Translated using Weblate (Dutch) Currently translated at 100.0% (35 of 35 strings) Translation: Element Web/element-web Translate-URL: https://translate.element.io/projects/element-web/element-web/nl/ * Translated using Weblate (Ukrainian) Currently translated at 100.0% (35 of 35 strings) Translation: Element Web/element-web Translate-URL: https://translate.element.io/projects/element-web/element-web/uk/ * Translated using Weblate (Indonesian) Currently translated at 100.0% (35 of 35 strings) Translation: Element Web/element-web Translate-URL: https://translate.element.io/projects/element-web/element-web/id/ * Translated using Weblate (Italian) Currently translated at 100.0% (35 of 35 strings) Translation: Element Web/element-web Translate-URL: https://translate.element.io/projects/element-web/element-web/it/ * Translated using Weblate (Czech) Currently translated at 100.0% (35 of 35 strings) Translation: Element Web/element-web Translate-URL: https://translate.element.io/projects/element-web/element-web/cs/ * Translated using Weblate (Albanian) Currently translated at 100.0% (35 of 35 strings) Translation: Element Web/element-web Translate-URL: https://translate.element.io/projects/element-web/element-web/sq/ * Translated using Weblate (Polish) Currently translated at 100.0% (35 of 35 strings) Translation: Element Web/element-web Translate-URL: https://translate.element.io/projects/element-web/element-web/pl/ * Translated using Weblate (Polish) Currently translated at 100.0% (35 of 35 strings) Translation: Element Web/element-web Translate-URL: https://translate.element.io/projects/element-web/element-web/pl/ * Translated using Weblate (Polish) Currently translated at 100.0% (35 of 35 strings) Translation: Element Web/element-web Translate-URL: https://translate.element.io/projects/element-web/element-web/pl/ * Translated using Weblate (Hungarian) Currently translated at 100.0% (35 of 35 strings) Translation: Element Web/element-web Translate-URL: https://translate.element.io/projects/element-web/element-web/hu/ * Translated using Weblate (Polish) Currently translated at 100.0% (35 of 35 strings) Translation: Element Web/element-web Translate-URL: https://translate.element.io/projects/element-web/element-web/pl/ * Translated using Weblate (Swedish) Currently translated at 100.0% (35 of 35 strings) Translation: Element Web/element-web Translate-URL: https://translate.element.io/projects/element-web/element-web/sv/ * Translated using Weblate (Chinese (Traditional)) Currently translated at 100.0% (35 of 35 strings) Translation: Element Web/element-web Translate-URL: https://translate.element.io/projects/element-web/element-web/zh_Hant/ * Translated using Weblate (Estonian) Currently translated at 100.0% (35 of 35 strings) Translation: Element Web/element-web Translate-URL: https://translate.element.io/projects/element-web/element-web/et/ * Translated using Weblate (Portuguese (Brazil)) Currently translated at 100.0% (35 of 35 strings) Translation: Element Web/element-web Translate-URL: https://translate.element.io/projects/element-web/element-web/pt_BR/ * Translated using Weblate (Danish) Currently translated at 94.2% (33 of 35 strings) Translation: Element Web/element-web Translate-URL: https://translate.element.io/projects/element-web/element-web/da/ * Translated using Weblate (Danish) Currently translated at 100.0% (35 of 35 strings) Translation: Element Web/element-web Translate-URL: https://translate.element.io/projects/element-web/element-web/da/ * Translated using Weblate (German) Currently translated at 100.0% (35 of 35 strings) Translation: Element Web/element-web Translate-URL: https://translate.element.io/projects/element-web/element-web/de/ * Translated using Weblate (German) Currently translated at 100.0% (35 of 35 strings) Translation: Element Web/element-web Translate-URL: https://translate.element.io/projects/element-web/element-web/de/ * Translated using Weblate (French) Currently translated at 100.0% (35 of 35 strings) Translation: Element Web/element-web Translate-URL: https://translate.element.io/projects/element-web/element-web/fr/ * Translated using Weblate (Portuguese) Currently translated at 88.5% (31 of 35 strings) Translation: Element Web/element-web Translate-URL: https://translate.element.io/projects/element-web/element-web/pt/ * Translated using Weblate (Portuguese) Currently translated at 88.5% (31 of 35 strings) Translation: Element Web/element-web Translate-URL: https://translate.element.io/projects/element-web/element-web/pt/ * Translated using Weblate (Hebrew) Currently translated at 94.2% (33 of 35 strings) Translation: Element Web/element-web Translate-URL: https://translate.element.io/projects/element-web/element-web/he/ * Translated using Weblate (Slovak) Currently translated at 100.0% (35 of 35 strings) Translation: Element Web/element-web Translate-URL: https://translate.element.io/projects/element-web/element-web/sk/ * Translated using Weblate (Finnish) Currently translated at 100.0% (35 of 35 strings) Translation: Element Web/element-web Translate-URL: https://translate.element.io/projects/element-web/element-web/fi/ * Translated using Weblate (Turkish) Currently translated at 97.1% (34 of 35 strings) Translation: Element Web/element-web Translate-URL: https://translate.element.io/projects/element-web/element-web/tr/ * Translated using Weblate (Galician) Currently translated at 100.0% (35 of 35 strings) Translation: Element Web/element-web Translate-URL: https://translate.element.io/projects/element-web/element-web/gl/ * Added translation using Weblate (Sorani) * Translated using Weblate (Russian) Currently translated at 100.0% (35 of 35 strings) Translation: Element Web/element-web Translate-URL: https://translate.element.io/projects/element-web/element-web/ru/ * Translated using Weblate (Estonian) Currently translated at 100.0% (35 of 35 strings) Translation: Element Web/element-web Translate-URL: https://translate.element.io/projects/element-web/element-web/et/ * Translated using Weblate (Japanese) Currently translated at 94.2% (33 of 35 strings) Translation: Element Web/element-web Translate-URL: https://translate.element.io/projects/element-web/element-web/ja/ * Translated using Weblate (Icelandic) Currently translated at 100.0% (35 of 35 strings) Translation: Element Web/element-web Translate-URL: https://translate.element.io/projects/element-web/element-web/is/ * Translated using Weblate (Japanese) Currently translated at 94.2% (33 of 35 strings) Translation: Element Web/element-web Translate-URL: https://translate.element.io/projects/element-web/element-web/ja/ * Translated using Weblate (Japanese) Currently translated at 94.2% (33 of 35 strings) Translation: Element Web/element-web Translate-URL: https://translate.element.io/projects/element-web/element-web/ja/ * Translated using Weblate (Galician) Currently translated at 100.0% (35 of 35 strings) Translation: Element Web/element-web Translate-URL: https://translate.element.io/projects/element-web/element-web/gl/ * Translated using Weblate (Japanese) Currently translated at 94.2% (33 of 35 strings) Translation: Element Web/element-web Translate-URL: https://translate.element.io/projects/element-web/element-web/ja/ * Translated using Weblate (Japanese) Currently translated at 94.2% (33 of 35 strings) Translation: Element Web/element-web Translate-URL: https://translate.element.io/projects/element-web/element-web/ja/ * Translated using Weblate (Icelandic) Currently translated at 100.0% (35 of 35 strings) Translation: Element Web/element-web Translate-URL: https://translate.element.io/projects/element-web/element-web/is/ * Translated using Weblate (Persian) Currently translated at 100.0% (35 of 35 strings) Translation: Element Web/element-web Translate-URL: https://translate.element.io/projects/element-web/element-web/fa/ * Translated using Weblate (Japanese) Currently translated at 94.2% (33 of 35 strings) Translation: Element Web/element-web Translate-URL: https://translate.element.io/projects/element-web/element-web/ja/ * Translated using Weblate (Persian) Currently translated at 100.0% (35 of 35 strings) Translation: Element Web/element-web Translate-URL: https://translate.element.io/projects/element-web/element-web/fa/ * Translated using Weblate (Hebrew) Currently translated at 100.0% (31 of 31 strings) Translation: Element Web/element-web Translate-URL: https://translate.element.io/projects/element-web/element-web/he/ * Translated using Weblate (Japanese) Currently translated at 100.0% (31 of 31 strings) Translation: Element Web/element-web Translate-URL: https://translate.element.io/projects/element-web/element-web/ja/ * Translated using Weblate (Japanese) Currently translated at 100.0% (31 of 31 strings) Translation: Element Web/element-web Translate-URL: https://translate.element.io/projects/element-web/element-web/ja/ * Translated using Weblate (Hebrew) Currently translated at 100.0% (31 of 31 strings) Translation: Element Web/element-web Translate-URL: https://translate.element.io/projects/element-web/element-web/he/ * Translated using Weblate (French) Currently translated at 100.0% (31 of 31 strings) Translation: Element Web/element-web Translate-URL: https://translate.element.io/projects/element-web/element-web/fr/ * Translated using Weblate (Japanese) Currently translated at 100.0% (31 of 31 strings) Translation: Element Web/element-web Translate-URL: https://translate.element.io/projects/element-web/element-web/ja/ * Translated using Weblate (Bosnian) Currently translated at 100.0% (31 of 31 strings) Translation: Element Web/element-web Translate-URL: https://translate.element.io/projects/element-web/element-web/bs/ * Translated using Weblate (Icelandic) Currently translated at 100.0% (31 of 31 strings) Translation: Element Web/element-web Translate-URL: https://translate.element.io/projects/element-web/element-web/is/ * Translated using Weblate (Hindi) Currently translated at 100.0% (31 of 31 strings) Translation: Element Web/element-web Translate-URL: https://translate.element.io/projects/element-web/element-web/hi/ * Translated using Weblate (Hebrew) Currently translated at 100.0% (31 of 31 strings) Translation: Element Web/element-web Translate-URL: https://translate.element.io/projects/element-web/element-web/he/ Co-authored-by: Weblate Co-authored-by: Fjoerfoks Co-authored-by: Adrian Środoń Co-authored-by: Linerly Co-authored-by: jelv Co-authored-by: Marek Ľach Co-authored-by: a5r0n Co-authored-by: Vulcan Co-authored-by: Jozef Gaal Co-authored-by: Yorqinbek Co-authored-by: Ihor Hordiichuk Co-authored-by: Bjørn I.Svindseth Co-authored-by: pkst-ellak Co-authored-by: Bui Minh Duc Co-authored-by: Johan Smits Co-authored-by: random Co-authored-by: waclaw66 Co-authored-by: Besnik Bleta Co-authored-by: Hexandcube Co-authored-by: Skibbi Co-authored-by: Norbert Co-authored-by: Szimszon Co-authored-by: TR_SLimey Co-authored-by: LinAGKar Co-authored-by: Jeff Huang Co-authored-by: Priit Jõerüüt Co-authored-by: lvre <7uu3qrbvm@relay.firefox.com> Co-authored-by: Alfred Makne Poulsen Co-authored-by: libexus Co-authored-by: Paragoumba Co-authored-by: Helder Ferreira Co-authored-by: Eduardo Ervideira Co-authored-by: SPiRiT Co-authored-by: Shi-nobi Co-authored-by: Mahmut Tuncer Co-authored-by: Xose M Co-authored-by: ENIGMA Co-authored-by: Nikita Epifanov Co-authored-by: Suguru Hirahara Co-authored-by: Sveinn í Felli Co-authored-by: xmeta Co-authored-by: nafi3h Co-authored-by: Alexandre Franke Co-authored-by: Nermin Co-authored-by: Arya Bhosale --- src/i18n/strings/he.json | 2 +- src/i18n/strings/hi.json | 25 ++++++++++++++++++++++++- src/i18n/strings/is.json | 12 ++++++------ 3 files changed, 31 insertions(+), 8 deletions(-) diff --git a/src/i18n/strings/he.json b/src/i18n/strings/he.json index 3fc6e263d53..0d328e7ce32 100644 --- a/src/i18n/strings/he.json +++ b/src/i18n/strings/he.json @@ -11,7 +11,7 @@ "Open user settings": "פתח הגדרות משתמש", "Go to your browser to complete Sign In": "עבור לדפדפן להמשך ההתחברות", "Explore rooms": "גלה חדרים", - "Create Account": "יצירת חשבון", + "Create Account": "משתמש חדש", "Sign In": "התחברות", "Previous/next recently visited room or community": "הבא\\קודם חדרים וקהילות שביקרתם לאחרונה", "Open": "פתח", diff --git a/src/i18n/strings/hi.json b/src/i18n/strings/hi.json index 8aa012a8601..3a65e0e9a2c 100644 --- a/src/i18n/strings/hi.json +++ b/src/i18n/strings/hi.json @@ -7,5 +7,28 @@ "Decentralised, encrypted chat & collaboration powered by [matrix]": "[मैट्रिक्स] द्वारा संचालित विकेंद्रीकृत, एन्क्रिप्टेड चैट और सहयोगिता", "Sign In": "साइन करना", "Create Account": "खाता बनाएं", - "Explore rooms": "रूम का अन्वेषण करें" + "Explore rooms": "रूम का अन्वेषण करें", + "%(appName)s (%(browserName)s, %(osName)s)": "%(appName)s (%(browserName)s, %(osName)s)", + "%(brand)s Desktop (%(platformName)s)": "%(brand)s का डेस्कटॉप (%(platformName)s)", + "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 में से कोई एक निर्दिष्ट कर सकता है।", + "Failed to start": "प्रारंभ करने में विफल", + "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.": "आप अपने वर्तमान ब्राउज़र का उपयोग जारी रख सकते हैं, लेकिन हो सकता है कि कुछ या सभी सुविधाएं काम न करें और एप्लिकेशन का रंगरूप गलत हो सकता है।", + "Please install Chrome, Firefox, or Safari for the best experience.": "सर्वोत्तम अनुभव के लिए कृपया Chrome, Firefox, या Safari इंस्टॉल करें।", + "%(brand)s uses advanced browser features which aren't supported by your current browser.": "%(brand)s उन्नत ब्राउज़र सुविधाओं का उपयोग करते हैं जो आपके वर्तमान ब्राउज़र द्वारा समर्थित नहीं हैं।", + "Your browser can't run %(brand)s": "आपका ब्राउज़र %(brand)s को नहीं चला सकता", + "Use %(brand)s on mobile": "मोबाइल पर %(brand)s का प्रयोग करें", + "Unsupported browser": "असमर्थित ब्राउज़र", + "Powered by Matrix": "मैट्रिक्स द्वारा संचालित", + "Go to your browser to complete Sign In": "साइन इन पूरा करने के लिए अपने ब्राउज़र पर जाएं", + "Open": "खुला", + "Download Completed": "डाउनलोड सम्पन्न हुआ", + "Unexpected error preparing the app. See console for details.": "ऐप्लिकेशन तैयार करने में अनपेक्षित गड़बड़ी हुई. विवरण के लिए कंसोल देखें।", + "Unable to load config file: please refresh the page to try again.": "कॉन्फ़िग फ़ाइल लोड करने में असमर्थ: कृपया पुन: प्रयास करने के लिए पृष्ठ को रीफ़्रेश करें।", + "Invalid JSON": "अमान्य JSON", + "The message from the parser is: %(message)s": "पार्सर का संदेश है: %(message)s", + "Your Element configuration contains invalid JSON. Please correct the problem and reload the page.": "आपके एलीमेंट कॉन्फ़िगरेशन में अमान्य JSON है. कृपया समस्या को ठीक करें और पृष्ठ को पुनः लोड करें।", + "Your Element is misconfigured": "आपका तत्व गलत कॉन्फ़िगर किया गया है", + "Invalid configuration: no default server specified.": "अमान्य कॉन्फ़िगरेशन: कोई डिफ़ॉल्ट सर्वर निर्दिष्ट नहीं है।" } diff --git a/src/i18n/strings/is.json b/src/i18n/strings/is.json index cd57d440a27..75bcf86fd46 100644 --- a/src/i18n/strings/is.json +++ b/src/i18n/strings/is.json @@ -7,22 +7,22 @@ "Decentralised, encrypted chat & collaboration powered by [matrix]": "Dulritað dreifvinnsluspjall og samvinnutól keyrt með [matrix]", "Open": "Opna", "Unsupported browser": "Óstuddur vafri", - "Your browser can't run %(brand)s": "Vafri þinn geta ekki keyrt upp %(brand)s", + "Your browser can't run %(brand)s": "Vafrinn þinn getur ekki keyrt %(brand)s", "Sign In": "Skrá inn", "Create Account": "Búa til notandaaðgang", "Explore rooms": "Kanna spjallrásir", "Missing indexeddb worker script!": "Að vanta indexeddb vinnumaður tölvuhandrit!", "The message from the parser is: %(message)s": "Skilaboðið frá þáttaranum er %(message)s", "Invalid JSON": "Ógilt JSON", - "Download Completed": "Niðurhali lokið.", + "Download Completed": "Niðurhali lokið", "%(appName)s (%(browserName)s, %(osName)s)": "%(appName)s (%(browserName)s, %(osName)s)", - "Please install Chrome, Firefox, or Safari for the best experience.": "vinsamlegast setja upp Chrome, Firefox, eða Safari fyrir besta reynsluna.", + "Please install Chrome, Firefox, or Safari for the best experience.": "Þú ættir að setja upp Chrome, Firefox, eða Safari til að fá sem besta útkomu.", "I understand the risks and wish to continue": "Ég skil áhættuna og óska að halda áfram", - "Go to element.io": "Farðu á element.io", + "Go to element.io": "Fara á element.io", "Unexpected error preparing the app. See console for details.": "Óvænt villa við undirbúning forritsins. Sjá nánar á stjórnskjá.", "Failed to start": "Mistókst að ræsa", - "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.": "Þú getur haldið áfram að nota núverandi vafra, en sumar eða allir eiginleikar virka ekki og útlit og tilfinning forritsins geta verið röng.", - "%(brand)s uses advanced browser features which aren't supported by your current browser.": "%(brand)s notar háþróaða vafraeiginleika sem eru ekki studdir af núverandi vafra þínum.", + "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.": "Þú getur haldið áfram að nota núverandi vafra, en sumir eða allir eiginleikar virka mögulega ekki rétt, auk þess sem útlit og hegðun forritsins geta verið röng.", + "%(brand)s uses advanced browser features which aren't supported by your current browser.": "%(brand)s notar háþróaða vafraeiginleika sem eru ekki studdir af vafranum þínum.", "Powered by Matrix": "Keyrt með Matrix", "Go to your browser to complete Sign In": "Farðu í vafrann þinn til að ljúka innskráningu", "%(brand)s Desktop (%(platformName)s)": "%(brand)s Desktop fyrir vinnutölvur (%(platformName)s)", From 2d4444fec1324bef27527efb5ecf68b8981f8e17 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Tue, 5 Apr 2022 18:20:29 +0100 Subject: [PATCH 22/43] Upgrade matrix-js-sdk to 16.0.2-rc.1 --- package.json | 2 +- yarn.lock | 17 +++++++++++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index 3bd2a2ba11c..150dd69171f 100644 --- a/package.json +++ b/package.json @@ -60,7 +60,7 @@ "gfm.css": "^1.1.2", "jsrsasign": "^10.2.0", "katex": "^0.12.0", - "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop", + "matrix-js-sdk": "16.0.2-rc.1", "matrix-react-sdk": "github:matrix-org/matrix-react-sdk#develop", "matrix-widget-api": "^0.1.0-beta.18", "prop-types": "^15.7.2", diff --git a/yarn.lock b/yarn.lock index dc1d04d87d0..ce9a74bce5e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8201,6 +8201,23 @@ matrix-events-sdk@^0.0.1-beta.7: resolved "https://registry.yarnpkg.com/matrix-events-sdk/-/matrix-events-sdk-0.0.1-beta.7.tgz#5ffe45eba1f67cc8d7c2377736c728b322524934" integrity sha512-9jl4wtWanUFSy2sr2lCjErN/oC8KTAtaeaozJtrgot1JiQcEI4Rda9OLgQ7nLKaqb4Z/QUx/fR3XpDzm5Jy1JA== +matrix-js-sdk@16.0.2-rc.1: + version "16.0.2-rc.1" + resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-16.0.2-rc.1.tgz#b5c748fc9bd95b97d3f13b1a63860c0033bee35d" + integrity sha512-dmrP+leQKLKGg0s/tOEHkWMVz9N3lrccgi3wI4XGiGi0hI8/xv/Y5est6hcpg5axOa1JyD1KqqV0o41whdb6PQ== + dependencies: + "@babel/runtime" "^7.12.5" + another-json "^0.2.0" + browser-request "^0.3.3" + bs58 "^4.0.1" + content-type "^1.0.4" + loglevel "^1.7.1" + matrix-events-sdk "^0.0.1-beta.7" + p-retry "^4.5.0" + qs "^6.9.6" + request "^2.88.2" + unhomoglyph "^1.0.6" + "matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop": version "16.0.1" resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/bdc3da1fac3cb454b409325b6a50cd869b3d5d57" From ba0ea71cf712562383d1bfa17c0349bb580e4a61 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Tue, 5 Apr 2022 18:20:49 +0100 Subject: [PATCH 23/43] Upgrade matrix-react-sdk to 3.42.2-rc.1 --- package.json | 2 +- yarn.lock | 27 ++++++--------------------- 2 files changed, 7 insertions(+), 22 deletions(-) diff --git a/package.json b/package.json index 150dd69171f..eabac6815c3 100644 --- a/package.json +++ b/package.json @@ -61,7 +61,7 @@ "jsrsasign": "^10.2.0", "katex": "^0.12.0", "matrix-js-sdk": "16.0.2-rc.1", - "matrix-react-sdk": "github:matrix-org/matrix-react-sdk#develop", + "matrix-react-sdk": "3.42.2-rc.1", "matrix-widget-api": "^0.1.0-beta.18", "prop-types": "^15.7.2", "react": "17.0.2", diff --git a/yarn.lock b/yarn.lock index ce9a74bce5e..e09ac3b4bb3 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8192,7 +8192,7 @@ mathml-tag-names@^2.1.3: resolved "https://registry.yarnpkg.com/mathml-tag-names/-/mathml-tag-names-2.1.3.tgz#4ddadd67308e780cf16a47685878ee27b736a0a3" integrity sha512-APMBEanjybaPzUrfqU0IMU5I0AswKMH7k8OTLs0vvV4KZpExkTkY87nR/zpbuTPj+gARop7aGUbl11pnDfW6xg== -"matrix-analytics-events@github:matrix-org/matrix-analytics-events.git#daad3faed54f0b1f1e026a7498b4653e4d01cd90": +"matrix-analytics-events@github:matrix-org/matrix-analytics-events#daad3faed54f0b1f1e026a7498b4653e4d01cd90": version "0.0.1" resolved "https://codeload.github.com/matrix-org/matrix-analytics-events/tar.gz/daad3faed54f0b1f1e026a7498b4653e4d01cd90" @@ -8218,22 +8218,6 @@ matrix-js-sdk@16.0.2-rc.1: request "^2.88.2" unhomoglyph "^1.0.6" -"matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop": - version "16.0.1" - resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/bdc3da1fac3cb454b409325b6a50cd869b3d5d57" - dependencies: - "@babel/runtime" "^7.12.5" - another-json "^0.2.0" - browser-request "^0.3.3" - bs58 "^4.0.1" - content-type "^1.0.4" - loglevel "^1.7.1" - matrix-events-sdk "^0.0.1-beta.7" - p-retry "^4.5.0" - qs "^6.9.6" - request "^2.88.2" - unhomoglyph "^1.0.6" - matrix-mock-request@^1.2.3: version "1.2.3" resolved "https://registry.yarnpkg.com/matrix-mock-request/-/matrix-mock-request-1.2.3.tgz#56b15d86e2601a9b48a854844396d18caab649c8" @@ -8242,9 +8226,10 @@ matrix-mock-request@^1.2.3: bluebird "^3.5.0" expect "^1.20.2" -"matrix-react-sdk@github:matrix-org/matrix-react-sdk#develop": - version "3.42.1" - resolved "https://codeload.github.com/matrix-org/matrix-react-sdk/tar.gz/2520d8178401f91a786c7c5d44c216b3bd34085b" +matrix-react-sdk@3.42.2-rc.1: + version "3.42.2-rc.1" + resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.42.2-rc.1.tgz#48c905a5e39d9757fcf21aaf81085de01dda5529" + integrity sha512-P8DmpDbWA9Z9nOGMEHa9hy3ZHn864CMEHgajG3NqqdhEJZvrI8i8ORkbJG1XDSNts0wZesqZjxt3E+UW36zr3Q== dependencies: "@babel/runtime" "^7.12.5" "@sentry/browser" "^6.11.0" @@ -8282,7 +8267,7 @@ matrix-mock-request@^1.2.3: maplibre-gl "^1.15.2" matrix-analytics-events "github:matrix-org/matrix-analytics-events.git#daad3faed54f0b1f1e026a7498b4653e4d01cd90" matrix-events-sdk "^0.0.1-beta.7" - matrix-js-sdk "github:matrix-org/matrix-js-sdk#develop" + matrix-js-sdk "16.0.2-rc.1" matrix-widget-api "^0.1.0-beta.18" minimist "^1.2.5" opus-recorder "^8.0.3" From 4325930e21a62cf16823c74bf225bf4b5c4938bf Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Tue, 5 Apr 2022 18:22:06 +0100 Subject: [PATCH 24/43] Prepare changelog for v1.10.9-rc.1 --- CHANGELOG.md | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 057060976a0..7d45cebf2d5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,54 @@ +Changes in [1.10.9-rc.1](https://github.com/vector-im/element-web/releases/tag/v1.10.9-rc.1) (2022-04-05) +========================================================================================================= + +## ✨ Features + * Release threads as a beta feature ([\#8081](https://github.com/matrix-org/matrix-react-sdk/pull/8081)). Fixes #21351. + * More video rooms design updates ([\#8222](https://github.com/matrix-org/matrix-react-sdk/pull/8222)). + * Update video rooms to new design specs ([\#8207](https://github.com/matrix-org/matrix-react-sdk/pull/8207)). Fixes #21515, #21516 #21519 and #21526. + * Live Location Sharing - left panel warning with error ([\#8201](https://github.com/matrix-org/matrix-react-sdk/pull/8201)). + * Live location sharing - Stop publishing location to beacons with consecutive errors ([\#8194](https://github.com/matrix-org/matrix-react-sdk/pull/8194)). + * Live location sharing: allow retry when stop sharing fails ([\#8193](https://github.com/matrix-org/matrix-react-sdk/pull/8193)). + * Allow voice messages to be scrubbed in the timeline ([\#8079](https://github.com/matrix-org/matrix-react-sdk/pull/8079)). Fixes #18713. + * Live location sharing - stop sharing to beacons in rooms you left ([\#8187](https://github.com/matrix-org/matrix-react-sdk/pull/8187)). + * Allow sending and thumbnailing AVIF images ([\#8172](https://github.com/matrix-org/matrix-react-sdk/pull/8172)). + * Live location sharing - handle geolocation errors ([\#8179](https://github.com/matrix-org/matrix-react-sdk/pull/8179)). + * Show voice room participants when not connected ([\#8136](https://github.com/matrix-org/matrix-react-sdk/pull/8136)). Fixes #21513. + * Add margins between labs sections ([\#8169](https://github.com/matrix-org/matrix-react-sdk/pull/8169)). + * Live location sharing - send geolocation beacon events - happy path ([\#8127](https://github.com/matrix-org/matrix-react-sdk/pull/8127)). + * Add support for Animated (A)PNG ([\#8158](https://github.com/matrix-org/matrix-react-sdk/pull/8158)). Fixes #12967. + * Don't form continuations from thread roots ([\#8166](https://github.com/matrix-org/matrix-react-sdk/pull/8166)). Fixes #20908. + * Improve handling of animated GIF and WEBP images ([\#8153](https://github.com/matrix-org/matrix-react-sdk/pull/8153)). Fixes #16193 and #6684. + * Wire up file preview for video files ([\#8140](https://github.com/matrix-org/matrix-react-sdk/pull/8140)). Fixes #21539. + * When showing thread, always auto-focus its composer ([\#8115](https://github.com/matrix-org/matrix-react-sdk/pull/8115)). Fixes #21438. + * Live location sharing - refresh beacon expiry in room ([\#8116](https://github.com/matrix-org/matrix-react-sdk/pull/8116)). + * Use styled mxids in member list v2 ([\#8110](https://github.com/matrix-org/matrix-react-sdk/pull/8110)). Fixes #14825. Contributed by @SimonBrandner. + * Delete groups (legacy communities system) ([\#8027](https://github.com/matrix-org/matrix-react-sdk/pull/8027)). Fixes #17532. + * Add a prototype of voice rooms in labs ([\#8084](https://github.com/matrix-org/matrix-react-sdk/pull/8084)). Fixes #3546. + +## 🐛 Bug Fixes + * Fix URL previews being enabled when room first created ([\#8227](https://github.com/matrix-org/matrix-react-sdk/pull/8227)). Fixes #21659. + * Don't use m.call for Jitsi video rooms ([\#8223](https://github.com/matrix-org/matrix-react-sdk/pull/8223)). + * Scale emoji with size of surrounding text ([\#8224](https://github.com/matrix-org/matrix-react-sdk/pull/8224)). + * Make "Jump to date" translatable ([\#8218](https://github.com/matrix-org/matrix-react-sdk/pull/8218)). + * Normalize call buttons ([\#8129](https://github.com/matrix-org/matrix-react-sdk/pull/8129)). Fixes #21493. Contributed by @luixxiul. + * Fix editing
    tags with a non-1 start attribute ([\#8211](https://github.com/matrix-org/matrix-react-sdk/pull/8211)). Fixes #21625. + * Show room preview bar with maximised widgets ([\#8180](https://github.com/matrix-org/matrix-react-sdk/pull/8180)). Fixes #21542. + * Update more strings to not wrongly mention room when it is/could be a space ([\#7722](https://github.com/matrix-org/matrix-react-sdk/pull/7722)). Fixes #20243 and #20910. + * Fix issue with redacting via edit composer flow causing stuck editStates ([\#8184](https://github.com/matrix-org/matrix-react-sdk/pull/8184)). + * Fix some image/video scroll jumps ([\#8182](https://github.com/matrix-org/matrix-react-sdk/pull/8182)). + * Fix "react error on share dialog" ([\#8170](https://github.com/matrix-org/matrix-react-sdk/pull/8170)). Contributed by @yaya-usman. + * Fix disambiguated profile in threads in bubble layout ([\#8168](https://github.com/matrix-org/matrix-react-sdk/pull/8168)). Fixes #21570. Contributed by @SimonBrandner. + * Responsive BetaCard on Labs ([\#8154](https://github.com/matrix-org/matrix-react-sdk/pull/8154)). Fixes #21554. Contributed by @luixxiul. + * Display button as inline in room directory dialog ([\#8164](https://github.com/matrix-org/matrix-react-sdk/pull/8164)). Fixes #21567. Contributed by @luixxiul. + * Null guard TimelinePanel unmount edge ([\#8171](https://github.com/matrix-org/matrix-react-sdk/pull/8171)). + * Fix beta pill label breaking ([\#8162](https://github.com/matrix-org/matrix-react-sdk/pull/8162)). Fixes #21566. Contributed by @luixxiul. + * Strip relations when forwarding ([\#7929](https://github.com/matrix-org/matrix-react-sdk/pull/7929)). Fixes #19769, #18067 #21015 and #10924. + * Don't try (and fail) to show replies for redacted events ([\#8141](https://github.com/matrix-org/matrix-react-sdk/pull/8141)). Fixes #21435. + * Fix 3pid member info for space member list ([\#8128](https://github.com/matrix-org/matrix-react-sdk/pull/8128)). Fixes #21534. + * Set max-width to user context menu ([\#8089](https://github.com/matrix-org/matrix-react-sdk/pull/8089)). Fixes #21486. Contributed by @luixxiul. + * Fix issue with falsey hrefs being sent in events ([\#8113](https://github.com/matrix-org/matrix-react-sdk/pull/8113)). Fixes #21417. + * Make video sizing consistent with images ([\#8102](https://github.com/matrix-org/matrix-react-sdk/pull/8102)). Fixes #20072. + Changes in [1.10.8-rc.1](https://github.com/vector-im/element-web/releases/tag/v1.10.8-rc.1) (2022-03-22) ========================================================================================================= From d9a77eb1c3cfa5723fbc4f32f617c964e7cbeebf Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Tue, 5 Apr 2022 18:22:07 +0100 Subject: [PATCH 25/43] v1.10.9-rc.1 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index eabac6815c3..a2f0083f74a 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "element-web", - "version": "1.10.8", + "version": "1.10.9-rc.1", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "repository": { From 4b184905e82c2886fc42abf257d905e5d7dbe8fb Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Wed, 6 Apr 2022 11:55:48 +0100 Subject: [PATCH 26/43] Upgrade matrix-react-sdk to 3.42.2-rc.2 --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index a2f0083f74a..0184e225b98 100644 --- a/package.json +++ b/package.json @@ -61,7 +61,7 @@ "jsrsasign": "^10.2.0", "katex": "^0.12.0", "matrix-js-sdk": "16.0.2-rc.1", - "matrix-react-sdk": "3.42.2-rc.1", + "matrix-react-sdk": "3.42.2-rc.2", "matrix-widget-api": "^0.1.0-beta.18", "prop-types": "^15.7.2", "react": "17.0.2", diff --git a/yarn.lock b/yarn.lock index e09ac3b4bb3..b8147c9ae29 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8226,10 +8226,10 @@ matrix-mock-request@^1.2.3: bluebird "^3.5.0" expect "^1.20.2" -matrix-react-sdk@3.42.2-rc.1: - version "3.42.2-rc.1" - resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.42.2-rc.1.tgz#48c905a5e39d9757fcf21aaf81085de01dda5529" - integrity sha512-P8DmpDbWA9Z9nOGMEHa9hy3ZHn864CMEHgajG3NqqdhEJZvrI8i8ORkbJG1XDSNts0wZesqZjxt3E+UW36zr3Q== +matrix-react-sdk@3.42.2-rc.2: + version "3.42.2-rc.2" + resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.42.2-rc.2.tgz#83c262ebe714155cae6dabcbe6191fd1a3ff387f" + integrity sha512-gZ8eib5CgdazuSWHQLhNQpnf07YQx+/1JGdWNllL1k/aLHzPBROQURuLdpTepoFaoVIdj29IwWLEo1emmtxwPQ== dependencies: "@babel/runtime" "^7.12.5" "@sentry/browser" "^6.11.0" From 1edeed1cf2cae836ebbc898556562a5342ad0913 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Wed, 6 Apr 2022 11:57:11 +0100 Subject: [PATCH 27/43] Prepare changelog for v1.10.9-rc.2 --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7d45cebf2d5..820d2db5ae1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,6 @@ +Changes in [1.10.9-rc.2](https://github.com/vector-im/element-web/releases/tag/v1.10.9-rc.2) (2022-04-06) +========================================================================================================= + Changes in [1.10.9-rc.1](https://github.com/vector-im/element-web/releases/tag/v1.10.9-rc.1) (2022-04-05) ========================================================================================================= From 6b6ac94fd046b1ef09f8c7e24290166b82f44d8d Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Wed, 6 Apr 2022 11:57:11 +0100 Subject: [PATCH 28/43] v1.10.9-rc.2 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 0184e225b98..c69c776ec53 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "element-web", - "version": "1.10.9-rc.1", + "version": "1.10.9-rc.2", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "repository": { From 74fd8eea20c69a693546bd2b01edba057f410415 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Fri, 8 Apr 2022 12:19:58 +0100 Subject: [PATCH 29/43] Upgrade matrix-js-sdk to 17.0.0-rc.2 --- package.json | 2 +- yarn.lock | 19 ++++++++++++++++++- 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index c69c776ec53..4eac13a378f 100644 --- a/package.json +++ b/package.json @@ -60,7 +60,7 @@ "gfm.css": "^1.1.2", "jsrsasign": "^10.2.0", "katex": "^0.12.0", - "matrix-js-sdk": "16.0.2-rc.1", + "matrix-js-sdk": "17.0.0-rc.2", "matrix-react-sdk": "3.42.2-rc.2", "matrix-widget-api": "^0.1.0-beta.18", "prop-types": "^15.7.2", diff --git a/yarn.lock b/yarn.lock index b8147c9ae29..bff640f2038 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8192,7 +8192,7 @@ mathml-tag-names@^2.1.3: resolved "https://registry.yarnpkg.com/mathml-tag-names/-/mathml-tag-names-2.1.3.tgz#4ddadd67308e780cf16a47685878ee27b736a0a3" integrity sha512-APMBEanjybaPzUrfqU0IMU5I0AswKMH7k8OTLs0vvV4KZpExkTkY87nR/zpbuTPj+gARop7aGUbl11pnDfW6xg== -"matrix-analytics-events@github:matrix-org/matrix-analytics-events#daad3faed54f0b1f1e026a7498b4653e4d01cd90": +"matrix-analytics-events@github:matrix-org/matrix-analytics-events.git#daad3faed54f0b1f1e026a7498b4653e4d01cd90": version "0.0.1" resolved "https://codeload.github.com/matrix-org/matrix-analytics-events/tar.gz/daad3faed54f0b1f1e026a7498b4653e4d01cd90" @@ -8218,6 +8218,23 @@ matrix-js-sdk@16.0.2-rc.1: request "^2.88.2" unhomoglyph "^1.0.6" +matrix-js-sdk@17.0.0-rc.2: + version "17.0.0-rc.2" + resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-17.0.0-rc.2.tgz#70368fcdfcbcc0de380cf83430d3d87c13701d71" + integrity sha512-65n57XLOpp+Zfu2dxSBhcKP15AhkInsMAspPHt/QBHipq7cWoN98nAaK0V4fOdchRxCRIwlCldv7tTA3ukzqBw== + dependencies: + "@babel/runtime" "^7.12.5" + another-json "^0.2.0" + browser-request "^0.3.3" + bs58 "^4.0.1" + content-type "^1.0.4" + loglevel "^1.7.1" + matrix-events-sdk "^0.0.1-beta.7" + p-retry "^4.5.0" + qs "^6.9.6" + request "^2.88.2" + unhomoglyph "^1.0.6" + matrix-mock-request@^1.2.3: version "1.2.3" resolved "https://registry.yarnpkg.com/matrix-mock-request/-/matrix-mock-request-1.2.3.tgz#56b15d86e2601a9b48a854844396d18caab649c8" From 2a922e847ba05b3a0d3f2532f273d3d123e92bb8 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Fri, 8 Apr 2022 12:20:25 +0100 Subject: [PATCH 30/43] Upgrade matrix-react-sdk to 3.42.2-rc.3 --- package.json | 2 +- yarn.lock | 29 ++++++----------------------- 2 files changed, 7 insertions(+), 24 deletions(-) diff --git a/package.json b/package.json index 4eac13a378f..b1478a065f4 100644 --- a/package.json +++ b/package.json @@ -61,7 +61,7 @@ "jsrsasign": "^10.2.0", "katex": "^0.12.0", "matrix-js-sdk": "17.0.0-rc.2", - "matrix-react-sdk": "3.42.2-rc.2", + "matrix-react-sdk": "3.42.2-rc.3", "matrix-widget-api": "^0.1.0-beta.18", "prop-types": "^15.7.2", "react": "17.0.2", diff --git a/yarn.lock b/yarn.lock index bff640f2038..0a49a2d7028 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8192,7 +8192,7 @@ mathml-tag-names@^2.1.3: resolved "https://registry.yarnpkg.com/mathml-tag-names/-/mathml-tag-names-2.1.3.tgz#4ddadd67308e780cf16a47685878ee27b736a0a3" integrity sha512-APMBEanjybaPzUrfqU0IMU5I0AswKMH7k8OTLs0vvV4KZpExkTkY87nR/zpbuTPj+gARop7aGUbl11pnDfW6xg== -"matrix-analytics-events@github:matrix-org/matrix-analytics-events.git#daad3faed54f0b1f1e026a7498b4653e4d01cd90": +"matrix-analytics-events@github:matrix-org/matrix-analytics-events#daad3faed54f0b1f1e026a7498b4653e4d01cd90": version "0.0.1" resolved "https://codeload.github.com/matrix-org/matrix-analytics-events/tar.gz/daad3faed54f0b1f1e026a7498b4653e4d01cd90" @@ -8201,23 +8201,6 @@ matrix-events-sdk@^0.0.1-beta.7: resolved "https://registry.yarnpkg.com/matrix-events-sdk/-/matrix-events-sdk-0.0.1-beta.7.tgz#5ffe45eba1f67cc8d7c2377736c728b322524934" integrity sha512-9jl4wtWanUFSy2sr2lCjErN/oC8KTAtaeaozJtrgot1JiQcEI4Rda9OLgQ7nLKaqb4Z/QUx/fR3XpDzm5Jy1JA== -matrix-js-sdk@16.0.2-rc.1: - version "16.0.2-rc.1" - resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-16.0.2-rc.1.tgz#b5c748fc9bd95b97d3f13b1a63860c0033bee35d" - integrity sha512-dmrP+leQKLKGg0s/tOEHkWMVz9N3lrccgi3wI4XGiGi0hI8/xv/Y5est6hcpg5axOa1JyD1KqqV0o41whdb6PQ== - dependencies: - "@babel/runtime" "^7.12.5" - another-json "^0.2.0" - browser-request "^0.3.3" - bs58 "^4.0.1" - content-type "^1.0.4" - loglevel "^1.7.1" - matrix-events-sdk "^0.0.1-beta.7" - p-retry "^4.5.0" - qs "^6.9.6" - request "^2.88.2" - unhomoglyph "^1.0.6" - matrix-js-sdk@17.0.0-rc.2: version "17.0.0-rc.2" resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-17.0.0-rc.2.tgz#70368fcdfcbcc0de380cf83430d3d87c13701d71" @@ -8243,10 +8226,10 @@ matrix-mock-request@^1.2.3: bluebird "^3.5.0" expect "^1.20.2" -matrix-react-sdk@3.42.2-rc.2: - version "3.42.2-rc.2" - resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.42.2-rc.2.tgz#83c262ebe714155cae6dabcbe6191fd1a3ff387f" - integrity sha512-gZ8eib5CgdazuSWHQLhNQpnf07YQx+/1JGdWNllL1k/aLHzPBROQURuLdpTepoFaoVIdj29IwWLEo1emmtxwPQ== +matrix-react-sdk@3.42.2-rc.3: + version "3.42.2-rc.3" + resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.42.2-rc.3.tgz#b12f2569c476535cd7ed40966242aff769f0545e" + integrity sha512-NFstZsqrgSxVPuyh3jxKAqaSryjVNoEIZmVX7NWKc0PradAMhqm4fMgndtKdz3GZ6n+pYE8uZOE6VNo9r8gwTA== dependencies: "@babel/runtime" "^7.12.5" "@sentry/browser" "^6.11.0" @@ -8284,7 +8267,7 @@ matrix-react-sdk@3.42.2-rc.2: maplibre-gl "^1.15.2" matrix-analytics-events "github:matrix-org/matrix-analytics-events.git#daad3faed54f0b1f1e026a7498b4653e4d01cd90" matrix-events-sdk "^0.0.1-beta.7" - matrix-js-sdk "16.0.2-rc.1" + matrix-js-sdk "17.0.0-rc.2" matrix-widget-api "^0.1.0-beta.18" minimist "^1.2.5" opus-recorder "^8.0.3" From 7e5beb8c7ffd66494d56241c8f8ef81634765b87 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Fri, 8 Apr 2022 12:21:36 +0100 Subject: [PATCH 31/43] Prepare changelog for v1.10.9-rc.3 --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 820d2db5ae1..b94d8ce113a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,6 @@ +Changes in [1.10.9-rc.3](https://github.com/vector-im/element-web/releases/tag/v1.10.9-rc.3) (2022-04-08) +========================================================================================================= + Changes in [1.10.9-rc.2](https://github.com/vector-im/element-web/releases/tag/v1.10.9-rc.2) (2022-04-06) ========================================================================================================= From 45e6a716d989206b9c75f22b297d9f93a2aefdf4 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Fri, 8 Apr 2022 12:21:37 +0100 Subject: [PATCH 32/43] v1.10.9-rc.3 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index b1478a065f4..c7d1e175e2a 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "element-web", - "version": "1.10.9-rc.2", + "version": "1.10.9-rc.3", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "repository": { From 52025b8b6f349be5e4b7012baca8cf10dfdd23da Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Mon, 11 Apr 2022 11:44:45 +0100 Subject: [PATCH 33/43] Upgrade matrix-js-sdk to 17.0.0-rc.3 --- package.json | 2 +- yarn.lock | 19 ++++++++++++++++++- 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index c7d1e175e2a..6aa34698525 100644 --- a/package.json +++ b/package.json @@ -60,7 +60,7 @@ "gfm.css": "^1.1.2", "jsrsasign": "^10.2.0", "katex": "^0.12.0", - "matrix-js-sdk": "17.0.0-rc.2", + "matrix-js-sdk": "17.0.0-rc.3", "matrix-react-sdk": "3.42.2-rc.3", "matrix-widget-api": "^0.1.0-beta.18", "prop-types": "^15.7.2", diff --git a/yarn.lock b/yarn.lock index 0a49a2d7028..b30aab3bf25 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8192,7 +8192,7 @@ mathml-tag-names@^2.1.3: resolved "https://registry.yarnpkg.com/mathml-tag-names/-/mathml-tag-names-2.1.3.tgz#4ddadd67308e780cf16a47685878ee27b736a0a3" integrity sha512-APMBEanjybaPzUrfqU0IMU5I0AswKMH7k8OTLs0vvV4KZpExkTkY87nR/zpbuTPj+gARop7aGUbl11pnDfW6xg== -"matrix-analytics-events@github:matrix-org/matrix-analytics-events#daad3faed54f0b1f1e026a7498b4653e4d01cd90": +"matrix-analytics-events@github:matrix-org/matrix-analytics-events.git#daad3faed54f0b1f1e026a7498b4653e4d01cd90": version "0.0.1" resolved "https://codeload.github.com/matrix-org/matrix-analytics-events/tar.gz/daad3faed54f0b1f1e026a7498b4653e4d01cd90" @@ -8218,6 +8218,23 @@ matrix-js-sdk@17.0.0-rc.2: request "^2.88.2" unhomoglyph "^1.0.6" +matrix-js-sdk@17.0.0-rc.3: + version "17.0.0-rc.3" + resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-17.0.0-rc.3.tgz#dd1d9e5b74412e7d624e60f035754922a2a786e0" + integrity sha512-bcKiLEdo0yNx2FLOyxaGwe4aO86w04SM7O2ywOZ2UE6V2euTbv9I8b7HNFLQy6jftf5ZBDTH4z0cMjhmKGs9YQ== + dependencies: + "@babel/runtime" "^7.12.5" + another-json "^0.2.0" + browser-request "^0.3.3" + bs58 "^4.0.1" + content-type "^1.0.4" + loglevel "^1.7.1" + matrix-events-sdk "^0.0.1-beta.7" + p-retry "^4.5.0" + qs "^6.9.6" + request "^2.88.2" + unhomoglyph "^1.0.6" + matrix-mock-request@^1.2.3: version "1.2.3" resolved "https://registry.yarnpkg.com/matrix-mock-request/-/matrix-mock-request-1.2.3.tgz#56b15d86e2601a9b48a854844396d18caab649c8" From 1a91e5bc825924db17c81272dcb03b4e7c1e7eb9 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Mon, 11 Apr 2022 11:45:28 +0100 Subject: [PATCH 34/43] Upgrade matrix-react-sdk to 3.42.2-rc.4 --- package.json | 2 +- yarn.lock | 29 ++++++----------------------- 2 files changed, 7 insertions(+), 24 deletions(-) diff --git a/package.json b/package.json index 6aa34698525..92cf6ca18e8 100644 --- a/package.json +++ b/package.json @@ -61,7 +61,7 @@ "jsrsasign": "^10.2.0", "katex": "^0.12.0", "matrix-js-sdk": "17.0.0-rc.3", - "matrix-react-sdk": "3.42.2-rc.3", + "matrix-react-sdk": "3.42.2-rc.4", "matrix-widget-api": "^0.1.0-beta.18", "prop-types": "^15.7.2", "react": "17.0.2", diff --git a/yarn.lock b/yarn.lock index b30aab3bf25..735e767667f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8192,7 +8192,7 @@ mathml-tag-names@^2.1.3: resolved "https://registry.yarnpkg.com/mathml-tag-names/-/mathml-tag-names-2.1.3.tgz#4ddadd67308e780cf16a47685878ee27b736a0a3" integrity sha512-APMBEanjybaPzUrfqU0IMU5I0AswKMH7k8OTLs0vvV4KZpExkTkY87nR/zpbuTPj+gARop7aGUbl11pnDfW6xg== -"matrix-analytics-events@github:matrix-org/matrix-analytics-events.git#daad3faed54f0b1f1e026a7498b4653e4d01cd90": +"matrix-analytics-events@github:matrix-org/matrix-analytics-events#daad3faed54f0b1f1e026a7498b4653e4d01cd90": version "0.0.1" resolved "https://codeload.github.com/matrix-org/matrix-analytics-events/tar.gz/daad3faed54f0b1f1e026a7498b4653e4d01cd90" @@ -8201,23 +8201,6 @@ matrix-events-sdk@^0.0.1-beta.7: resolved "https://registry.yarnpkg.com/matrix-events-sdk/-/matrix-events-sdk-0.0.1-beta.7.tgz#5ffe45eba1f67cc8d7c2377736c728b322524934" integrity sha512-9jl4wtWanUFSy2sr2lCjErN/oC8KTAtaeaozJtrgot1JiQcEI4Rda9OLgQ7nLKaqb4Z/QUx/fR3XpDzm5Jy1JA== -matrix-js-sdk@17.0.0-rc.2: - version "17.0.0-rc.2" - resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-17.0.0-rc.2.tgz#70368fcdfcbcc0de380cf83430d3d87c13701d71" - integrity sha512-65n57XLOpp+Zfu2dxSBhcKP15AhkInsMAspPHt/QBHipq7cWoN98nAaK0V4fOdchRxCRIwlCldv7tTA3ukzqBw== - dependencies: - "@babel/runtime" "^7.12.5" - another-json "^0.2.0" - browser-request "^0.3.3" - bs58 "^4.0.1" - content-type "^1.0.4" - loglevel "^1.7.1" - matrix-events-sdk "^0.0.1-beta.7" - p-retry "^4.5.0" - qs "^6.9.6" - request "^2.88.2" - unhomoglyph "^1.0.6" - matrix-js-sdk@17.0.0-rc.3: version "17.0.0-rc.3" resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-17.0.0-rc.3.tgz#dd1d9e5b74412e7d624e60f035754922a2a786e0" @@ -8243,10 +8226,10 @@ matrix-mock-request@^1.2.3: bluebird "^3.5.0" expect "^1.20.2" -matrix-react-sdk@3.42.2-rc.3: - version "3.42.2-rc.3" - resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.42.2-rc.3.tgz#b12f2569c476535cd7ed40966242aff769f0545e" - integrity sha512-NFstZsqrgSxVPuyh3jxKAqaSryjVNoEIZmVX7NWKc0PradAMhqm4fMgndtKdz3GZ6n+pYE8uZOE6VNo9r8gwTA== +matrix-react-sdk@3.42.2-rc.4: + version "3.42.2-rc.4" + resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.42.2-rc.4.tgz#5863e37167e06a493436945965c54dd53adf6502" + integrity sha512-7w1qKuvZju14sf2UpaNUa6ljIBZiOhw2i0XwkjRX55epMNhVRN6bHFS11BkEn+O6RJUlMjkO91z28YnAeCM2Iw== dependencies: "@babel/runtime" "^7.12.5" "@sentry/browser" "^6.11.0" @@ -8284,7 +8267,7 @@ matrix-react-sdk@3.42.2-rc.3: maplibre-gl "^1.15.2" matrix-analytics-events "github:matrix-org/matrix-analytics-events.git#daad3faed54f0b1f1e026a7498b4653e4d01cd90" matrix-events-sdk "^0.0.1-beta.7" - matrix-js-sdk "17.0.0-rc.2" + matrix-js-sdk "17.0.0-rc.3" matrix-widget-api "^0.1.0-beta.18" minimist "^1.2.5" opus-recorder "^8.0.3" From 5feae5141beb5dc73b9302adc8717ce156d26306 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Mon, 11 Apr 2022 11:46:57 +0100 Subject: [PATCH 35/43] Prepare changelog for v1.10.9-rc.4 --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index b94d8ce113a..b6b645fcfc6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,6 @@ +Changes in [1.10.9-rc.4](https://github.com/vector-im/element-web/releases/tag/v1.10.9-rc.4) (2022-04-11) +========================================================================================================= + Changes in [1.10.9-rc.3](https://github.com/vector-im/element-web/releases/tag/v1.10.9-rc.3) (2022-04-08) ========================================================================================================= From e8d66538549037173789c3bbafedeaa21e71b39b Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Mon, 11 Apr 2022 11:46:57 +0100 Subject: [PATCH 36/43] v1.10.9-rc.4 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 92cf6ca18e8..f4bb8af1d3e 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "element-web", - "version": "1.10.9-rc.3", + "version": "1.10.9-rc.4", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "repository": { From 861def67bf827a1ad6381b4e5fcaf5ddc0e6d4ec Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Tue, 12 Apr 2022 10:41:16 +0100 Subject: [PATCH 37/43] Upgrade matrix-js-sdk to 17.0.0 --- package.json | 2 +- yarn.lock | 19 ++++++++++++++++++- 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index f4bb8af1d3e..0f777f1cd84 100644 --- a/package.json +++ b/package.json @@ -60,7 +60,7 @@ "gfm.css": "^1.1.2", "jsrsasign": "^10.2.0", "katex": "^0.12.0", - "matrix-js-sdk": "17.0.0-rc.3", + "matrix-js-sdk": "17.0.0", "matrix-react-sdk": "3.42.2-rc.4", "matrix-widget-api": "^0.1.0-beta.18", "prop-types": "^15.7.2", diff --git a/yarn.lock b/yarn.lock index 735e767667f..de4cb813088 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8192,7 +8192,7 @@ mathml-tag-names@^2.1.3: resolved "https://registry.yarnpkg.com/mathml-tag-names/-/mathml-tag-names-2.1.3.tgz#4ddadd67308e780cf16a47685878ee27b736a0a3" integrity sha512-APMBEanjybaPzUrfqU0IMU5I0AswKMH7k8OTLs0vvV4KZpExkTkY87nR/zpbuTPj+gARop7aGUbl11pnDfW6xg== -"matrix-analytics-events@github:matrix-org/matrix-analytics-events#daad3faed54f0b1f1e026a7498b4653e4d01cd90": +"matrix-analytics-events@github:matrix-org/matrix-analytics-events.git#daad3faed54f0b1f1e026a7498b4653e4d01cd90": version "0.0.1" resolved "https://codeload.github.com/matrix-org/matrix-analytics-events/tar.gz/daad3faed54f0b1f1e026a7498b4653e4d01cd90" @@ -8201,6 +8201,23 @@ matrix-events-sdk@^0.0.1-beta.7: resolved "https://registry.yarnpkg.com/matrix-events-sdk/-/matrix-events-sdk-0.0.1-beta.7.tgz#5ffe45eba1f67cc8d7c2377736c728b322524934" integrity sha512-9jl4wtWanUFSy2sr2lCjErN/oC8KTAtaeaozJtrgot1JiQcEI4Rda9OLgQ7nLKaqb4Z/QUx/fR3XpDzm5Jy1JA== +matrix-js-sdk@17.0.0: + version "17.0.0" + resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-17.0.0.tgz#6edf2f8d05da003e98a6cf5269a4717adfe4e406" + integrity sha512-8nv+a1e6n4x4DYKiBFRS6/CIpsE22+31K+9/4Y5MB8m3iraSVBtdZ5y/9ktQnjQuo9I85TvyqHL2obRWF7UD5Q== + dependencies: + "@babel/runtime" "^7.12.5" + another-json "^0.2.0" + browser-request "^0.3.3" + bs58 "^4.0.1" + content-type "^1.0.4" + loglevel "^1.7.1" + matrix-events-sdk "^0.0.1-beta.7" + p-retry "^4.5.0" + qs "^6.9.6" + request "^2.88.2" + unhomoglyph "^1.0.6" + matrix-js-sdk@17.0.0-rc.3: version "17.0.0-rc.3" resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-17.0.0-rc.3.tgz#dd1d9e5b74412e7d624e60f035754922a2a786e0" From ed0f003cb1ea4c204e4d47e44f5bce486a1c33d5 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Tue, 12 Apr 2022 10:41:38 +0100 Subject: [PATCH 38/43] Upgrade matrix-react-sdk to 3.42.3 --- package.json | 2 +- yarn.lock | 29 ++++++----------------------- 2 files changed, 7 insertions(+), 24 deletions(-) diff --git a/package.json b/package.json index 0f777f1cd84..f9f37a33743 100644 --- a/package.json +++ b/package.json @@ -61,7 +61,7 @@ "jsrsasign": "^10.2.0", "katex": "^0.12.0", "matrix-js-sdk": "17.0.0", - "matrix-react-sdk": "3.42.2-rc.4", + "matrix-react-sdk": "3.42.3", "matrix-widget-api": "^0.1.0-beta.18", "prop-types": "^15.7.2", "react": "17.0.2", diff --git a/yarn.lock b/yarn.lock index de4cb813088..c377002980a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8192,7 +8192,7 @@ mathml-tag-names@^2.1.3: resolved "https://registry.yarnpkg.com/mathml-tag-names/-/mathml-tag-names-2.1.3.tgz#4ddadd67308e780cf16a47685878ee27b736a0a3" integrity sha512-APMBEanjybaPzUrfqU0IMU5I0AswKMH7k8OTLs0vvV4KZpExkTkY87nR/zpbuTPj+gARop7aGUbl11pnDfW6xg== -"matrix-analytics-events@github:matrix-org/matrix-analytics-events.git#daad3faed54f0b1f1e026a7498b4653e4d01cd90": +"matrix-analytics-events@github:matrix-org/matrix-analytics-events#daad3faed54f0b1f1e026a7498b4653e4d01cd90": version "0.0.1" resolved "https://codeload.github.com/matrix-org/matrix-analytics-events/tar.gz/daad3faed54f0b1f1e026a7498b4653e4d01cd90" @@ -8218,23 +8218,6 @@ matrix-js-sdk@17.0.0: request "^2.88.2" unhomoglyph "^1.0.6" -matrix-js-sdk@17.0.0-rc.3: - version "17.0.0-rc.3" - resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-17.0.0-rc.3.tgz#dd1d9e5b74412e7d624e60f035754922a2a786e0" - integrity sha512-bcKiLEdo0yNx2FLOyxaGwe4aO86w04SM7O2ywOZ2UE6V2euTbv9I8b7HNFLQy6jftf5ZBDTH4z0cMjhmKGs9YQ== - dependencies: - "@babel/runtime" "^7.12.5" - another-json "^0.2.0" - browser-request "^0.3.3" - bs58 "^4.0.1" - content-type "^1.0.4" - loglevel "^1.7.1" - matrix-events-sdk "^0.0.1-beta.7" - p-retry "^4.5.0" - qs "^6.9.6" - request "^2.88.2" - unhomoglyph "^1.0.6" - matrix-mock-request@^1.2.3: version "1.2.3" resolved "https://registry.yarnpkg.com/matrix-mock-request/-/matrix-mock-request-1.2.3.tgz#56b15d86e2601a9b48a854844396d18caab649c8" @@ -8243,10 +8226,10 @@ matrix-mock-request@^1.2.3: bluebird "^3.5.0" expect "^1.20.2" -matrix-react-sdk@3.42.2-rc.4: - version "3.42.2-rc.4" - resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.42.2-rc.4.tgz#5863e37167e06a493436945965c54dd53adf6502" - integrity sha512-7w1qKuvZju14sf2UpaNUa6ljIBZiOhw2i0XwkjRX55epMNhVRN6bHFS11BkEn+O6RJUlMjkO91z28YnAeCM2Iw== +matrix-react-sdk@3.42.3: + version "3.42.3" + resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.42.3.tgz#fd721a6d54a6a1964b15f4bc3f074e81af184962" + integrity sha512-nF2qDNTelLFhKb3vfrFZUy5K2L/+2RJ6Y+Dj+W8d8J9VskVH97oj7QrQyKMjo7TZOwsUi34v9hTi5xQZJUNsWA== dependencies: "@babel/runtime" "^7.12.5" "@sentry/browser" "^6.11.0" @@ -8284,7 +8267,7 @@ matrix-react-sdk@3.42.2-rc.4: maplibre-gl "^1.15.2" matrix-analytics-events "github:matrix-org/matrix-analytics-events.git#daad3faed54f0b1f1e026a7498b4653e4d01cd90" matrix-events-sdk "^0.0.1-beta.7" - matrix-js-sdk "17.0.0-rc.3" + matrix-js-sdk "17.0.0" matrix-widget-api "^0.1.0-beta.18" minimist "^1.2.5" opus-recorder "^8.0.3" From 3a53260ccc957a2226ed3a5949caea2edf4cb43d Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Tue, 12 Apr 2022 10:43:22 +0100 Subject: [PATCH 39/43] Prepare changelog for v1.10.9 --- CHANGELOG.md | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index b6b645fcfc6..711e4971632 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,55 @@ +Changes in [1.10.9](https://github.com/vector-im/element-web/releases/tag/v1.10.9) (2022-04-12) +=============================================================================================== + +## ✨ Features + * Release threads as a beta feature ([\#8081](https://github.com/matrix-org/matrix-react-sdk/pull/8081)). Fixes #21351. + * More video rooms design updates ([\#8222](https://github.com/matrix-org/matrix-react-sdk/pull/8222)). + * Update video rooms to new design specs ([\#8207](https://github.com/matrix-org/matrix-react-sdk/pull/8207)). Fixes #21515, #21516 #21519 and #21526. + * Live Location Sharing - left panel warning with error ([\#8201](https://github.com/matrix-org/matrix-react-sdk/pull/8201)). + * Live location sharing - Stop publishing location to beacons with consecutive errors ([\#8194](https://github.com/matrix-org/matrix-react-sdk/pull/8194)). + * Live location sharing: allow retry when stop sharing fails ([\#8193](https://github.com/matrix-org/matrix-react-sdk/pull/8193)). + * Allow voice messages to be scrubbed in the timeline ([\#8079](https://github.com/matrix-org/matrix-react-sdk/pull/8079)). Fixes #18713. + * Live location sharing - stop sharing to beacons in rooms you left ([\#8187](https://github.com/matrix-org/matrix-react-sdk/pull/8187)). + * Allow sending and thumbnailing AVIF images ([\#8172](https://github.com/matrix-org/matrix-react-sdk/pull/8172)). + * Live location sharing - handle geolocation errors ([\#8179](https://github.com/matrix-org/matrix-react-sdk/pull/8179)). + * Show voice room participants when not connected ([\#8136](https://github.com/matrix-org/matrix-react-sdk/pull/8136)). Fixes #21513. + * Add margins between labs sections ([\#8169](https://github.com/matrix-org/matrix-react-sdk/pull/8169)). + * Live location sharing - send geolocation beacon events - happy path ([\#8127](https://github.com/matrix-org/matrix-react-sdk/pull/8127)). + * Add support for Animated (A)PNG ([\#8158](https://github.com/matrix-org/matrix-react-sdk/pull/8158)). Fixes #12967. + * Don't form continuations from thread roots ([\#8166](https://github.com/matrix-org/matrix-react-sdk/pull/8166)). Fixes #20908. + * Improve handling of animated GIF and WEBP images ([\#8153](https://github.com/matrix-org/matrix-react-sdk/pull/8153)). Fixes #16193 and #6684. + * Wire up file preview for video files ([\#8140](https://github.com/matrix-org/matrix-react-sdk/pull/8140)). Fixes #21539. + * When showing thread, always auto-focus its composer ([\#8115](https://github.com/matrix-org/matrix-react-sdk/pull/8115)). Fixes #21438. + * Live location sharing - refresh beacon expiry in room ([\#8116](https://github.com/matrix-org/matrix-react-sdk/pull/8116)). + * Use styled mxids in member list v2 ([\#8110](https://github.com/matrix-org/matrix-react-sdk/pull/8110)). Fixes #14825. Contributed by @SimonBrandner. + * Delete groups (legacy communities system) ([\#8027](https://github.com/matrix-org/matrix-react-sdk/pull/8027)). Fixes #17532. + * Add a prototype of voice rooms in labs ([\#8084](https://github.com/matrix-org/matrix-react-sdk/pull/8084)). Fixes #3546. + +## 🐛 Bug Fixes + * Avoid flashing the Jitsi prejoin screen at the user before skipping it ([\#21665](https://github.com/vector-im/element-web/pull/21665)). + * Fix editing `
      ` tags with a non-1 start attribute ([\#8211](https://github.com/matrix-org/matrix-react-sdk/pull/8211)). Fixes #21625. + * Fix URL previews being enabled when room first created ([\#8227](https://github.com/matrix-org/matrix-react-sdk/pull/8227)). Fixes #21659. + * Don't use m.call for Jitsi video rooms ([\#8223](https://github.com/matrix-org/matrix-react-sdk/pull/8223)). + * Scale emoji with size of surrounding text ([\#8224](https://github.com/matrix-org/matrix-react-sdk/pull/8224)). + * Make "Jump to date" translatable ([\#8218](https://github.com/matrix-org/matrix-react-sdk/pull/8218)). + * Normalize call buttons ([\#8129](https://github.com/matrix-org/matrix-react-sdk/pull/8129)). Fixes #21493. Contributed by @luixxiul. + * Show room preview bar with maximised widgets ([\#8180](https://github.com/matrix-org/matrix-react-sdk/pull/8180)). Fixes #21542. + * Update more strings to not wrongly mention room when it is/could be a space ([\#7722](https://github.com/matrix-org/matrix-react-sdk/pull/7722)). Fixes #20243 and #20910. + * Fix issue with redacting via edit composer flow causing stuck editStates ([\#8184](https://github.com/matrix-org/matrix-react-sdk/pull/8184)). + * Fix some image/video scroll jumps ([\#8182](https://github.com/matrix-org/matrix-react-sdk/pull/8182)). + * Fix "react error on share dialog" ([\#8170](https://github.com/matrix-org/matrix-react-sdk/pull/8170)). Contributed by @yaya-usman. + * Fix disambiguated profile in threads in bubble layout ([\#8168](https://github.com/matrix-org/matrix-react-sdk/pull/8168)). Fixes #21570. Contributed by @SimonBrandner. + * Responsive BetaCard on Labs ([\#8154](https://github.com/matrix-org/matrix-react-sdk/pull/8154)). Fixes #21554. Contributed by @luixxiul. + * Display button as inline in room directory dialog ([\#8164](https://github.com/matrix-org/matrix-react-sdk/pull/8164)). Fixes #21567. Contributed by @luixxiul. + * Null guard TimelinePanel unmount edge ([\#8171](https://github.com/matrix-org/matrix-react-sdk/pull/8171)). + * Fix beta pill label breaking ([\#8162](https://github.com/matrix-org/matrix-react-sdk/pull/8162)). Fixes #21566. Contributed by @luixxiul. + * Strip relations when forwarding ([\#7929](https://github.com/matrix-org/matrix-react-sdk/pull/7929)). Fixes #19769, #18067 #21015 and #10924. + * Don't try (and fail) to show replies for redacted events ([\#8141](https://github.com/matrix-org/matrix-react-sdk/pull/8141)). Fixes #21435. + * Fix 3pid member info for space member list ([\#8128](https://github.com/matrix-org/matrix-react-sdk/pull/8128)). Fixes #21534. + * Set max-width to user context menu ([\#8089](https://github.com/matrix-org/matrix-react-sdk/pull/8089)). Fixes #21486. Contributed by @luixxiul. + * Fix issue with falsey hrefs being sent in events ([\#8113](https://github.com/matrix-org/matrix-react-sdk/pull/8113)). Fixes #21417. + * Make video sizing consistent with images ([\#8102](https://github.com/matrix-org/matrix-react-sdk/pull/8102)). Fixes #20072. + Changes in [1.10.9-rc.4](https://github.com/vector-im/element-web/releases/tag/v1.10.9-rc.4) (2022-04-11) ========================================================================================================= From 4ef985f878dd9c872d4c08d4475f39d49a9368ba Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Tue, 12 Apr 2022 10:43:23 +0100 Subject: [PATCH 40/43] v1.10.9 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index f9f37a33743..a12814b10d3 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "element-web", - "version": "1.10.9-rc.4", + "version": "1.10.9", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "repository": { From 32e6fd1f5b089229d328651a96acc4b113034c89 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Thu, 14 Apr 2022 14:02:53 +0100 Subject: [PATCH 41/43] Upgrade matrix-react-sdk to 3.42.4 --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index a12814b10d3..c9a63e79fa0 100644 --- a/package.json +++ b/package.json @@ -61,7 +61,7 @@ "jsrsasign": "^10.2.0", "katex": "^0.12.0", "matrix-js-sdk": "17.0.0", - "matrix-react-sdk": "3.42.3", + "matrix-react-sdk": "3.42.4", "matrix-widget-api": "^0.1.0-beta.18", "prop-types": "^15.7.2", "react": "17.0.2", diff --git a/yarn.lock b/yarn.lock index c377002980a..e355e50dfd6 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8226,10 +8226,10 @@ matrix-mock-request@^1.2.3: bluebird "^3.5.0" expect "^1.20.2" -matrix-react-sdk@3.42.3: - version "3.42.3" - resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.42.3.tgz#fd721a6d54a6a1964b15f4bc3f074e81af184962" - integrity sha512-nF2qDNTelLFhKb3vfrFZUy5K2L/+2RJ6Y+Dj+W8d8J9VskVH97oj7QrQyKMjo7TZOwsUi34v9hTi5xQZJUNsWA== +matrix-react-sdk@3.42.4: + version "3.42.4" + resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.42.4.tgz#2d3e830435e1c84b34a06cdaaa11854afae0d7ea" + integrity sha512-6z37RfDzUVwuxdWD59xpK8IvBJfJkEGN07hWD9dcJmUPrEVa1azWGvOLH2FRq1Q525DkLAn5Ci4fNQdUiyzynA== dependencies: "@babel/runtime" "^7.12.5" "@sentry/browser" "^6.11.0" From a4c20dd045dac5233278383f971ddce5ed4b0b5f Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Thu, 14 Apr 2022 14:04:29 +0100 Subject: [PATCH 42/43] Prepare changelog for v1.10.10 --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 711e4971632..02a0738acaa 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +Changes in [1.10.10](https://github.com/vector-im/element-web/releases/tag/v1.10.10) (2022-04-14) +================================================================================================= + +## 🐛 Bug Fixes + * Fixes around threads beta in degraded mode ([\#8319](https://github.com/matrix-org/matrix-react-sdk/pull/8319)). Fixes #21762. + Changes in [1.10.9](https://github.com/vector-im/element-web/releases/tag/v1.10.9) (2022-04-12) =============================================================================================== From 4a56509d6642aee462e0680c30e877ba074b4953 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Thu, 14 Apr 2022 14:04:30 +0100 Subject: [PATCH 43/43] v1.10.10 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index c9a63e79fa0..547b125d058 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "element-web", - "version": "1.10.9", + "version": "1.10.10", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "repository": {