diff --git a/.github/workflows/triage-move-review-requests.yml b/.github/workflows/triage-move-review-requests.yml new file mode 100644 index 00000000000..f323d49b9ea --- /dev/null +++ b/.github/workflows/triage-move-review-requests.yml @@ -0,0 +1,61 @@ +name: Move pull requests asking for review to the relevant project +on: + pull_request: + types: [review_requested] +jobs: + add_design_pr_to_project: + name: Move PRs asking for design review to the design board + runs-on: ubuntu-latest + steps: + - uses: octokit/graphql-action@v2.x + id: find_team_members + with: + headers: '{"GraphQL-Features": "projects_next_graphql"}' + query: | + query find_team_members($team: String!) { + organization(login: "vector-im") { + team(slug: $team) { + members { + nodes { + login + } + } + } + } + } + team: ${{ env.TEAM }} + env: + TEAM: "design" + GITHUB_TOKEN: ${{ secrets.ELEMENT_BOT_TOKEN }} + - id: any_reviewers_in_the_team + run: | + echo '${{ tojson(fromjson(steps.find_team_members.outputs.data).organization.team.members.nodes[*].login) }}' | tee /tmp/team_members.json + echo '${{ tojson(github.event.pull_request.requested_reviewers[*].login) }}' | tee /tmp/reviewers.json + jq --raw-output .[] < /tmp/team_members.json | sort | tee /tmp/team_members.txt + jq --raw-output .[] < /tmp/reviewers.json | sort | tee /tmp/reviewers.txt + if [ $(join /tmp/team_members.txt /tmp/reviewers.txt | wc -l) = 0 ]; then + echo "::set-output name=match::false" + else + echo "::set-output name=match::true" + fi + - uses: octokit/graphql-action@v2.x + id: add_to_project + if: > + (steps.any_reviewers_in_the_team.outputs.match == 'true') || + (github.event.pull_request.requested_teams.slug == env.TEAM) + with: + headers: '{"GraphQL-Features": "projects_next_graphql"}' + query: | + mutation add_to_project($projectid:String!, $contentid:String!) { + addProjectNextItem(input:{projectId:$projectid contentId:$contentid}) { + projectNextItem { + id + } + } + } + projectid: ${{ env.PROJECT_ID }} + contentid: ${{ github.event.pull_request.node_id }} + env: + PROJECT_ID: "PN_kwDOAM0swc0sUA" + TEAM: "design" + GITHUB_TOKEN: ${{ secrets.ELEMENT_BOT_TOKEN }} diff --git a/CHANGELOG.md b/CHANGELOG.md index bc04c09570f..5b7093bc1eb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,96 @@ +Changes in [1.9.6](https://github.com/vector-im/element-web/releases/tag/v1.9.6) (2021-12-06) +============================================================================================= + +## ✨ Features + * Add unread indicator to the timelineCard header icon ([\#7156](https://github.com/matrix-org/matrix-react-sdk/pull/7156)). Fixes #19635. + * Only show core navigation elements (call/chat/notification/info) when a widget is maximised ([\#7114](https://github.com/matrix-org/matrix-react-sdk/pull/7114)). Fixes #19632. + * Improve ThreadPanel ctx menu accessibility ([\#7217](https://github.com/matrix-org/matrix-react-sdk/pull/7217)). Fixes #19885. + * Allow filtering room list during treeview navigation ([\#7219](https://github.com/matrix-org/matrix-react-sdk/pull/7219)). Fixes #14702. + * Add right panel chat timeline ([\#7112](https://github.com/matrix-org/matrix-react-sdk/pull/7112)). Fixes #19633. + * Hide server options hint when disable_custom_urls is true ([\#7215](https://github.com/matrix-org/matrix-react-sdk/pull/7215)). Fixes #19919. + * Improve right panel resize handle usability ([\#7204](https://github.com/matrix-org/matrix-react-sdk/pull/7204)). Fixes #15145. Contributed by @weeman1337. + * Spaces quick settings ([\#7196](https://github.com/matrix-org/matrix-react-sdk/pull/7196)). + * Maximised widgets always force a call to be shown in PIP mode ([\#7163](https://github.com/matrix-org/matrix-react-sdk/pull/7163)). Fixes #19637. + * Group Labs flags ([\#7190](https://github.com/matrix-org/matrix-react-sdk/pull/7190)). + * Show room context details in forward dialog ([\#7162](https://github.com/matrix-org/matrix-react-sdk/pull/7162)). Fixes #19793. + * Remove chevrons from RoomSummaryCard_Button ([\#7137](https://github.com/matrix-org/matrix-react-sdk/pull/7137)). Fixes #19644. + * Disable op/deop commands where user has no permissions ([\#7161](https://github.com/matrix-org/matrix-react-sdk/pull/7161)). Fixes #15390. + * Add option to change the size of images/videos in the timeline ([\#7017](https://github.com/matrix-org/matrix-react-sdk/pull/7017)). Fixes vector-im/element-meta#49 #1520 and #19498. + +## 🐛 Bug Fixes + * Fix left panel glow in Safari ([\#7236](https://github.com/matrix-org/matrix-react-sdk/pull/7236)). Fixes #19863. + * Fix newline on edit messages with quotes ([\#7227](https://github.com/matrix-org/matrix-react-sdk/pull/7227)). Fixes #12535. Contributed by @renancleyson-dev. + * Guard against null refs in findSiblingElement ([\#7228](https://github.com/matrix-org/matrix-react-sdk/pull/7228)). + * Tweak bottom of space panel buttons in expanded state ([\#7213](https://github.com/matrix-org/matrix-react-sdk/pull/7213)). Fixes #19921. + * Fix multiline paragraph rendering as single line ([\#7210](https://github.com/matrix-org/matrix-react-sdk/pull/7210)). Fixes #8786. Contributed by @renancleyson-dev. + * Improve room list message previews ([\#7224](https://github.com/matrix-org/matrix-react-sdk/pull/7224)). Fixes #17101 and #16169. + * Fix EmojiPicker lazy loaded rendering bug ([\#7225](https://github.com/matrix-org/matrix-react-sdk/pull/7225)). Fixes #15341. + * Prevent default avatar in UserInfo having pointer cursor ([\#7218](https://github.com/matrix-org/matrix-react-sdk/pull/7218)). Fixes #13872. + * Prevent duplicate avatars in Event List Summaries ([\#7222](https://github.com/matrix-org/matrix-react-sdk/pull/7222)). Fixes #17706. + * Respect the home page as a context for the Home space ([\#7216](https://github.com/matrix-org/matrix-react-sdk/pull/7216)). Fixes #19554. + * Fix RoomUpgradeWarningBar exploding ([\#7214](https://github.com/matrix-org/matrix-react-sdk/pull/7214)). Fixes #19920. + * Polish threads misalignments and UI diversion ([\#7209](https://github.com/matrix-org/matrix-react-sdk/pull/7209)). Fixes #19772, #19710 #19629 and #19711. + * Fix Manage Restricted Join Rule Dialog for Spaces ([\#7208](https://github.com/matrix-org/matrix-react-sdk/pull/7208)). Fixes #19610. + * Fix wrongly showing unpin in pinned messages tile with no perms ([\#7197](https://github.com/matrix-org/matrix-react-sdk/pull/7197)). Fixes #19886. + * Make image size constrained by height when using the ImageSize.Large option ([\#7171](https://github.com/matrix-org/matrix-react-sdk/pull/7171)). Fixes #19788. + * Prevent programmatic scrolling within truncated room sublists ([\#7191](https://github.com/matrix-org/matrix-react-sdk/pull/7191)). + * Remove leading slash from /addwidget Jitsi confs ([\#7175](https://github.com/matrix-org/matrix-react-sdk/pull/7175)). Fixes #19839. Contributed by @AndrewFerr. + * Fix automatic composer focus, regressed by threads work ([\#7167](https://github.com/matrix-org/matrix-react-sdk/pull/7167)). Fixes #19479. + * Show space members when not invited even if summary didn't fail ([\#7153](https://github.com/matrix-org/matrix-react-sdk/pull/7153)). Fixes #19781. + * Prevent custom power levels from breaking roles & permissions tab ([\#7160](https://github.com/matrix-org/matrix-react-sdk/pull/7160)). Fixes #19812. + * Room Context Menu should respond to tag changes ([\#7154](https://github.com/matrix-org/matrix-react-sdk/pull/7154)). Fixes #19776. + * Fix an edge case when trying to join an upgraded room ([\#7159](https://github.com/matrix-org/matrix-react-sdk/pull/7159)). + +Changes in [1.9.6-rc.2](https://github.com/vector-im/element-web/releases/tag/v1.9.6-rc.2) (2021-12-01) +======================================================================================================= + + * Fixed release from correct branch + +Changes in [1.9.6-rc.1](https://github.com/vector-im/element-web/releases/tag/v1.9.6-rc.1) (2021-11-30) +======================================================================================================= + +## ✨ Features + * Tweaks to informational architecture 1.1 ([\#7052](https://github.com/matrix-org/matrix-react-sdk/pull/7052)). Fixes #19526, #19379, #17792, #16450, #19881, #19892, #19300, #19324, #17307, #17468, #19932 #19956 and #19526. + * Add unread indicator to the timelineCard header icon ([\#7156](https://github.com/matrix-org/matrix-react-sdk/pull/7156)). Fixes #19635 and #19635. + * Only show core navigation elements (call/chat/notification/info) when a widget is maximised ([\#7114](https://github.com/matrix-org/matrix-react-sdk/pull/7114)). Fixes #19632 and #19632. + * Improve ThreadPanel ctx menu accessibility ([\#7217](https://github.com/matrix-org/matrix-react-sdk/pull/7217)). Fixes #19885 and #19885. + * Allow filtering room list during treeview navigation ([\#7219](https://github.com/matrix-org/matrix-react-sdk/pull/7219)). Fixes #14702 and #14702. + * Add right panel chat timeline ([\#7112](https://github.com/matrix-org/matrix-react-sdk/pull/7112)). Fixes #19633 and #19633. + * Hide server options hint when disable_custom_urls is true ([\#7215](https://github.com/matrix-org/matrix-react-sdk/pull/7215)). Fixes #19919 and #19919. + * Improve right panel resize handle usability ([\#7204](https://github.com/matrix-org/matrix-react-sdk/pull/7204)). Fixes #15145 and #15145. Contributed by @weeman1337. + * Spaces quick settings ([\#7196](https://github.com/matrix-org/matrix-react-sdk/pull/7196)). + * Maximised widgets always force a call to be shown in PIP mode ([\#7163](https://github.com/matrix-org/matrix-react-sdk/pull/7163)). Fixes #19637 and #19637. + * Group Labs flags ([\#7190](https://github.com/matrix-org/matrix-react-sdk/pull/7190)). + * Show room context details in forward dialog ([\#7162](https://github.com/matrix-org/matrix-react-sdk/pull/7162)). Fixes #19793 and #19793. + * Remove chevrons from RoomSummaryCard_Button ([\#7137](https://github.com/matrix-org/matrix-react-sdk/pull/7137)). Fixes #19644 and #19644. + * Disable op/deop commands where user has no permissions ([\#7161](https://github.com/matrix-org/matrix-react-sdk/pull/7161)). Fixes #15390 and #15390. + * Add option to change the size of images/videos in the timeline ([\#7017](https://github.com/matrix-org/matrix-react-sdk/pull/7017)). Fixes vector-im/element-meta#49, #1520 #19498 and vector-im/element-meta#49. + +## 🐛 Bug Fixes + * Fix links being parsed as markdown links improperly ([\#7200](https://github.com/matrix-org/matrix-react-sdk/pull/7200)). + * Fix left panel glow in Safari ([\#7236](https://github.com/matrix-org/matrix-react-sdk/pull/7236)). Fixes #19863 and #19863. + * Fix newline on edit messages with quotes ([\#7227](https://github.com/matrix-org/matrix-react-sdk/pull/7227)). Fixes #12535 and #12535. Contributed by @renancleyson-dev. + * Guard against null refs in findSiblingElement ([\#7228](https://github.com/matrix-org/matrix-react-sdk/pull/7228)). + * Tweak bottom of space panel buttons in expanded state ([\#7213](https://github.com/matrix-org/matrix-react-sdk/pull/7213)). Fixes #19921 and #19921. + * Fix multiline paragraph rendering as single line ([\#7210](https://github.com/matrix-org/matrix-react-sdk/pull/7210)). Fixes #8786 and #8786. Contributed by @renancleyson-dev. + * Improve room list message previews ([\#7224](https://github.com/matrix-org/matrix-react-sdk/pull/7224)). Fixes #17101 #16169 and #17101. + * Fix EmojiPicker lazy loaded rendering bug ([\#7225](https://github.com/matrix-org/matrix-react-sdk/pull/7225)). Fixes #15341 and #15341. + * Prevent default avatar in UserInfo having pointer cursor ([\#7218](https://github.com/matrix-org/matrix-react-sdk/pull/7218)). Fixes #13872 and #13872. + * Prevent duplicate avatars in Event List Summaries ([\#7222](https://github.com/matrix-org/matrix-react-sdk/pull/7222)). Fixes #17706 and #17706. + * Respect the home page as a context for the Home space ([\#7216](https://github.com/matrix-org/matrix-react-sdk/pull/7216)). Fixes #19554 and #19554. + * Fix RoomUpgradeWarningBar exploding ([\#7214](https://github.com/matrix-org/matrix-react-sdk/pull/7214)). Fixes #19920 and #19920. + * Polish threads misalignments and UI diversion ([\#7209](https://github.com/matrix-org/matrix-react-sdk/pull/7209)). Fixes #19772, #19710, #19629 #19711 and #19772. + * Fix Manage Restricted Join Rule Dialog for Spaces ([\#7208](https://github.com/matrix-org/matrix-react-sdk/pull/7208)). Fixes #19610 and #19610. + * Fix wrongly showing unpin in pinned messages tile with no perms ([\#7197](https://github.com/matrix-org/matrix-react-sdk/pull/7197)). Fixes #19886 and #19886. + * Make image size constrained by height when using the ImageSize.Large option ([\#7171](https://github.com/matrix-org/matrix-react-sdk/pull/7171)). Fixes #19788 and #19788. + * Prevent programmatic scrolling within truncated room sublists ([\#7191](https://github.com/matrix-org/matrix-react-sdk/pull/7191)). + * Remove leading slash from /addwidget Jitsi confs ([\#7175](https://github.com/matrix-org/matrix-react-sdk/pull/7175)). Fixes #19839 and #19839. Contributed by @AndrewFerr. + * Fix automatic composer focus, regressed by threads work ([\#7167](https://github.com/matrix-org/matrix-react-sdk/pull/7167)). Fixes #19479 and #19479. + * Show space members when not invited even if summary didn't fail ([\#7153](https://github.com/matrix-org/matrix-react-sdk/pull/7153)). Fixes #19781 and #19781. + * Prevent custom power levels from breaking roles & permissions tab ([\#7160](https://github.com/matrix-org/matrix-react-sdk/pull/7160)). Fixes #19812 and #19812. + * Room Context Menu should respond to tag changes ([\#7154](https://github.com/matrix-org/matrix-react-sdk/pull/7154)). Fixes #19776. + * Fix an edge case when trying to join an upgraded room ([\#7159](https://github.com/matrix-org/matrix-react-sdk/pull/7159)). + Changes in [1.9.5](https://github.com/vector-im/element-web/releases/tag/v1.9.5) (2021-11-22) ============================================================================================= diff --git a/package.json b/package.json index a45e2e1d377..078c7721ecc 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "element-web", - "version": "1.9.5", + "version": "1.9.6", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "repository": { @@ -60,8 +60,8 @@ "gfm.css": "^1.1.2", "jsrsasign": "^10.2.0", "katex": "^0.12.0", - "matrix-js-sdk": "15.1.1", - "matrix-react-sdk": "3.35.1", + "matrix-js-sdk": "15.2.0", + "matrix-react-sdk": "3.36.0", "matrix-widget-api": "^0.1.0-beta.17", "prop-types": "^15.7.2", "react": "17.0.2", @@ -99,7 +99,7 @@ "@types/sanitize-html": "^2.3.1", "@typescript-eslint/eslint-plugin": "^4.17.0", "@typescript-eslint/parser": "^4.17.0", - "allchange": "^1.0.5", + "allchange": "^1.0.6", "autoprefixer": "^9.8.6", "babel-jest": "^26.6.3", "babel-loader": "^8.2.2", diff --git a/src/i18n/strings/fy.json b/src/i18n/strings/fy.json index fa55c9dc5d5..79f118cb5d9 100644 --- a/src/i18n/strings/fy.json +++ b/src/i18n/strings/fy.json @@ -1,36 +1,36 @@ { - "Sign In": "Ynskriuwe", - "Failed to start": "Iepenjen mislearre", - "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.": "Jo kinne fierder gean mei jo eigen browser, mar guon funksjes kinne net wurkje en uterlik kin de applikaasje der ôfwikend út sjen.", - "Please install Chrome, Firefox, or Safari for the best experience.": "Graach Chrome, Firefox, ofSafari ynstallearre foar de beste ûnderfining.", - "%(brand)s uses advanced browser features which aren't supported by your current browser.": "%(brand)s brûkt avansearre browser funksjes dy net stipe wurde troch de browser dy jo no brûke.", - "Powered by Matrix": "Fersoarge troch Matrix", + "Sign In": "Oanmelde", + "Failed to start": "Opstarten mislearre", + "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.": "Jo kinne fierder gean mei jo eigen browser, mar guon funksjes kinne net wurkje en uterlik kin de applikaasje der ôfwikend útsjen.", + "Please install Chrome, Firefox, or Safari for the best experience.": "Graach Chrome, Firefox, ofSafari ynstallearje foar de beste ûnderfining.", + "%(brand)s uses advanced browser features which aren't supported by your current browser.": "%(brand)s brûkt avansearre browserfunksjes dy’t net stipe wurde troch de browser dy’t jo no brûke.", + "Powered by Matrix": "Mooglik makke troch Matrix", "%(brand)s Desktop (%(platformName)s)": "%(brand)s Desktop (%(platformName)s)", "Previous/next recently visited room or community": "Foarige/Folgjende resintlik besochte keamer as mienskip", "Switch to space by number": "Wikselje fan romte mei nûmer", - "Unexpected error preparing the app. See console for details.": "Ûnferwachte flater by it klearmeitsjen fan de applikaasje. Sjoch yn'e konsole foar details.", + "Unexpected error preparing the app. See console for details.": "Unferwachte flater by it klearmeitsjen fan de applikaasje. Sjoch yn de console foar details.", "The message from the parser is: %(message)s": "It berjocht fan de ferwurker is: %(message)s", - "Your Element configuration contains invalid JSON. Please correct the problem and reload the page.": "Jo Element konfiguraasje hat ûnjildige JSON. Nei dat jo dit oplost ha kin dizze side ferfarske wurde.", + "Your Element configuration contains invalid JSON. Please correct the problem and reload the page.": "Jo Element-konfiguraasje hat ûnjildige JSON. Nei dat jo dit oplost ha, kin dizze side ferfarske wurde.", "Use %(brand)s on mobile": "Brûk %(brand)s op mobyl", "Decentralised, encrypted chat & collaboration powered by [matrix]": "Desintralisearre, fersifere chat & gearwurking fersoarge troch [matrix]", - "You need to be using HTTPS to place a screen-sharing call.": "Jo moatte HTTPS brûke om te skiljen en jo skermynhâld te dielen.", + "You need to be using HTTPS to place a screen-sharing call.": "Oproppen mei skerm dielen fereasket HTTPS.", "%(appName)s (%(browserName)s, %(osName)s)": "%(appName)s (%(browserName)s, %(osName)s)", - "Go to your browser to complete Sign In": "Gean nei jo browser om it ynskriuwen ôf te rûnen", - "Download Completed": "Klear mei Delheljen", - "Unable to load config file: please refresh the page to try again.": "Kin konfiguraasje bestân net lade: ferfarskje de side en probearje it noch ris.", + "Go to your browser to complete Sign In": "Gean nei jo browser om it ynskriuwen te foltôgjen", + "Download Completed": "Download foltôge", + "Unable to load config file: please refresh the page to try again.": "Kin konfiguraasjebestân net lade: ferfarskje de side en probearje it nochris.", "Open user settings": "Brûkersynstellingen iepenje", - "Dismiss": "Negearre", + "Dismiss": "Slute", "Explore rooms": "Keamers ûntdekke", - "Create Account": "Account Meitsje", + "Create Account": "Registrearje", "Welcome to Element": "Wolkom by Element", "I understand the risks and wish to continue": "Ik begryp de risiko's en wol graach fierder gean", "Go to element.io": "Gean nei element.io", "Your browser can't run %(brand)s": "Jo browser kin %(brand)s net útfiere", "Unsupported browser": "Net stipe browser", - "Unknown device": "Ûnbekend apparaat", + "Unknown device": "Unbekend apparaat", "Open": "Iepenje", - "Invalid JSON": "Ûnjildiche JSON", + "Invalid JSON": "Unjildige JSON", "Your Element is misconfigured": "Jo Element is net goed konfigurearre", - "Invalid configuration: no default server specified.": "Ûnjildiche konfiguraasje: gjin standert tsjinner selektearre.", - "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Ûnjildige konfiguraasje: kin allinnich kieze út default_server_config, default_server_name, as default_hs_url." + "Invalid configuration: no default server specified.": "Unjildiche konfiguraasje: gjin standertserver selektearre.", + "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Unjildige konfiguraasje: kin allinnich kieze út default_server_config, default_server_name, as default_hs_url." } diff --git a/src/i18n/strings/id.json b/src/i18n/strings/id.json index 9412a62c121..e5d36938657 100644 --- a/src/i18n/strings/id.json +++ b/src/i18n/strings/id.json @@ -4,13 +4,13 @@ "Unknown device": "Perangkat tidak dikenal", "You need to be using HTTPS to place a screen-sharing call.": "Anda perlu menggunakan HTTPS untuk melakukan panggilan berbagi layar.", "Welcome to Element": "Selamat datang di Element", - "Decentralised, encrypted chat & collaboration powered by [matrix]": "Obrolan terenkripsi, terdesentralisasi & kolaborasi diberdayakan oleh [matrix]", + "Decentralised, encrypted chat & collaboration powered by [matrix]": "Obrolan & kolaborasi terenkripsi dan terdesentralisasi diberdayakan oleh [matrix]", "Your Element configuration contains invalid JSON. Please correct the problem and reload the page.": "Konfigurasi Element Anda berisi JSON yang tidak valid. Mohon perbaiki masalahnya dan muat ulang halamannya.", "Invalid configuration: no default server specified.": "Konfigurasi tidak valid: server bawaan belum ditentukan.", "Missing indexeddb worker script!": "Tidak ada script worker indexeddb!", "Explore rooms": "Jelajahi ruangan", "Create Account": "Buat Akun", - "Switch to space by number": "Beralih ke space dengan nomor", + "Switch to space by number": "Beralih ke space bedasarkan angka", "Go to your browser to complete Sign In": "Buka browser Anda untuk menyelesaikan Sign In", "Sign In": "Masuk", "Failed to start": "Gagal untuk memulai", @@ -28,7 +28,7 @@ "Previous/next recently visited room or community": "Ruangan atau komunitas yang baru saja dikunjungi sebelumnya/berikutnya", "Open user settings": "Buka pengaturan pengguna", "Open": "Buka", - "Download Completed": "Unduh Selesai", + "Download Completed": "Unduhan Selesai", "Unexpected error preparing the app. See console for details.": "Kesalahan tak terduga saat menyiapkan aplikasi. Lihat konsol untuk detail.", "Unable to load config file: please refresh the page to try again.": "Tidak dapat memuat file konfigurasi: mohon muat ulang halaman ini untuk mencoba lagi.", "Invalid JSON": "JSON tidak valid", diff --git a/src/i18n/strings/nl.json b/src/i18n/strings/nl.json index 8376ab5e2b0..95b7dbe7566 100644 --- a/src/i18n/strings/nl.json +++ b/src/i18n/strings/nl.json @@ -34,5 +34,5 @@ "%(brand)s uses advanced browser features which aren't supported by your current browser.": "%(brand)s gebruikt geavanceerde functies die niet ondersteund worden in uw huidige browser.", "Powered by Matrix": "Mogelijk gemaakt door Matrix", "Use %(brand)s on mobile": "Gebruik %(brand)s op uw mobiel", - "Switch to space by number": "Wissel naar ruimte met nummer" + "Switch to space by number": "Wissel naar Space met nummer" } diff --git a/src/i18n/strings/pl.json b/src/i18n/strings/pl.json index 19f5e8e4554..d6456146b8c 100644 --- a/src/i18n/strings/pl.json +++ b/src/i18n/strings/pl.json @@ -33,5 +33,6 @@ "Your Element configuration contains invalid JSON. Please correct the problem and reload the page.": "Konfiguracja Elementa zawiera niepoprawny JSON. Popraw konfiguracje i odśwież stronę.", "Your Element is misconfigured": "Element jest nieprawidłowo skonfigurowany", "Powered by Matrix": "Zasilane przez Matrix", - "Use %(brand)s on mobile": "Użyj %(brand)s w telefonie" + "Use %(brand)s on mobile": "Użyj %(brand)s w telefonie", + "Switch to space by number": "Przełącz na przestrzeń według numeru" } diff --git a/src/vector/platform/WebPlatform.ts b/src/vector/platform/WebPlatform.ts index bb2a52f243d..f3f3d55ac96 100644 --- a/src/vector/platform/WebPlatform.ts +++ b/src/vector/platform/WebPlatform.ts @@ -33,8 +33,6 @@ import { logger } from "matrix-js-sdk/src/logger"; const POKE_RATE_MS = 10 * 60 * 1000; // 10 min export default class WebPlatform extends VectorBasePlatform { - private runningVersion: string = null; - constructor() { super(); // Register service worker if available on this platform @@ -102,7 +100,7 @@ export default class WebPlatform extends VectorBasePlatform { return notification; } - private getVersion(): Promise { + private getMostRecentVersion(): Promise { // We add a cachebuster to the request to make sure that we know about // the most recent version on the origin server. That might not // actually be the version we'd get on a reload (particularly in the @@ -130,11 +128,20 @@ export default class WebPlatform extends VectorBasePlatform { }); } - getAppVersion(): Promise { - if (this.runningVersion !== null) { - return Promise.resolve(this.runningVersion); + getNormalizedAppVersion(): string { + let ver = process.env.VERSION; + + // if version looks like semver with leading v, strip it + // (matches scripts/package.sh) + const semVerRegex = new RegExp("^v[0-9]+.[0-9]+.[0-9]+(-.+)?$"); + if (semVerRegex.test(process.env.VERSION)) { + ver = process.env.VERSION.substr(1); } - return this.getVersion(); + return ver; + } + + getAppVersion(): Promise { + return Promise.resolve(this.getNormalizedAppVersion()); } startUpdater() { @@ -147,12 +154,12 @@ export default class WebPlatform extends VectorBasePlatform { } pollForUpdate = () => { - return this.getVersion().then((ver) => { - if (this.runningVersion === null) { - this.runningVersion = ver; - } else if (this.runningVersion !== ver) { - if (this.shouldShowUpdate(ver)) { - showUpdateToast(this.runningVersion, ver); + return this.getMostRecentVersion().then((mostRecentVersion) => { + const currentVersion = this.getNormalizedAppVersion(); + + if (currentVersion !== mostRecentVersion) { + if (this.shouldShowUpdate(mostRecentVersion)) { + showUpdateToast(currentVersion, mostRecentVersion); } return { status: UpdateCheckStatus.Ready }; } else { diff --git a/yarn.lock b/yarn.lock index b673a4fba48..6af1d4aec09 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2185,10 +2185,10 @@ ajv@^8.0.1: require-from-string "^2.0.2" uri-js "^4.2.2" -allchange@^1.0.5: - version "1.0.5" - resolved "https://registry.yarnpkg.com/allchange/-/allchange-1.0.5.tgz#9496425eea8ff1a2e57b37d059333df6c3d37382" - integrity sha512-g3VYQfhvc42L0Mr9JTsZlVSrms4TbvqrvONj13M8NHKvp25XR9d5xS05wXqh9+mh0tYcAWDrOvAoceCzSzijBA== +allchange@^1.0.6: + version "1.0.6" + resolved "https://registry.yarnpkg.com/allchange/-/allchange-1.0.6.tgz#f905918255541dc92d6a1f5cdf758db4597f569c" + integrity sha512-37a4J55oSxhLmlS/DeBOKjKn5dbjkyR4qMJ9is8+CKLPTe7NybcWBYvrPLr9kVLBa6aigWrdovRHrQj/4v6k4w== dependencies: "@actions/core" "^1.4.0" "@actions/github" "^5.0.0" @@ -7854,10 +7854,10 @@ 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-js-sdk@15.1.1: - version "15.1.1" - resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-15.1.1.tgz#791aefb2c68e1e8d398beee3eedcb6c23b63315d" - integrity sha512-tKZQLFwYMQk2G4nmLNR0cDDXcfDkdzJGyg2S15HooB2aI7/Ev9PhCczkw+xzwhJusxzfa8j+yx52KjMXUb81WQ== +matrix-js-sdk@15.2.0: + version "15.2.0" + resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-15.2.0.tgz#1f04fe938f951af8af4b78dff8ff697db5981428" + integrity sha512-jZOM8Fn86oNvU3zVQcc+JTKKrtYq4ADN6rPZs4Mwxj/X/GDP+2YIP5176GtviF0GM6VO1dcnPZY73ykl8DayjA== dependencies: "@babel/runtime" "^7.12.5" another-json "^0.2.0" @@ -7878,10 +7878,10 @@ matrix-mock-request@^1.2.3: bluebird "^3.5.0" expect "^1.20.2" -matrix-react-sdk@3.35.1: - version "3.35.1" - resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.35.1.tgz#e5773633d26d83dfbb839ad29f83c06abd70752f" - integrity sha512-pX7sZ4LNWznYQ3eCfXXWQWcUSQy3pjxQ03VAiTxpJcXhSvHuK2iCtxMXCUObhr9vO1YqaiyJS5UMnT7+n1Q7gw== +matrix-react-sdk@3.36.0: + version "3.36.0" + resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.36.0.tgz#70a07944bd217e8d52e7b818d215d6d7e1b9c3f2" + integrity sha512-/Mc+4PrySGs2LHN15LQk9bUauAHk2dW7SrG04wEnjNSA+yudH5wiHYZ/4p1ZHjOLW/NsDoGpIYN+Yqkr9aKuHA== dependencies: "@babel/runtime" "^7.12.5" "@sentry/browser" "^6.11.0" @@ -7912,7 +7912,7 @@ matrix-react-sdk@3.35.1: katex "^0.12.0" linkifyjs "^2.1.9" lodash "^4.17.20" - matrix-js-sdk "15.1.1" + matrix-js-sdk "15.2.0" matrix-widget-api "^0.1.0-beta.17" minimist "^1.2.5" opus-recorder "^8.0.3"