From 640ed0479a6bb5c0518191fd31f9588fc4768cd2 Mon Sep 17 00:00:00 2001 From: Govindas Date: Fri, 4 Jun 2021 08:50:12 +0000 Subject: [PATCH 01/22] Translated using Weblate (Lithuanian) 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/lt/ --- src/i18n/strings/lt.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/i18n/strings/lt.json b/src/i18n/strings/lt.json index a12623454..fe4d237c3 100644 --- a/src/i18n/strings/lt.json +++ b/src/i18n/strings/lt.json @@ -32,5 +32,6 @@ "Your browser can't run %(brand)s": "Jūsų naršyklė negali paleisti %(brand)s", "%(brand)s uses advanced browser features which aren't supported by your current browser.": "%(brand)s naudoja išplėstines naršyklės funkcijas, kurių jūsų dabartinė naršyklė nepalaiko.", "Please install Chrome, Firefox, or Safari for the best experience.": "Geriausiam veikimui suinstaliuokite Chrome, Firefox, arba Safari.", - "Powered by Matrix": "Veikia su Matrix" + "Powered by Matrix": "Veikia su Matrix", + "Use %(brand)s on mobile": "Naudoti %(brand)s mobiliajame telefone" } From 8fc12bddd727c3335fbf7c01a775dffee9272024 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Mon, 7 Jun 2021 17:52:24 +0100 Subject: [PATCH 02/22] Reset matrix-js-sdk back to develop branch --- package.json | 2 +- yarn.lock | 14 ++++++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index 0121ebacd..a7f774a91 100644 --- a/package.json +++ b/package.json @@ -60,7 +60,7 @@ "highlight.js": "^10.5.0", "jsrsasign": "^10.1.5", "katex": "^0.12.0", - "matrix-js-sdk": "11.2.0", + "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop", "matrix-react-sdk": "3.23.0", "matrix-widget-api": "^0.1.0-beta.14", "prop-types": "^15.7.2", diff --git a/yarn.lock b/yarn.lock index 7efae4a3f..a48cc30b1 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7667,6 +7667,20 @@ matrix-js-sdk@11.2.0: request "^2.88.2" unhomoglyph "^1.0.6" +"matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop": + version "11.2.0" + resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/35ecbed29d16982deff27a8c37b05167738225a2" + 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" + 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 2784bc79165657e402df6fe10fcd1d91a84b5e9c Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Mon, 7 Jun 2021 17:52:34 +0100 Subject: [PATCH 03/22] Reset matrix-react-sdk back to develop branch --- package.json | 2 +- yarn.lock | 22 +++------------------- 2 files changed, 4 insertions(+), 20 deletions(-) diff --git a/package.json b/package.json index a7f774a91..fb1108b6d 100644 --- a/package.json +++ b/package.json @@ -61,7 +61,7 @@ "jsrsasign": "^10.1.5", "katex": "^0.12.0", "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop", - "matrix-react-sdk": "3.23.0", + "matrix-react-sdk": "github:matrix-org/matrix-react-sdk#develop", "matrix-widget-api": "^0.1.0-beta.14", "prop-types": "^15.7.2", "react": "^16.14.0", diff --git a/yarn.lock b/yarn.lock index a48cc30b1..9148ae049 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7652,21 +7652,6 @@ 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@11.2.0: - version "11.2.0" - resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-11.2.0.tgz#b49f1ebbb671f5a8ec76eec3b21eeda97f10fb31" - integrity sha512-YsdAQNPsvoWL3fKI2fb6evO81UKfSt+hYDkBOIylzb3AA/RtUsjtSNXcT4f6BsQIVTh6xAhEjPVoMfKORchf1Q== - 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" - qs "^6.9.6" - request "^2.88.2" - unhomoglyph "^1.0.6" - "matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop": version "11.2.0" resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/35ecbed29d16982deff27a8c37b05167738225a2" @@ -7689,10 +7674,9 @@ matrix-mock-request@^1.2.3: bluebird "^3.5.0" expect "^1.20.2" -matrix-react-sdk@3.23.0: +"matrix-react-sdk@github:matrix-org/matrix-react-sdk#develop": version "3.23.0" - resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.23.0.tgz#7499c4a1b5334c65bf5b14085bcb7925115397e6" - integrity sha512-NLI7jEuhbE7bLD8QDHxvq3THBJDuj03vkI/NlOdjqenCKgd1ZpZMdPyoBJJ/8bBn+Ey3SGpPF8aeH9Uk7DLq/g== + resolved "https://codeload.github.com/matrix-org/matrix-react-sdk/tar.gz/8ccdf9a3e8a038def7c6be8e920839f26dae2f83" dependencies: "@babel/runtime" "^7.12.5" await-lock "^2.1.0" @@ -7720,7 +7704,7 @@ matrix-react-sdk@3.23.0: katex "^0.12.0" linkifyjs "^2.1.9" lodash "^4.17.20" - matrix-js-sdk "11.2.0" + matrix-js-sdk "github:matrix-org/matrix-js-sdk#develop" matrix-widget-api "^0.1.0-beta.14" minimist "^1.2.5" opus-recorder "^8.0.3" From 4b8a05a667caebe43bcb9fb758f915e7cb084003 Mon Sep 17 00:00:00 2001 From: Germain Souquet Date: Wed, 9 Jun 2021 11:40:36 +0100 Subject: [PATCH 04/22] Upgrade to React@17 --- package.json | 4 ++-- yarn.lock | 32 +++++++++++++++++++------------- 2 files changed, 21 insertions(+), 15 deletions(-) diff --git a/package.json b/package.json index 01cb66e95..5f9e6ced2 100644 --- a/package.json +++ b/package.json @@ -64,8 +64,8 @@ "matrix-react-sdk": "github:matrix-org/matrix-react-sdk#develop", "matrix-widget-api": "^0.1.0-beta.14", "prop-types": "^15.7.2", - "react": "^16.14.0", - "react-dom": "^16.14.0", + "react": "^17.0.2", + "react-dom": "^17.0.2", "sanitize-html": "^2.3.2", "ua-parser-js": "^0.7.24" }, diff --git a/yarn.lock b/yarn.lock index 9bfa793b2..bb8a881ab 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7715,9 +7715,9 @@ matrix-mock-request@^1.2.3: qrcode "^1.4.4" qs "^6.9.6" re-resizable "^6.9.0" - react "^16.14.0" + react "^17.0.2" react-beautiful-dnd "^4.0.1" - react-dom "^16.14.0" + react-dom "^17.0.2" react-focus-lock "^2.5.0" react-transition-group "^4.4.1" resize-observer-polyfill "^1.5.1" @@ -10115,15 +10115,14 @@ react-clientside-effect@^1.2.2: dependencies: "@babel/runtime" "^7.0.0" -react-dom@^16.14.0: - version "16.14.0" - resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.14.0.tgz#7ad838ec29a777fb3c75c3a190f661cf92ab8b89" - integrity sha512-1gCeQXDLoIqMgqD3IO2Ah9bnf0w9kzhwN5q4FGnHZ67hBm9yePzB5JJAIQCc8x3pFnNlwFq4RidZggNAAkzWWw== +react-dom@^17.0.2: + version "17.0.2" + resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-17.0.2.tgz#ecffb6845e3ad8dbfcdc498f0d0a939736502c23" + integrity sha512-s4h96KtLDUQlsENhMn1ar8t2bEa+q/YAtj8pPPdIjPDGBDIVNsrD9aXNWqspUe6AzKCIG0C1HZZLqLV7qpOBGA== dependencies: loose-envify "^1.1.0" object-assign "^4.1.1" - prop-types "^15.6.2" - scheduler "^0.19.1" + scheduler "^0.20.2" react-focus-lock@^2.5.0: version "2.5.0" @@ -10184,14 +10183,13 @@ react-transition-group@^4.4.1: loose-envify "^1.4.0" prop-types "^15.6.2" -react@^16.14.0: - version "16.14.0" - resolved "https://registry.yarnpkg.com/react/-/react-16.14.0.tgz#94d776ddd0aaa37da3eda8fc5b6b18a4c9a3114d" - integrity sha512-0X2CImDkJGApiAlcf0ODKIneSwBPhqJawOa5wCtKbu7ZECrmS26NvtSILynQ66cgkT/RJ4LidJOc3bUESwmU8g== +react@^17.0.2: + version "17.0.2" + resolved "https://registry.yarnpkg.com/react/-/react-17.0.2.tgz#d0b5cc516d29eb3eee383f75b62864cfb6800037" + integrity sha512-gnhPt75i/dq/z3/6q/0asP78D0u592D5L1pd7M8P+dck6Fu/jJeL6iVVK23fptSUZj8Vjf++7wXA8UNclGQcbA== dependencies: loose-envify "^1.1.0" object-assign "^4.1.1" - prop-types "^15.6.2" read-cache@^1.0.0: version "1.0.0" @@ -10749,6 +10747,14 @@ scheduler@^0.19.1: loose-envify "^1.1.0" object-assign "^4.1.1" +scheduler@^0.20.2: + version "0.20.2" + resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.20.2.tgz#4baee39436e34aa93b4874bddcbf0fe8b8b50e91" + integrity sha512-2eWfGgAqqWFGqtdMmcL5zCMK1U8KlXv8SQFGglL3CEtd0aDVDWgeF/YoCmvln55m5zSk3J/20hTaSBeSObsQDQ== + dependencies: + loose-envify "^1.1.0" + object-assign "^4.1.1" + schema-utils@^0.4.5: version "0.4.7" resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-0.4.7.tgz#ba74f597d2be2ea880131746ee17d0a093c68187" From 0667c69688f3233b3779c1e3b389052ab68bd4e1 Mon Sep 17 00:00:00 2001 From: Ihor Hordiichuk Date: Wed, 9 Jun 2021 09:05:08 +0000 Subject: [PATCH 05/22] 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/ --- src/i18n/strings/uk.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/i18n/strings/uk.json b/src/i18n/strings/uk.json index 1a77e28d4..a1456a6b0 100644 --- a/src/i18n/strings/uk.json +++ b/src/i18n/strings/uk.json @@ -21,7 +21,7 @@ "Failed to start": "Запуск не вдався", "Download Completed": "Завантаження завершено", "Missing indexeddb worker script!": "Відсутній робочий сценарій IndexedDB!", - "Your Element is misconfigured": "Ваш Element налаштовано невірно", + "Your Element is misconfigured": "Ваш Element налаштовано неправильно", "Your Element configuration contains invalid JSON. Please correct the problem and reload the page.": "Ваша конфігурація Element містить хибний JSON. Виправте проблему та оновіть сторінку.", "Unable to load config file: please refresh the page to try again.": "Неможливо завантажити файл конфігурації. Оновіть, будь ласка, сторінку, щоб спробувати знову.", "Open": "Відкрити", From 8d05d8481a86d1d0432a5cf8a555be53dc0dfe5d Mon Sep 17 00:00:00 2001 From: "J. Ryan Stinnett" Date: Thu, 10 Jun 2021 13:02:21 +0100 Subject: [PATCH 06/22] Preload only `woff2` fonts All of our supported browsers understand `woff2`, so there's no need to make everyone preload the older `woff` as well. --- webpack.config.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webpack.config.js b/webpack.config.js index 07fcb4f67..64972ed4f 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -431,7 +431,7 @@ module.exports = (env, argv) => { }), new HtmlWebpackInjectPreload({ - files: [{ match: /.*Inter.*\.woff2?$/ }], + files: [{ match: /.*Inter.*\.woff2$/ }], }), ...additionalPlugins, From a1c53e59fbf9d0691278d507dd78a8108480c726 Mon Sep 17 00:00:00 2001 From: "J. Ryan Stinnett" Date: Thu, 10 Jun 2021 15:19:38 +0100 Subject: [PATCH 07/22] Fix lint errors in Webpack config --- webpack.config.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/webpack.config.js b/webpack.config.js index 64972ed4f..e394f8f0a 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -1,9 +1,10 @@ +/* eslint-disable quote-props */ + const path = require('path'); const HtmlWebpackPlugin = require('html-webpack-plugin'); const MiniCssExtractPlugin = require('mini-css-extract-plugin'); const TerserPlugin = require('terser-webpack-plugin'); const OptimizeCSSAssetsPlugin = require('optimize-css-assets-webpack-plugin'); -const webpack = require("webpack"); const HtmlWebpackInjectPreload = require('@principalstudio/html-webpack-inject-preload'); let ogImageUrl = process.env.RIOT_OG_IMAGE_URL; @@ -143,11 +144,11 @@ module.exports = (env, argv) => { // overflows (https://github.com/webpack/webpack/issues/1721), and // there is no need for webpack to parse them - they can just be // included as-is. - /highlight\.js[\\\/]lib[\\\/]languages/, + /highlight\.js[\\/]lib[\\/]languages/, // olm takes ages for webpack to process, and it's already heavily // optimised, so there is little to gain by us uglifying it. - /olm[\\\/](javascript[\\\/])?olm\.js$/, + /olm[\\/](javascript[\\/])?olm\.js$/, ], rules: [ { From b96a1551e19ff46ed637ebf1bf08710186fd5c9e Mon Sep 17 00:00:00 2001 From: "J. Ryan Stinnett" Date: Fri, 11 Jun 2021 16:35:08 +0100 Subject: [PATCH 08/22] Shake yarn.lock --- yarn.lock | 23 +---------------------- 1 file changed, 1 insertion(+), 22 deletions(-) diff --git a/yarn.lock b/yarn.lock index 929f20be1..bbe50a22a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2438,11 +2438,6 @@ bluebird@^3.5.0, bluebird@^3.5.5: resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz#9f229c15be272454ffa973ace0dbee79a1b0c36f" integrity sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg== -blueimp-canvas-to-blob@^3.28.0: - version "3.28.0" - resolved "https://registry.yarnpkg.com/blueimp-canvas-to-blob/-/blueimp-canvas-to-blob-3.28.0.tgz#c8ab4dc6bb08774a7f273798cdf94b0776adf6c8" - integrity sha512-5q+YHzgGsuHQ01iouGgJaPJXod2AzTxJXmVv90PpGrRxU7G7IqgPqWXz+PBmt3520jKKi6irWbNV87DicEa7wg== - bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.11.9: version "4.12.0" resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.12.0.tgz#775b3f278efbb9718eec7361f483fb36fbbfea88" @@ -7676,11 +7671,10 @@ matrix-mock-request@^1.2.3: "matrix-react-sdk@github:matrix-org/matrix-react-sdk#develop": version "3.23.0" - resolved "https://codeload.github.com/matrix-org/matrix-react-sdk/tar.gz/8ccdf9a3e8a038def7c6be8e920839f26dae2f83" + resolved "https://codeload.github.com/matrix-org/matrix-react-sdk/tar.gz/015890477d86e71955065e879e5a8960c6e26b9b" dependencies: "@babel/runtime" "^7.12.5" await-lock "^2.1.0" - blueimp-canvas-to-blob "^3.28.0" browser-encrypt-attachment "^0.3.0" browser-request "^0.3.3" cheerio "^1.0.0-rc.9" @@ -7713,7 +7707,6 @@ matrix-mock-request@^1.2.3: png-chunks-extract "^1.0.0" prop-types "^15.7.2" qrcode "^1.4.4" - qs "^6.9.6" re-resizable "^6.9.0" react "^17.0.2" react-beautiful-dnd "^4.0.1" @@ -7724,7 +7717,6 @@ matrix-mock-request@^1.2.3: rfc4648 "^1.4.0" sanitize-html "^2.3.2" tar-js "^0.3.0" - text-encoding-utf-8 "^1.0.2" url "^0.11.0" what-input "^5.2.10" zxcvbn "^4.4.2" @@ -10739,14 +10731,6 @@ saxes@^5.0.0: dependencies: xmlchars "^2.2.0" -scheduler@^0.19.1: - version "0.19.1" - resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.19.1.tgz#4f3e2ed2c1a7d65681f4c854fa8c5a1ccb40f196" - integrity sha512-n/zwRWRYSUj0/3g/otKDRPMh6qv2SYMWNq85IEa8iZyAv8od9zDYpGSnpBEjNgcMNq6Scbu5KfIPxNF72R/2EA== - dependencies: - loose-envify "^1.1.0" - object-assign "^4.1.1" - scheduler@^0.20.2: version "0.20.2" resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.20.2.tgz#4baee39436e34aa93b4874bddcbf0fe8b8b50e91" @@ -11728,11 +11712,6 @@ test-exclude@^6.0.0: glob "^7.1.4" minimatch "^3.0.4" -text-encoding-utf-8@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/text-encoding-utf-8/-/text-encoding-utf-8-1.0.2.tgz#585b62197b0ae437e3c7b5d0af27ac1021e10d13" - integrity sha512-8bw4MY9WjdsD2aMtO0OzOCY3pXGYNx2d2FfHRVUKkiCPDWjKuOlhLVASS+pD7VkLTVjW268LYJHwsnPFlBpbAg== - text-table@^0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4" From 46f8000b3d6eb93cd0d4c82fdcf495cfb764aad8 Mon Sep 17 00:00:00 2001 From: lvre <7uu3qrbvm@relay.firefox.com> Date: Sat, 12 Jun 2021 21:59:24 +0000 Subject: [PATCH 09/22] Translated using Weblate (Portuguese (Brazil)) 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/pt_BR/ --- src/i18n/strings/pt_BR.json | 56 ++++++++++++++++++------------------- 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/src/i18n/strings/pt_BR.json b/src/i18n/strings/pt_BR.json index 46b5021e0..5d1be19fb 100644 --- a/src/i18n/strings/pt_BR.json +++ b/src/i18n/strings/pt_BR.json @@ -1,37 +1,37 @@ { - "Dismiss": "Descartar", + "Dismiss": "Dispensar", "powered by Matrix": "oferecido por Matrix", - "Unknown device": "Aparelho desconhecido", - "You need to be using HTTPS to place a screen-sharing call.": "Você precisa usar HTTPS para compartilhar a tela durante uma chamada.", - "Welcome to Element": "Boas-vindas ao Element", - "Decentralised, encrypted chat & collaboration powered by [matrix]": "Chat descentralizado, criptografado e colaborativo construído com [matrix]", - "Sign In": "Entrar", + "Unknown device": "Dispositivo desconhecido", + "You need to be using HTTPS to place a screen-sharing call.": "Você precisa estar usando HTTPS para começar uma chamada de compartilhamento de tela.", + "Welcome to Element": "Boas-vindas a Element", + "Decentralised, encrypted chat & collaboration powered by [matrix]": "Chat e colaboração descentralizados e encriptados poderados por [matrix]", + "Sign In": "Fazer signin", "Create Account": "Criar Conta", "Explore rooms": "Explorar salas", "The message from the parser is: %(message)s": "A mensagem do parser é: %(message)s", "Invalid JSON": "JSON inválido", - "Unexpected error preparing the app. See console for details.": "Erro inesperado preparando o aplicativo. Veja o console para mais detalhes.", - "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Configuração inválida: você só pode especificar um valor dentre default_server_config, default_server_name, ou default_hs_url.", - "Invalid configuration: no default server specified.": "Configuração inválida: servidor padrão não especificado.", - "Unable to load config file: please refresh the page to try again.": "Não foi possível carregar o arquivo de configuração: por favor, atualize a página para tentar novamente.", - "Download Completed": "Download concluído", - "Open user settings": "Abrir configurações do usuário", + "Unexpected error preparing the app. See console for details.": "Erro inesperado preparando o app. Veja console para detalhes.", + "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Configuração inválida: só pode especificar um de default_server_config, default_server_name, ou default_hs_url.", + "Invalid configuration: no default server specified.": "Configuração inválida: nenhum servidor default especificado.", + "Unable to load config file: please refresh the page to try again.": "Incapaz de carregar arquivo de config: por favor atualize a página para tentar de novo.", + "Download Completed": "Download Completado", + "Open user settings": "Abrir configurações de usuária(o)", "%(appName)s (%(browserName)s, %(osName)s)": "%(appName)s (%(browserName)s, %(osName)s)", - "Unsupported browser": "Navegador não suportado", - "Please install Chrome, Firefox, or Safari for the best experience.": "Por favor, instale o Chrome, o Firefox ou o Safari para obter a melhor experiência de uso.", - "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.": "Você pode continuar usando o navegador atual, mas alguns dos recursos podem não funcionar e a aparência do aplicativo pode estar incorreta.", - "I understand the risks and wish to continue": "Entendo os riscos e desejo continuar", - "Go to element.io": "Vá para element.io", - "Failed to start": "Falha ao iniciar", - "Missing indexeddb worker script!": "O script indexeddb não foi encontrado!", + "Unsupported browser": "Browser insuportado", + "Please install Chrome, Firefox, or Safari for the best experience.": "Por favor instale Chrome, Firefox, ou Safari para a melhor experiência.", + "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.": "Você pode continuar usando seu browser atual, mas alguma ou toda funcionalidade pode não funcionar e a aparência e sensação do aplicativo pode estar incorretas.", + "I understand the risks and wish to continue": "Eu entendo os riscos e desejo continuar", + "Go to element.io": "Ir para element.io", + "Failed to start": "Falha para iniciar", + "Missing indexeddb worker script!": "Worker script indexeddb faltando!", "Open": "Abrir", - "Previous/next recently visited room or community": "Anterior/Próxima sala ou comunidade visitada recentemente", - "%(brand)s Desktop (%(platformName)s)": "%(brand)s para Computador (%(platformName)s)", - "Go to your browser to complete Sign In": "Vá para o seu navegador para concluir o login", - "Your Element is misconfigured": "Seu Element está desconfigurado", - "Your Element configuration contains invalid JSON. Please correct the problem and reload the page.": "Sua configuração do Element contém JSON inválido. Por favor, corrija o problema e recarregue a página.", - "Your browser can't run %(brand)s": "Seu navegador não consegue rodar o %(brand)s", - "%(brand)s uses advanced browser features which aren't supported by your current browser.": "%(brand)s usa recursos avançados que não são suportados pelo seu navegador de internet atual.", - "Powered by Matrix": "Construído com tecnologia Matrix", - "Use %(brand)s on mobile": "Usar %(brand)s no celular" + "Previous/next recently visited room or community": "Anterior/próxima sala ou comunidade visitada recentemente", + "%(brand)s Desktop (%(platformName)s)": "%(brand)s Desktop (%(platformName)s)", + "Go to your browser to complete Sign In": "Vá para seu browser para completar Sign In", + "Your Element is misconfigured": "Seu Element está malconfigurado", + "Your Element configuration contains invalid JSON. Please correct the problem and reload the page.": "Sua configuração de Element contém JSON inválido. Por favor corrija o problema e recarregue a página.", + "Your browser can't run %(brand)s": "Seu browser não consegue rodar %(brand)s", + "%(brand)s uses advanced browser features which aren't supported by your current browser.": "%(brand)s usa funcionalidade de browser avançada que não é suportada por seu browser atual.", + "Powered by Matrix": "Poderado por Matrix", + "Use %(brand)s on mobile": "Usar %(brand)s em celular" } From 6c642b5f00f4565db0e28b6d6381fbe199e7f4a5 Mon Sep 17 00:00:00 2001 From: lvre <7uu3qrbvm@relay.firefox.com> Date: Sun, 13 Jun 2021 00:53:49 +0000 Subject: [PATCH 10/22] Translated using Weblate (Portuguese (Brazil)) 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/pt_BR/ --- src/i18n/strings/pt_BR.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/i18n/strings/pt_BR.json b/src/i18n/strings/pt_BR.json index 5d1be19fb..0892b7bf3 100644 --- a/src/i18n/strings/pt_BR.json +++ b/src/i18n/strings/pt_BR.json @@ -4,7 +4,7 @@ "Unknown device": "Dispositivo desconhecido", "You need to be using HTTPS to place a screen-sharing call.": "Você precisa estar usando HTTPS para começar uma chamada de compartilhamento de tela.", "Welcome to Element": "Boas-vindas a Element", - "Decentralised, encrypted chat & collaboration powered by [matrix]": "Chat e colaboração descentralizados e encriptados poderados por [matrix]", + "Decentralised, encrypted chat & collaboration powered by [matrix]": "Chat & colaboração descentralizados e encriptados powered by [matrix]", "Sign In": "Fazer signin", "Create Account": "Criar Conta", "Explore rooms": "Explorar salas", @@ -32,6 +32,6 @@ "Your Element configuration contains invalid JSON. Please correct the problem and reload the page.": "Sua configuração de Element contém JSON inválido. Por favor corrija o problema e recarregue a página.", "Your browser can't run %(brand)s": "Seu browser não consegue rodar %(brand)s", "%(brand)s uses advanced browser features which aren't supported by your current browser.": "%(brand)s usa funcionalidade de browser avançada que não é suportada por seu browser atual.", - "Powered by Matrix": "Poderado por Matrix", + "Powered by Matrix": "Powered by Matrix", "Use %(brand)s on mobile": "Usar %(brand)s em celular" } From 1eea16ecdf32921af9c59cad08ea6e4cb0dea2c5 Mon Sep 17 00:00:00 2001 From: Sanqui Date: Tue, 15 Jun 2021 05:53:24 +0000 Subject: [PATCH 11/22] Translated using Weblate (Czech) 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/cs/ --- src/i18n/strings/cs.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/i18n/strings/cs.json b/src/i18n/strings/cs.json index 7bff98988..15835675d 100644 --- a/src/i18n/strings/cs.json +++ b/src/i18n/strings/cs.json @@ -32,5 +32,6 @@ "Failed to start": "Nepovedlo se nastartovat", "Powered by Matrix": "Běží na Matrixu", "%(brand)s Desktop (%(platformName)s)": "%(brand)s pro desktopový počítač (%(platformName)s)", - "Missing indexeddb worker script!": "Nenačetl se skript spravující indexdb!" + "Missing indexeddb worker script!": "Nenačetl se skript spravující indexdb!", + "Use %(brand)s on mobile": "Použít %(brand)s na mobilu" } From 2ffb1a6015829ab4663de8c4c1202fad8e808b0c Mon Sep 17 00:00:00 2001 From: Germain Souquet Date: Tue, 15 Jun 2021 11:59:33 +0100 Subject: [PATCH 12/22] upgrade matrix-react-test-utils for react 17 peer deps --- package.json | 2 +- yarn.lock | 15 +++++++++------ 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/package.json b/package.json index 7f5f1a9ce..bb8941b77 100644 --- a/package.json +++ b/package.json @@ -119,7 +119,7 @@ "json-loader": "^0.5.7", "loader-utils": "^1.4.0", "matrix-mock-request": "^1.2.3", - "matrix-react-test-utils": "^0.2.2", + "matrix-react-test-utils": "^0.2.3", "matrix-web-i18n": "github:matrix-org/matrix-web-i18n", "mini-css-extract-plugin": "^0.12.0", "minimist": "^1.2.5", diff --git a/yarn.lock b/yarn.lock index bbe50a22a..26e185e4f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7675,6 +7675,7 @@ matrix-mock-request@^1.2.3: dependencies: "@babel/runtime" "^7.12.5" await-lock "^2.1.0" + blueimp-canvas-to-blob "^3.28.0" browser-encrypt-attachment "^0.3.0" browser-request "^0.3.3" cheerio "^1.0.0-rc.9" @@ -7707,24 +7708,26 @@ matrix-mock-request@^1.2.3: png-chunks-extract "^1.0.0" prop-types "^15.7.2" qrcode "^1.4.4" + qs "^6.9.6" re-resizable "^6.9.0" - react "^17.0.2" + react "^16.14.0" react-beautiful-dnd "^4.0.1" - react-dom "^17.0.2" + react-dom "^16.14.0" react-focus-lock "^2.5.0" react-transition-group "^4.4.1" resize-observer-polyfill "^1.5.1" rfc4648 "^1.4.0" sanitize-html "^2.3.2" tar-js "^0.3.0" + text-encoding-utf-8 "^1.0.2" url "^0.11.0" what-input "^5.2.10" zxcvbn "^4.4.2" -matrix-react-test-utils@^0.2.2: - version "0.2.2" - resolved "https://registry.yarnpkg.com/matrix-react-test-utils/-/matrix-react-test-utils-0.2.2.tgz#c87144d3b910c7edc544a6699d13c7c2bf02f853" - integrity sha512-49+7gfV6smvBIVbeloql+37IeWMTD+fiywalwCqk8Dnz53zAFjKSltB3rmWHso1uecLtQEcPtCijfhzcLXAxTQ== +matrix-react-test-utils@^0.2.3: + version "0.2.3" + resolved "https://registry.yarnpkg.com/matrix-react-test-utils/-/matrix-react-test-utils-0.2.3.tgz#27653f9d6bbfddd1856e51860fad1503b039d617" + integrity sha512-NKZDlMEQzDZDQhBYyKBUtqidRvpkww3n9/GmGICkxtU2D6NetyBIfvm1Lf9o7167KSkPHJUVvDS9dzaS55jUnA== "matrix-web-i18n@github:matrix-org/matrix-web-i18n": version "1.1.2" From 4dcfd7c0dd5e1c8bad297395f92b104c0ea652cf Mon Sep 17 00:00:00 2001 From: Germain Souquet Date: Tue, 15 Jun 2021 12:51:10 +0100 Subject: [PATCH 13/22] fix lockfile dependencies for matrix-react-sdk --- yarn.lock | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/yarn.lock b/yarn.lock index 26e185e4f..433d599ee 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7671,11 +7671,10 @@ matrix-mock-request@^1.2.3: "matrix-react-sdk@github:matrix-org/matrix-react-sdk#develop": version "3.23.0" - resolved "https://codeload.github.com/matrix-org/matrix-react-sdk/tar.gz/015890477d86e71955065e879e5a8960c6e26b9b" + resolved "https://codeload.github.com/matrix-org/matrix-react-sdk/tar.gz/3eca1cbec32c134869069def28fb0d85566607e7" dependencies: "@babel/runtime" "^7.12.5" await-lock "^2.1.0" - blueimp-canvas-to-blob "^3.28.0" browser-encrypt-attachment "^0.3.0" browser-request "^0.3.3" cheerio "^1.0.0-rc.9" @@ -7708,18 +7707,16 @@ matrix-mock-request@^1.2.3: png-chunks-extract "^1.0.0" prop-types "^15.7.2" qrcode "^1.4.4" - qs "^6.9.6" re-resizable "^6.9.0" - react "^16.14.0" + react "^17.0.2" react-beautiful-dnd "^4.0.1" - react-dom "^16.14.0" + react-dom "^17.0.2" react-focus-lock "^2.5.0" react-transition-group "^4.4.1" resize-observer-polyfill "^1.5.1" rfc4648 "^1.4.0" sanitize-html "^2.3.2" tar-js "^0.3.0" - text-encoding-utf-8 "^1.0.2" url "^0.11.0" what-input "^5.2.10" zxcvbn "^4.4.2" From 9183cfdb0137c9c93f964ad50d7387678b40e0e3 Mon Sep 17 00:00:00 2001 From: waclaw66 Date: Tue, 15 Jun 2021 05:54:16 +0000 Subject: [PATCH 14/22] Translated using Weblate (Czech) 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/cs/ --- src/i18n/strings/cs.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/i18n/strings/cs.json b/src/i18n/strings/cs.json index 15835675d..e81c99012 100644 --- a/src/i18n/strings/cs.json +++ b/src/i18n/strings/cs.json @@ -33,5 +33,5 @@ "Powered by Matrix": "Běží na Matrixu", "%(brand)s Desktop (%(platformName)s)": "%(brand)s pro desktopový počítač (%(platformName)s)", "Missing indexeddb worker script!": "Nenačetl se skript spravující indexdb!", - "Use %(brand)s on mobile": "Použít %(brand)s na mobilu" + "Use %(brand)s on mobile": "Používání %(brand)s v mobilních zařízeních" } From d23b30023aa3c178748877aa64e5b8cad49b83fc Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Tue, 15 Jun 2021 16:24:37 +0100 Subject: [PATCH 15/22] Upgrade matrix-js-sdk to 12.0.0-rc.1 --- package.json | 2 +- yarn.lock | 15 +++++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index bb8941b77..4e5ad7bf4 100644 --- a/package.json +++ b/package.json @@ -60,7 +60,7 @@ "highlight.js": "^10.5.0", "jsrsasign": "^10.1.5", "katex": "^0.12.0", - "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop", + "matrix-js-sdk": "12.0.0-rc.1", "matrix-react-sdk": "github:matrix-org/matrix-react-sdk#develop", "matrix-widget-api": "^0.1.0-beta.14", "prop-types": "^15.7.2", diff --git a/yarn.lock b/yarn.lock index 433d599ee..c4f15223d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7647,6 +7647,21 @@ 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@12.0.0-rc.1: + version "12.0.0-rc.1" + resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-12.0.0-rc.1.tgz#b94a72f0549f3000763efb8c7b6fa1f8808e56f6" + integrity sha512-bzozc4w9dF6Dl8xXXLXMpe3FqL/ncczKdB9Y8dL1mPaujVrmLWAai+BYmC9/c4SIw+1zUap9P5W16ej3z7prig== + 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" + qs "^6.9.6" + request "^2.88.2" + unhomoglyph "^1.0.6" + "matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop": version "11.2.0" resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/35ecbed29d16982deff27a8c37b05167738225a2" From e98a1839789f3bfa81240cc31acfa6cb3d3307be Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Tue, 15 Jun 2021 17:26:25 +0100 Subject: [PATCH 16/22] Upgrade matrix-react-sdk to 3.24.0-rc.1 --- package.json | 2 +- yarn.lock | 23 +++++------------------ 2 files changed, 6 insertions(+), 19 deletions(-) diff --git a/package.json b/package.json index 4e5ad7bf4..9cd5b7ea2 100644 --- a/package.json +++ b/package.json @@ -61,7 +61,7 @@ "jsrsasign": "^10.1.5", "katex": "^0.12.0", "matrix-js-sdk": "12.0.0-rc.1", - "matrix-react-sdk": "github:matrix-org/matrix-react-sdk#develop", + "matrix-react-sdk": "3.24.0-rc.1", "matrix-widget-api": "^0.1.0-beta.14", "prop-types": "^15.7.2", "react": "^17.0.2", diff --git a/yarn.lock b/yarn.lock index c4f15223d..ffe8fa48b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7662,20 +7662,6 @@ matrix-js-sdk@12.0.0-rc.1: request "^2.88.2" unhomoglyph "^1.0.6" -"matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop": - version "11.2.0" - resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/35ecbed29d16982deff27a8c37b05167738225a2" - 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" - 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" @@ -7684,9 +7670,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.23.0" - resolved "https://codeload.github.com/matrix-org/matrix-react-sdk/tar.gz/3eca1cbec32c134869069def28fb0d85566607e7" +matrix-react-sdk@3.24.0-rc.1: + version "3.24.0-rc.1" + resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.24.0-rc.1.tgz#8711f3ebff35f9fb45c04215306cd56ccf5ffaf0" + integrity sha512-9flNCgR3qZgy1kd3x9k0n9+iz2ug9AK7omsBF3drJF8/F9b0lcgAz+ktvYynWeq/kf05tvi593KDegI7j4Bynw== dependencies: "@babel/runtime" "^7.12.5" await-lock "^2.1.0" @@ -7713,7 +7700,7 @@ matrix-mock-request@^1.2.3: katex "^0.12.0" linkifyjs "^2.1.9" lodash "^4.17.20" - matrix-js-sdk "github:matrix-org/matrix-js-sdk#develop" + matrix-js-sdk "12.0.0-rc.1" matrix-widget-api "^0.1.0-beta.14" minimist "^1.2.5" opus-recorder "^8.0.3" From 446833d931ec076737123ff20d844d2df0d473b0 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Tue, 15 Jun 2021 17:29:00 +0100 Subject: [PATCH 17/22] Prepare changelog for v1.7.31-rc.1 --- CHANGELOG.md | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7719bc65d..d82a64854 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,19 @@ +Changes in [1.7.31-rc.1](https://github.com/vector-im/element-web/releases/tag/v1.7.31-rc.1) (2021-06-15) +========================================================================================================= +[Full Changelog](https://github.com/vector-im/element-web/compare/v1.7.30...v1.7.31-rc.1) + + * Upgrade to React SDK 3.24.0-rc.1 and JS SDK 12.0.0-rc.1 + * Translations update from Weblate + [\#17655](https://github.com/vector-im/element-web/pull/17655) + * Upgrade matrix-react-test-utils for React 17 peer deps + [\#17653](https://github.com/vector-im/element-web/pull/17653) + * Fix lint errors in Webpack config + [\#17626](https://github.com/vector-im/element-web/pull/17626) + * Preload only `woff2` fonts + [\#17614](https://github.com/vector-im/element-web/pull/17614) + * ⚛️ Upgrade to React@17 + [\#17601](https://github.com/vector-im/element-web/pull/17601) + Changes in [1.7.30](https://github.com/vector-im/element-web/releases/tag/v1.7.30) (2021-06-07) =============================================================================================== [Full Changelog](https://github.com/vector-im/element-web/compare/v1.7.30-rc.1...v1.7.30) From 673a5ccc9e8982c7ec38dab5b94ff26fcbe0026a Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Tue, 15 Jun 2021 17:29:00 +0100 Subject: [PATCH 18/22] v1.7.31-rc.1 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 9cd5b7ea2..2ea67a86d 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "element-web", - "version": "1.7.30", + "version": "1.7.31-rc.1", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "repository": { From 57090243e141221e3012fc55404706141eae2928 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Mon, 21 Jun 2021 16:57:52 +0100 Subject: [PATCH 19/22] Upgrade matrix-js-sdk to 12.0.0 --- package.json | 2 +- yarn.lock | 15 +++++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index 2ea67a86d..f3c578a2a 100644 --- a/package.json +++ b/package.json @@ -60,7 +60,7 @@ "highlight.js": "^10.5.0", "jsrsasign": "^10.1.5", "katex": "^0.12.0", - "matrix-js-sdk": "12.0.0-rc.1", + "matrix-js-sdk": "12.0.0", "matrix-react-sdk": "3.24.0-rc.1", "matrix-widget-api": "^0.1.0-beta.14", "prop-types": "^15.7.2", diff --git a/yarn.lock b/yarn.lock index ffe8fa48b..0350660cd 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7647,6 +7647,21 @@ 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@12.0.0: + version "12.0.0" + resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-12.0.0.tgz#8ee7cc37661476341d0c792a1a12bc78b19f9fdd" + integrity sha512-DHeq87Sx9Dv37FYyvZkmA1VYsQUNaVgc3QzMUkFwoHt1T4EZzgyYpdsp3uYruJzUW0ACvVJcwFdrU4e1VS97dQ== + 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" + qs "^6.9.6" + request "^2.88.2" + unhomoglyph "^1.0.6" + matrix-js-sdk@12.0.0-rc.1: version "12.0.0-rc.1" resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-12.0.0-rc.1.tgz#b94a72f0549f3000763efb8c7b6fa1f8808e56f6" From 1b48f4857aafab46b7e2819cee61444b54c1eff0 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Mon, 21 Jun 2021 16:58:14 +0100 Subject: [PATCH 20/22] Upgrade matrix-react-sdk to 3.24.0 --- package.json | 2 +- yarn.lock | 25 +++++-------------------- 2 files changed, 6 insertions(+), 21 deletions(-) diff --git a/package.json b/package.json index f3c578a2a..b978a4391 100644 --- a/package.json +++ b/package.json @@ -61,7 +61,7 @@ "jsrsasign": "^10.1.5", "katex": "^0.12.0", "matrix-js-sdk": "12.0.0", - "matrix-react-sdk": "3.24.0-rc.1", + "matrix-react-sdk": "3.24.0", "matrix-widget-api": "^0.1.0-beta.14", "prop-types": "^15.7.2", "react": "^17.0.2", diff --git a/yarn.lock b/yarn.lock index 0350660cd..6396ba990 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7662,21 +7662,6 @@ matrix-js-sdk@12.0.0: request "^2.88.2" unhomoglyph "^1.0.6" -matrix-js-sdk@12.0.0-rc.1: - version "12.0.0-rc.1" - resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-12.0.0-rc.1.tgz#b94a72f0549f3000763efb8c7b6fa1f8808e56f6" - integrity sha512-bzozc4w9dF6Dl8xXXLXMpe3FqL/ncczKdB9Y8dL1mPaujVrmLWAai+BYmC9/c4SIw+1zUap9P5W16ej3z7prig== - 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" - 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" @@ -7685,10 +7670,10 @@ matrix-mock-request@^1.2.3: bluebird "^3.5.0" expect "^1.20.2" -matrix-react-sdk@3.24.0-rc.1: - version "3.24.0-rc.1" - resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.24.0-rc.1.tgz#8711f3ebff35f9fb45c04215306cd56ccf5ffaf0" - integrity sha512-9flNCgR3qZgy1kd3x9k0n9+iz2ug9AK7omsBF3drJF8/F9b0lcgAz+ktvYynWeq/kf05tvi593KDegI7j4Bynw== +matrix-react-sdk@3.24.0: + version "3.24.0" + resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.24.0.tgz#da312338d790c7d4d8166ac2d5df983bda2e5445" + integrity sha512-I53P7ArdqfSLFrXB2jpb5ne8lvmw9uVYWhhvFaWgHIE1fuiTowx0SZaAl5bDH1XddHIbLwL+y8BsX95Yo5F7zQ== dependencies: "@babel/runtime" "^7.12.5" await-lock "^2.1.0" @@ -7715,7 +7700,7 @@ matrix-react-sdk@3.24.0-rc.1: katex "^0.12.0" linkifyjs "^2.1.9" lodash "^4.17.20" - matrix-js-sdk "12.0.0-rc.1" + matrix-js-sdk "12.0.0" matrix-widget-api "^0.1.0-beta.14" minimist "^1.2.5" opus-recorder "^8.0.3" From 01c84212f9aa9933a4fad56f31fd7e87a9958c0c Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Mon, 21 Jun 2021 17:00:59 +0100 Subject: [PATCH 21/22] Prepare changelog for v1.7.31 --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index d82a64854..c15c742f9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +Changes in [1.7.31](https://github.com/vector-im/element-web/releases/tag/v1.7.31) (2021-06-21) +=============================================================================================== +[Full Changelog](https://github.com/vector-im/element-web/compare/v1.7.31-rc.1...v1.7.31) + + * Upgrade to React SDK 3.24.0 and JS SDK 12.0.0 + Changes in [1.7.31-rc.1](https://github.com/vector-im/element-web/releases/tag/v1.7.31-rc.1) (2021-06-15) ========================================================================================================= [Full Changelog](https://github.com/vector-im/element-web/compare/v1.7.30...v1.7.31-rc.1) From e02d17a6cc162709971c1e2194c6cc73429145de Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Mon, 21 Jun 2021 17:01:00 +0100 Subject: [PATCH 22/22] v1.7.31 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index b978a4391..2ac5ea1db 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "element-web", - "version": "1.7.31-rc.1", + "version": "1.7.31", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "repository": {