From 5393f875ce79f6d8c7f31368aca4f3587dafefd9 Mon Sep 17 00:00:00 2001 From: Robin Townsend Date: Wed, 22 Jul 2020 15:28:59 +0000 Subject: [PATCH 01/25] Make Lojban translation available Signed-off-by: Robin Townsend --- scripts/copy-res.js | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/copy-res.js b/scripts/copy-res.js index 6153bb9b..71eb6b75 100755 --- a/scripts/copy-res.js +++ b/scripts/copy-res.js @@ -30,6 +30,7 @@ const INCLUDE_LANGS = [ {'value': 'is', 'label': 'íslenska'}, {'value': 'it', 'label': 'Italiano'}, {'value': 'ja', 'label': '日本語'}, + {'value': 'jbo', 'label': 'banjubu\'o'}, {'value': 'ko', 'label': '한국어'}, {'value': 'lt', 'label': 'Lietuvių'}, {'value': 'lv', 'label': 'Latviešu'}, -- 2.30.2 From b799a6eb84c56d3b1fd7dcacf9556edb58e247ec Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Mon, 27 Jul 2020 21:39:01 +0100 Subject: [PATCH 02/25] 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 27a298ca..637c3b3e 100644 --- a/package.json +++ b/package.json @@ -59,7 +59,7 @@ "browser-request": "^0.3.3", "gfm.css": "^1.1.2", "highlight.js": "^9.13.1", - "matrix-js-sdk": "8.0.0", + "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop", "matrix-react-sdk": "3.0.0", "olm": "https://packages.matrix.org/npm/olm/olm-3.1.4.tgz", "prop-types": "^15.7.2", diff --git a/yarn.lock b/yarn.lock index 2b238cde..ddebd67e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7362,6 +7362,20 @@ matrix-js-sdk@8.0.0: request "^2.88.0" unhomoglyph "^1.0.2" +"matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop": + version "8.0.0" + resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/c669382e12c8cd1d7d538421dfad4f50812af44d" + dependencies: + "@babel/runtime" "^7.8.3" + another-json "^0.2.0" + browser-request "^0.3.3" + bs58 "^4.0.1" + content-type "^1.0.2" + loglevel "^1.6.4" + qs "^6.5.2" + request "^2.88.0" + unhomoglyph "^1.0.2" + 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" -- 2.30.2 From f4e6828949e366d5eff20746f6532789667c4e50 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Mon, 27 Jul 2020 21:39:12 +0100 Subject: [PATCH 03/25] 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 637c3b3e..bcc09d65 100644 --- a/package.json +++ b/package.json @@ -60,7 +60,7 @@ "gfm.css": "^1.1.2", "highlight.js": "^9.13.1", "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop", - "matrix-react-sdk": "3.0.0", + "matrix-react-sdk": "github:matrix-org/matrix-react-sdk#develop", "olm": "https://packages.matrix.org/npm/olm/olm-3.1.4.tgz", "prop-types": "^15.7.2", "react": "^16.9.0", diff --git a/yarn.lock b/yarn.lock index ddebd67e..68f2c6eb 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7347,21 +7347,6 @@ mathml-tag-names@^2.1.1: resolved "https://registry.yarnpkg.com/mathml-tag-names/-/mathml-tag-names-2.1.3.tgz#4ddadd67308e780cf16a47685878ee27b736a0a3" integrity sha512-APMBEanjybaPzUrfqU0IMU5I0AswKMH7k8OTLs0vvV4KZpExkTkY87nR/zpbuTPj+gARop7aGUbl11pnDfW6xg== -matrix-js-sdk@8.0.0: - version "8.0.0" - resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-8.0.0.tgz#78efb071ed1f6430553a9d6937d7bcfbae24cce8" - integrity sha512-1p0Bv5My0+opkgqq9jGMa8myimGjiuGjzONR9o9i+VY/2hCaT67qIs3oNM3RI+c8sanijr3CHBaeo4tfyXzOuQ== - dependencies: - "@babel/runtime" "^7.8.3" - another-json "^0.2.0" - browser-request "^0.3.3" - bs58 "^4.0.1" - content-type "^1.0.2" - loglevel "^1.6.4" - qs "^6.5.2" - request "^2.88.0" - unhomoglyph "^1.0.2" - "matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop": version "8.0.0" resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/c669382e12c8cd1d7d538421dfad4f50812af44d" @@ -7384,10 +7369,9 @@ matrix-mock-request@^1.2.3: bluebird "^3.5.0" expect "^1.20.2" -matrix-react-sdk@3.0.0: +"matrix-react-sdk@github:matrix-org/matrix-react-sdk#develop": version "3.0.0" - resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.0.0.tgz#d7172bee17836409356c9406e7a5a08d7cfd916b" - integrity sha512-dIh+I6xuCpwqm+JKGcJam2L30P5VNKPXoBkVltpMmjBtNM390ppu+KyhuPB2D0yXHwzVmAyn38dvHXgAYtK74Q== + resolved "https://codeload.github.com/matrix-org/matrix-react-sdk/tar.gz/f9540dd7cd67666ad58beac9b11c7bc4a5872673" dependencies: "@babel/runtime" "^7.10.5" await-lock "^2.0.1" @@ -7415,7 +7399,7 @@ matrix-react-sdk@3.0.0: is-ip "^2.0.0" linkifyjs "^2.1.9" lodash "^4.17.19" - matrix-js-sdk "8.0.0" + matrix-js-sdk "github:matrix-org/matrix-js-sdk#develop" minimist "^1.2.5" pako "^1.0.11" parse5 "^5.1.1" -- 2.30.2 From de6d72fe3e21d7af0ccecc6cb5850103dc8e6270 Mon Sep 17 00:00:00 2001 From: "Michael (a.k.a. Resynth)" Date: Tue, 28 Jul 2020 13:59:01 +0000 Subject: [PATCH 04/25] Fix typo in https:// See [this comment[(https://github.com/vector-im/riot-web/pull/14581#discussion_r461553693). --- docs/config.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/config.md b/docs/config.md index cba73dc1..d342aaf4 100644 --- a/docs/config.md +++ b/docs/config.md @@ -4,7 +4,7 @@ Configuration You can configure the app by copying `config.sample.json` to `config.json` and customising it: -For a good example, see https;//develop.element.io/config.json. +For a good example, see https://develop.element.io/config.json. 1. `default_server_config` sets the default homeserver and identity server URL for Element to use. The object is the same as returned by [https:///.well-known/matrix/client](https://matrix.org/docs/spec/client_server/latest.html#get-well-known-matrix-client), -- 2.30.2 From 6a52758cc722a675b1288405ee4859feeeddcb99 Mon Sep 17 00:00:00 2001 From: Bruno Windels Date: Tue, 28 Jul 2020 17:38:50 +0200 Subject: [PATCH 05/25] update mobile config intercept url --- src/vector/mobile_guide/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/vector/mobile_guide/index.js b/src/vector/mobile_guide/index.js index cf3d4c6b..9a2af3c6 100644 --- a/src/vector/mobile_guide/index.js +++ b/src/vector/mobile_guide/index.js @@ -93,7 +93,7 @@ async function initPage() { if (hsUrl !== 'https://matrix.org/') { document.getElementById('configure_element_button').href = - "https://app.element.io/config/config?hs_url=" + encodeURIComponent(hsUrl) + + "https://mobile.element.io?hs_url=" + encodeURIComponent(hsUrl) + "&is_url=" + encodeURIComponent(isUrl); document.getElementById('step1_heading').innerHTML= '1: Install the app'; document.getElementById('step2_container').style.display = 'block'; -- 2.30.2 From b061d8238e2cc999c4d88b9ddb1deb67b2c63d22 Mon Sep 17 00:00:00 2001 From: Szimszon Date: Tue, 28 Jul 2020 05:19:17 +0000 Subject: [PATCH 06/25] Translated using Weblate (Hungarian) Currently translated at 100.0% (33 of 33 strings) Translation: Element Web/element-web Translate-URL: https://translate.riot.im/projects/element-web/element-web/hu/ --- src/i18n/strings/hu.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/i18n/strings/hu.json b/src/i18n/strings/hu.json index a347616b..e33e527d 100644 --- a/src/i18n/strings/hu.json +++ b/src/i18n/strings/hu.json @@ -31,5 +31,6 @@ "Your Element is misconfigured": "Az Element hibásan van beállítva", "Your Element configuration contains invalid JSON. Please correct the problem and reload the page.": "Az Element érvénytelen JSON-t tartalmazó konfigurációval rendelkezik. Kérlek javítsd és töltsd újra az oldalt.", "Your browser can't run %(brand)s": "A böngésződ nem tudja futtatni ezt: %(brand)s", - "%(brand)s uses advanced browser features which aren't supported by your current browser.": "%(brand)s haladó böngésző funkciókat használ amiket a jelenlegi böngésződ nem támogat." + "%(brand)s uses advanced browser features which aren't supported by your current browser.": "%(brand)s haladó böngésző funkciókat használ amiket a jelenlegi böngésződ nem támogat.", + "Powered by Matrix": "A gépházban: Matrix" } -- 2.30.2 From 07dba2b6e03cf09b5dfcb30294fecab9a11caaea Mon Sep 17 00:00:00 2001 From: Marcelo Filho Date: Mon, 27 Jul 2020 18:26:47 +0000 Subject: [PATCH 07/25] Translated using Weblate (Portuguese (Brazil)) Currently translated at 100.0% (33 of 33 strings) Translation: Element Web/element-web Translate-URL: https://translate.riot.im/projects/element-web/element-web/pt_BR/ --- src/i18n/strings/pt_BR.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/i18n/strings/pt_BR.json b/src/i18n/strings/pt_BR.json index 0fdeb17f..f77e17c4 100644 --- a/src/i18n/strings/pt_BR.json +++ b/src/i18n/strings/pt_BR.json @@ -1,10 +1,10 @@ { "Dismiss": "Descartar", "powered by Matrix": "oferecido por Matrix", - "Unknown device": "Dispositivo desconhecido", + "Unknown device": "Aparelho desconhecido", "You need to be using HTTPS to place a screen-sharing call.": "Você precisa estar usando HTTPS para poder iniciar uma chamada com compartilhamento de tela.", "Welcome to Element": "Seja bem-vinda(o) a Element", - "Decentralised, encrypted chat & collaboration powered by [matrix]": "Chat descentralizado, criptografado e colaborativo oferecido por [matrix]", + "Decentralised, encrypted chat & collaboration powered by [matrix]": "Chat descentralizado, criptografado e colaborativo construído com [matrix]", "Sign In": "Entrar", "Create Account": "Criar Conta", "Explore rooms": "Explore as salas", @@ -26,11 +26,11 @@ "Missing indexeddb worker script!": "O script indexeddb não foi encontrado!", "Open": "Abrir", "Previous/next recently visited room or community": "Anterior/Próxima sala ou comunidade visitada recentemente", - "%(brand)s Desktop (%(platformName)s)": "Desktop de %(brand) (%(platformName))", + "%(brand)s Desktop (%(platformName)s)": "%(brand)s Desktop (%(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)", + "Your browser can't run %(brand)s": "Seu navegador não consegue rodar %(brand)s", "%(brand)s uses advanced browser features which aren't supported by your current browser.": "%(brand)s usa funcionalidades avançadas de navegador que não são suportadas pelo seu navegador atual.", - "Powered by Matrix": "Powered by Matrix" + "Powered by Matrix": "Construído com tecnologia Matrix" } -- 2.30.2 From 269e82edc99c3780f4c8c9981350b7e3020a4022 Mon Sep 17 00:00:00 2001 From: "J. Ryan Stinnett" Date: Wed, 29 Jul 2020 12:05:50 +0100 Subject: [PATCH 08/25] Remove redundant lint dependencies These are no longer needed with the new standard lint repo. --- .eslintrc.js | 2 +- package.json | 2 -- yarn.lock | 35 ----------------------------------- 3 files changed, 1 insertion(+), 38 deletions(-) diff --git a/.eslintrc.js b/.eslintrc.js index a93a5d8b..5391fa17 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -20,4 +20,4 @@ module.exports = { "prefer-promise-reject-errors": "off", }, }], -} +}; diff --git a/package.json b/package.json index bcc09d65..8cf9f7bb 100644 --- a/package.json +++ b/package.json @@ -101,11 +101,9 @@ "cpx": "^1.3.2", "css-loader": "^3.3.2", "eslint": "7.3.1", - "eslint-config-google": "^0.7.1", "eslint-config-matrix-org": "^0.1.2", "eslint-plugin-babel": "^4.1.2", "eslint-plugin-flowtype": "^2.50.3", - "eslint-plugin-jest": "^23.0.4", "eslint-plugin-react": "^7.11.1", "eslint-plugin-react-hooks": "^2.2.0", "extract-text-webpack-plugin": "^4.0.0-beta.0", diff --git a/yarn.lock b/yarn.lock index 68f2c6eb..df9a2d08 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1394,16 +1394,6 @@ eslint-scope "^5.0.0" eslint-utils "^2.0.0" -"@typescript-eslint/experimental-utils@^2.5.0": - version "2.34.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-2.34.0.tgz#d3524b644cdb40eebceca67f8cf3e4cc9c8f980f" - integrity sha512-eS6FTkq+wuMJ+sgtuNTtcqavWXqsflWcfBnlYhg/nS4aZ1leewkXGbvBhaapn1q6qf4M71bsR1tez5JTRMuqwA== - dependencies: - "@types/json-schema" "^7.0.3" - "@typescript-eslint/typescript-estree" "2.34.0" - eslint-scope "^5.0.0" - eslint-utils "^2.0.0" - "@typescript-eslint/parser@^3.4.0": version "3.7.0" resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-3.7.0.tgz#3e9cd9df9ea644536feb6e5acdb8279ecff96ce9" @@ -1420,19 +1410,6 @@ resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-3.7.0.tgz#09897fab0cb95479c01166b10b2c03c224821077" integrity sha512-reCaK+hyKkKF+itoylAnLzFeNYAEktB0XVfSQvf0gcVgpz1l49Lt6Vo9x4MVCCxiDydA0iLAjTF/ODH0pbfnpg== -"@typescript-eslint/typescript-estree@2.34.0": - version "2.34.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-2.34.0.tgz#14aeb6353b39ef0732cc7f1b8285294937cf37d5" - integrity sha512-OMAr+nJWKdlVM9LOqCqh3pQQPwxHAN7Du8DR6dmwCrAmxtiXQnhHJ6tBNtf+cggqfo51SG/FCwnKhXCIM7hnVg== - dependencies: - debug "^4.1.1" - eslint-visitor-keys "^1.1.0" - glob "^7.1.6" - is-glob "^4.0.1" - lodash "^4.17.15" - semver "^7.3.2" - tsutils "^3.17.1" - "@typescript-eslint/typescript-estree@3.7.0": version "3.7.0" resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-3.7.0.tgz#66872e6da120caa4b64e6b4ca5c8702afc74738d" @@ -4069,11 +4046,6 @@ eslint-config-google@^0.14.0: resolved "https://registry.yarnpkg.com/eslint-config-google/-/eslint-config-google-0.14.0.tgz#4f5f8759ba6e11b424294a219dbfa18c508bcc1a" integrity sha512-WsbX4WbjuMvTdeVL6+J3rK1RGhCTqjsFjX7UMSMgZiyxxaNLkoJENbrGExzERFeoTpGw3F3FypTiWAP9ZXzkEw== -eslint-config-google@^0.7.1: - version "0.7.1" - resolved "https://registry.yarnpkg.com/eslint-config-google/-/eslint-config-google-0.7.1.tgz#5598f8498e9e078420f34b80495b8d959f651fb2" - integrity sha1-VZj4SY6eB4Qg80uASVuNlZ9lH7I= - eslint-config-matrix-org@^0.1.2: version "0.1.2" resolved "https://registry.yarnpkg.com/eslint-config-matrix-org/-/eslint-config-matrix-org-0.1.2.tgz#b5d7e193e4f3fc5041905967b53c5ddd6924c793" @@ -4169,13 +4141,6 @@ eslint-plugin-import@^2.14.0: resolve "^1.17.0" tsconfig-paths "^3.9.0" -eslint-plugin-jest@^23.0.4: - version "23.13.2" - resolved "https://registry.yarnpkg.com/eslint-plugin-jest/-/eslint-plugin-jest-23.13.2.tgz#7b7993b4e09be708c696b02555083ddefd7e4cc7" - integrity sha512-qZit+moTXTyZFNDqSIR88/L3rdBlTU7CuW6XmyErD2FfHEkdoLgThkRbiQjzgYnX6rfgLx3Ci4eJmF4Ui5v1Cw== - dependencies: - "@typescript-eslint/experimental-utils" "^2.5.0" - eslint-plugin-react-hooks@^2.2.0: version "2.5.1" resolved "https://registry.yarnpkg.com/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-2.5.1.tgz#4ef5930592588ce171abeb26f400c7fbcbc23cd0" -- 2.30.2 From 008939cff7d8ec951179b60f5fd89d63bb5c8fde Mon Sep 17 00:00:00 2001 From: Christopher May-Townsend Date: Wed, 29 Jul 2020 09:45:20 +0000 Subject: [PATCH 09/25] Translated using Weblate (Icelandic) Currently translated at 33.3% (11 of 33 strings) Translation: Element Web/element-web Translate-URL: https://translate.riot.im/projects/element-web/element-web/is/ --- src/i18n/strings/is.json | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/i18n/strings/is.json b/src/i18n/strings/is.json index 17f83fdb..59225f21 100644 --- a/src/i18n/strings/is.json +++ b/src/i18n/strings/is.json @@ -4,5 +4,11 @@ "Unknown device": "Óþekkt tæki", "Dismiss": "Hafna", "You need to be using HTTPS to place a screen-sharing call.": "Þú verður að nota HTTPS til að hringja samtal með deilingu á skjá.", - "Decentralised, encrypted chat & collaboration powered by [matrix]": "Dulritað dreifvinnsluspjall & samstarfstól keyrt með [matrix]" + "Decentralised, encrypted chat & collaboration powered by [matrix]": "Dulritað dreifvinnsluspjall & samstarfstó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", + "Sign In": "Skrá inn", + "Create Account": "Stofna Reikning", + "Explore rooms": "Kanna herbergi" } -- 2.30.2 From 6f688102e74fb332808e523d8c9e749afd2146b1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 30 Jul 2020 12:58:42 +0000 Subject: [PATCH 10/25] Bump elliptic from 6.5.2 to 6.5.3 Bumps [elliptic](https://github.com/indutny/elliptic) from 6.5.2 to 6.5.3. - [Release notes](https://github.com/indutny/elliptic/releases) - [Commits](https://github.com/indutny/elliptic/compare/v6.5.2...v6.5.3) Signed-off-by: dependabot[bot] --- yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yarn.lock b/yarn.lock index 68f2c6eb..5cca728f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3866,9 +3866,9 @@ electron-to-chromium@^1.3.413: integrity sha512-Oo+0+CN9d2z6FToQW6Hwvi9ez09Y/usKwr0tsDsyg43a871zVJCi1nR0v03djLbRNcaCKjtrnVf2XJhTxEpPCg== elliptic@^6.0.0, elliptic@^6.5.2: - version "6.5.2" - resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.5.2.tgz#05c5678d7173c049d8ca433552224a495d0e3762" - integrity sha512-f4x70okzZbIQl/NSRLkI/+tteV/9WqL98zx+SQ69KbXxmVrmjwsNUPn/gYJJ0sHvEak24cZgHIPegRePAtA/xw== + version "6.5.3" + resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.5.3.tgz#cb59eb2efdaf73a0bd78ccd7015a62ad6e0f93d6" + integrity sha512-IMqzv5wNQf+E6aHeIqATs0tOLeOTwj1QKbRcS3jBbYkl5oLAserA8yJTT7/VyHUYG91PRmPyeQDObKLPpeS4dw== dependencies: bn.js "^4.4.0" brorand "^1.0.1" -- 2.30.2 From 288c4098aaddc5e3670215b6b35cb068c6ac3830 Mon Sep 17 00:00:00 2001 From: HelaBasa Date: Thu, 30 Jul 2020 20:00:51 +0000 Subject: [PATCH 11/25] Added translation using Weblate (Sinhala) --- src/i18n/strings/si.json | 1 + 1 file changed, 1 insertion(+) create mode 100644 src/i18n/strings/si.json diff --git a/src/i18n/strings/si.json b/src/i18n/strings/si.json new file mode 100644 index 00000000..0967ef42 --- /dev/null +++ b/src/i18n/strings/si.json @@ -0,0 +1 @@ +{} -- 2.30.2 From 3aa9c582003c6496ff872fdd832bcea24cb21e28 Mon Sep 17 00:00:00 2001 From: Txopi Date: Thu, 30 Jul 2020 18:32:05 +0000 Subject: [PATCH 12/25] Translated using Weblate (Basque) Currently translated at 100.0% (33 of 33 strings) Translation: Element Web/element-web Translate-URL: https://translate.riot.im/projects/element-web/element-web/eu/ --- src/i18n/strings/eu.json | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/i18n/strings/eu.json b/src/i18n/strings/eu.json index d6d46924..030f1138 100644 --- a/src/i18n/strings/eu.json +++ b/src/i18n/strings/eu.json @@ -4,7 +4,7 @@ "Unknown device": "Gailu ezezaguna", "You need to be using HTTPS to place a screen-sharing call.": "HTTPS erabili behar duzu sekretuak partekatzeko dei bat ezartzeko.", "Welcome to Element": "Ongi etorri Element mezularitzara", - "Decentralised, encrypted chat & collaboration powered by [matrix]": "Deszentralizatutako eta zifratutako txat eta elkarlana [matrix] sareari esker", + "Decentralised, encrypted chat & collaboration powered by [matrix]": "Txat eta elkarlan deszentralizatua eta zifratua [matrix] sarean", "Sign In": "Hasi saioa", "Create Account": "Sortu kontua", "Explore rooms": "Arakatu gelak", @@ -31,5 +31,6 @@ "Download Completed": "Deskarga burututa", "Open": "Ireki", "Your browser can't run %(brand)s": "Zure nabigatzaileak ezin du %(brand)s exekutatu", - "%(brand)s uses advanced browser features which aren't supported by your current browser.": "%(brand)s-(e)k zure oraingo nabigatzaile honek euskarririk ematen ez dien ezaugarri aurreratuak erabiltzen ditu." + "%(brand)s uses advanced browser features which aren't supported by your current browser.": "%(brand)s-(e)k zure oraingo nabigatzaile honek euskarririk ematen ez dien ezaugarri aurreratuak erabiltzen ditu.", + "Powered by Matrix": "Matrixekin egina" } -- 2.30.2 From d4b0487373b62b86ca72ca8011cce41a3894bc7a Mon Sep 17 00:00:00 2001 From: Christopher May-Townsend Date: Thu, 30 Jul 2020 18:33:51 +0000 Subject: [PATCH 13/25] Translated using Weblate (Icelandic) Currently translated at 57.6% (19 of 33 strings) Translation: Element Web/element-web Translate-URL: https://translate.riot.im/projects/element-web/element-web/is/ --- src/i18n/strings/is.json | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/i18n/strings/is.json b/src/i18n/strings/is.json index 59225f21..7e1fc152 100644 --- a/src/i18n/strings/is.json +++ b/src/i18n/strings/is.json @@ -10,5 +10,13 @@ "Your browser can't run %(brand)s": "Vafri þinn geta ekki keyrt upp %(brand)s", "Sign In": "Skrá inn", "Create Account": "Stofna Reikning", - "Explore rooms": "Kanna herbergi" + "Explore rooms": "Kanna herbergi", + "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ð Búið", + "%(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.", + "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" } -- 2.30.2 From bb9b6f8a22ab1bd10cd05ee9bba40a8ef3835618 Mon Sep 17 00:00:00 2001 From: Marcelo Filho Date: Thu, 30 Jul 2020 15:41:27 +0000 Subject: [PATCH 14/25] Translated using Weblate (Portuguese (Brazil)) Currently translated at 100.0% (33 of 33 strings) Translation: Element Web/element-web Translate-URL: https://translate.riot.im/projects/element-web/element-web/pt_BR/ --- src/i18n/strings/pt_BR.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/i18n/strings/pt_BR.json b/src/i18n/strings/pt_BR.json index f77e17c4..88c3932c 100644 --- a/src/i18n/strings/pt_BR.json +++ b/src/i18n/strings/pt_BR.json @@ -18,7 +18,7 @@ "Open user settings": "Abrir configurações do usuário", "%(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.": "Instale o Chrome , o Firefox ou o Safari para obter uma melhor experiência.", + "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", -- 2.30.2 From b72fab29e705b5ab81392a6bd7af049ebe144c72 Mon Sep 17 00:00:00 2001 From: HelaBasa Date: Thu, 30 Jul 2020 20:05:26 +0000 Subject: [PATCH 15/25] Translated using Weblate (Sinhala) Currently translated at 3.0% (1 of 33 strings) Translation: Element Web/element-web Translate-URL: https://translate.riot.im/projects/element-web/element-web/si/ --- src/i18n/strings/si.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/i18n/strings/si.json b/src/i18n/strings/si.json index 0967ef42..6b6ee57b 100644 --- a/src/i18n/strings/si.json +++ b/src/i18n/strings/si.json @@ -1 +1,4 @@ -{} +{ + "Unknown device": "නොදන්නා උපකරණය", + "%(appName)s (%(browserName)s, %(osName)s)": "%(appName)s (%(browserName)s, %(osName)s)" +} -- 2.30.2 From afc863f315b927cfe7317bf067bfb5ae2e79f125 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gustavo=20Dom=C3=ADnguez?= Date: Thu, 30 Jul 2020 19:26:34 +0000 Subject: [PATCH 16/25] Translated using Weblate (Spanish) Currently translated at 97.0% (32 of 33 strings) Translation: Element Web/element-web Translate-URL: https://translate.riot.im/projects/element-web/element-web/es/ --- src/i18n/strings/es.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/i18n/strings/es.json b/src/i18n/strings/es.json index 4f110e4b..0569c902 100644 --- a/src/i18n/strings/es.json +++ b/src/i18n/strings/es.json @@ -28,5 +28,8 @@ "Failed to start": "Fallo al iniciar", "Your Element is misconfigured": "Su Element está mal configurado", "Your Element configuration contains invalid JSON. Please correct the problem and reload the page.": "Su configuración de Element contiene JSON inválido. Por favor corríjalo e inténtelo de nuevo.", - "Download Completed": "Descarga completada" + "Download Completed": "Descarga completada", + "Open": "Abrir", + "Your browser can't run %(brand)s": "Su navegador es compatible con %(brand)s", + "%(brand)s uses advanced browser features which aren't supported by your current browser.": "%(brand)s utiliza funciones avanzadas no soportadas por su navegador." } -- 2.30.2 From 0f9dff6a159d8a5bdc6920faf6f515e82ac35126 Mon Sep 17 00:00:00 2001 From: strix aluco Date: Fri, 31 Jul 2020 02:04:06 +0000 Subject: [PATCH 17/25] Translated using Weblate (Ukrainian) Currently translated at 100.0% (33 of 33 strings) Translation: Element Web/element-web Translate-URL: https://translate.riot.im/projects/element-web/element-web/uk/ --- src/i18n/strings/uk.json | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/i18n/strings/uk.json b/src/i18n/strings/uk.json index 45244e97..afeaab96 100644 --- a/src/i18n/strings/uk.json +++ b/src/i18n/strings/uk.json @@ -11,26 +11,26 @@ "Unexpected error preparing the app. See console for details.": "Неочікувана помилка при підготовці програми. Дивіться деталі у виводі консолі.", "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Невірна конфігурація: можна вказати лише default_server_config, default_server_name або default_hs_url.", "Invalid configuration: no default server specified.": "Невірна конфігурація: не вказано сервер за замовчуванням.", - "The message from the parser is: %(message)s": "Повідомлення від парсера: %(message)s", + "The message from the parser is: %(message)s": "Аналізатор повідомляє: %(message)s", "Invalid JSON": "Хибний JSON", "Unsupported browser": "Непідтримуваний переглядач", "Please install Chrome, Firefox, or Safari for the best experience.": "Для найкращих вражень від користування встановіть, будь ласка, Chrome, Firefox, або Safari.", - "You can continue using your current browser, but some or all features may not work and the look and feel of the application may be incorrect.": "Ви можете продовжити, користуючись вашим поточним переглядачем, але деякі функції можуть не працювати і застосунок може виглядати неправильно.", + "You can continue using your current browser, but some or all features may not work and the look and feel of the application may be incorrect.": "Ви можете продовжити, користуючись вашим поточним переглядачем, але деякі функції можуть не працювати, а застосунок може виглядати неправильно.", "I understand the risks and wish to continue": "Я усвідомлюю ризик і бажаю продовжити", "Go to element.io": "Перейти на element.io", "Failed to start": "Запуск не вдався", "Download Completed": "Завантаження завершено", "Missing indexeddb worker script!": "Відсутній скрипт воркеру для IndexedDB!", "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.": "Не вдалося завантажити файл конфігурації. Попробуйте оновити сторінку.", + "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": "Відкрити", - "Open user settings": "Відкрити налаштування користувача", + "Open user settings": "Відкрити користувацькі налаштування", "Previous/next recently visited room or community": "Попередня/наступна нещодавно відвідана кімната чи спільнота", - "%(brand)s Desktop (%(platformName)s)": "%(brand)s десктоп (%(platformName)s)", - "Go to your browser to complete Sign In": "Перейдіть у браузер для завершення входу", + "%(brand)s Desktop (%(platformName)s)": "%(brand)s Desktop (%(platformName)s)", + "Go to your browser to complete Sign In": "Відкрийте переглядач щоб завершити входження", "%(appName)s (%(browserName)s, %(osName)s)": "%(appName)s (%(browserName)s, %(osName)s)", "Powered by Matrix": "Працює на Matrix", - "Your browser can't run %(brand)s": "Ваш браузер не спроможний запустити %(brand)s", - "%(brand)s uses advanced browser features which aren't supported by your current browser.": "%(brand)s використовує багато новітніх функцій, які не підтримуються вашим браузером." + "Your browser can't run %(brand)s": "Ваш переглядач неспроможний запустити %(brand)s", + "%(brand)s uses advanced browser features which aren't supported by your current browser.": "%(brand)s використовує передові властивості, які ваш переглядач не підтримує." } -- 2.30.2 From 6004d02b98742f1d5fd373c53c7a737c14b55afd Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Fri, 31 Jul 2020 13:33:19 +0100 Subject: [PATCH 18/25] Upgrade matrix-js-sdk to 8.0.1-rc.1 --- package.json | 2 +- yarn.lock | 15 +++++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index 8cf9f7bb..7c4f85e8 100644 --- a/package.json +++ b/package.json @@ -59,7 +59,7 @@ "browser-request": "^0.3.3", "gfm.css": "^1.1.2", "highlight.js": "^9.13.1", - "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop", + "matrix-js-sdk": "8.0.1-rc.1", "matrix-react-sdk": "github:matrix-org/matrix-react-sdk#develop", "olm": "https://packages.matrix.org/npm/olm/olm-3.1.4.tgz", "prop-types": "^15.7.2", diff --git a/yarn.lock b/yarn.lock index 0d9337be..6b05372b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7312,6 +7312,21 @@ mathml-tag-names@^2.1.1: resolved "https://registry.yarnpkg.com/mathml-tag-names/-/mathml-tag-names-2.1.3.tgz#4ddadd67308e780cf16a47685878ee27b736a0a3" integrity sha512-APMBEanjybaPzUrfqU0IMU5I0AswKMH7k8OTLs0vvV4KZpExkTkY87nR/zpbuTPj+gARop7aGUbl11pnDfW6xg== +matrix-js-sdk@8.0.1-rc.1: + version "8.0.1-rc.1" + resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-8.0.1-rc.1.tgz#dbc2544f0058e2530e84a5d3b3e1abe06e395597" + integrity sha512-K3wOAf8lVLBx3Xhgb57JoVtFRVf52PHDnsnj00ST4kCAbnlJ3iuJ8OuOX16Bbk0fvV7RLJi/At4bm1Ld6PsIkQ== + dependencies: + "@babel/runtime" "^7.8.3" + another-json "^0.2.0" + browser-request "^0.3.3" + bs58 "^4.0.1" + content-type "^1.0.2" + loglevel "^1.6.4" + qs "^6.5.2" + request "^2.88.0" + unhomoglyph "^1.0.2" + "matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop": version "8.0.0" resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/c669382e12c8cd1d7d538421dfad4f50812af44d" -- 2.30.2 From 7f0c8216aecd48f6e7772306d761a4cad5f4dddf Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Fri, 31 Jul 2020 13:35:05 +0100 Subject: [PATCH 19/25] Upgrade matrix-react-sdk to 3.1.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 7c4f85e8..3962b8ac 100644 --- a/package.json +++ b/package.json @@ -60,7 +60,7 @@ "gfm.css": "^1.1.2", "highlight.js": "^9.13.1", "matrix-js-sdk": "8.0.1-rc.1", - "matrix-react-sdk": "github:matrix-org/matrix-react-sdk#develop", + "matrix-react-sdk": "3.1.0-rc.1", "olm": "https://packages.matrix.org/npm/olm/olm-3.1.4.tgz", "prop-types": "^15.7.2", "react": "^16.9.0", diff --git a/yarn.lock b/yarn.lock index 6b05372b..cc09e0d9 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7327,20 +7327,6 @@ matrix-js-sdk@8.0.1-rc.1: request "^2.88.0" unhomoglyph "^1.0.2" -"matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop": - version "8.0.0" - resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/c669382e12c8cd1d7d538421dfad4f50812af44d" - dependencies: - "@babel/runtime" "^7.8.3" - another-json "^0.2.0" - browser-request "^0.3.3" - bs58 "^4.0.1" - content-type "^1.0.2" - loglevel "^1.6.4" - qs "^6.5.2" - request "^2.88.0" - unhomoglyph "^1.0.2" - 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" @@ -7349,9 +7335,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.0.0" - resolved "https://codeload.github.com/matrix-org/matrix-react-sdk/tar.gz/f9540dd7cd67666ad58beac9b11c7bc4a5872673" +matrix-react-sdk@3.1.0-rc.1: + version "3.1.0-rc.1" + resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.1.0-rc.1.tgz#dbf6a9b9ad5542075d8a894d4009d04bba149566" + integrity sha512-CJVlYARIYBKVBtoyDVPeBGH/rbqTgerWiYovqVq3+TG+DUDFZYSRXLRymxVwTSB23PKP1PJ8+MEOA0Yx2r2gmg== dependencies: "@babel/runtime" "^7.10.5" await-lock "^2.0.1" @@ -7379,7 +7366,7 @@ matrix-mock-request@^1.2.3: is-ip "^2.0.0" linkifyjs "^2.1.9" lodash "^4.17.19" - matrix-js-sdk "github:matrix-org/matrix-js-sdk#develop" + matrix-js-sdk "8.0.1-rc.1" minimist "^1.2.5" pako "^1.0.11" parse5 "^5.1.1" -- 2.30.2 From 1a916435da24c5bb29096172428febe1ce3a09df Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Fri, 31 Jul 2020 13:40:26 +0100 Subject: [PATCH 20/25] Prepare changelog for v1.7.3-rc.1 --- CHANGELOG.md | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index b8172453..625eefa3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,21 @@ +Changes in [1.7.3-rc.1](https://github.com/vector-im/riot-web/releases/tag/v1.7.3-rc.1) (2020-07-31) +==================================================================================================== +[Full Changelog](https://github.com/vector-im/riot-web/compare/v1.7.2...v1.7.3-rc.1) + + * Upgrade to React SDK 3.1.0-rc.1 and JS SDK 8.0.1-rc.1 + * Make Lojban translation available + [\#14703](https://github.com/vector-im/riot-web/pull/14703) + * Update from Weblate + [\#14841](https://github.com/vector-im/riot-web/pull/14841) + * Remove redundant lint dependencies + [\#14810](https://github.com/vector-im/riot-web/pull/14810) + * Bump elliptic from 6.5.2 to 6.5.3 + [\#14826](https://github.com/vector-im/riot-web/pull/14826) + * Update mobile config intercept URL + [\#14796](https://github.com/vector-im/riot-web/pull/14796) + * Fix typo in https:// + [\#14791](https://github.com/vector-im/riot-web/pull/14791) + Changes in [1.7.2](https://github.com/vector-im/riot-web/releases/tag/v1.7.2) (2020-07-27) ========================================================================================== [Full Changelog](https://github.com/vector-im/riot-web/compare/v1.7.1...v1.7.2) -- 2.30.2 From 0b3487981cb2e80751adf0e519ecf15220c4078f Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Fri, 31 Jul 2020 13:40:26 +0100 Subject: [PATCH 21/25] v1.7.3-rc.1 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 3962b8ac..c128a656 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "riot-web", "productName": "Riot", - "version": "1.7.2", + "version": "1.7.3-rc.1", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "repository": { -- 2.30.2 From d283b4161c43d80f4133213148dfa184160a8539 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Wed, 5 Aug 2020 16:12:29 +0100 Subject: [PATCH 22/25] Upgrade matrix-js-sdk to 8.0.1 --- package.json | 2 +- yarn.lock | 15 +++++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index c128a656..aefc1e42 100644 --- a/package.json +++ b/package.json @@ -59,7 +59,7 @@ "browser-request": "^0.3.3", "gfm.css": "^1.1.2", "highlight.js": "^9.13.1", - "matrix-js-sdk": "8.0.1-rc.1", + "matrix-js-sdk": "8.0.1", "matrix-react-sdk": "3.1.0-rc.1", "olm": "https://packages.matrix.org/npm/olm/olm-3.1.4.tgz", "prop-types": "^15.7.2", diff --git a/yarn.lock b/yarn.lock index cc09e0d9..51e288a7 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7312,6 +7312,21 @@ mathml-tag-names@^2.1.1: resolved "https://registry.yarnpkg.com/mathml-tag-names/-/mathml-tag-names-2.1.3.tgz#4ddadd67308e780cf16a47685878ee27b736a0a3" integrity sha512-APMBEanjybaPzUrfqU0IMU5I0AswKMH7k8OTLs0vvV4KZpExkTkY87nR/zpbuTPj+gARop7aGUbl11pnDfW6xg== +matrix-js-sdk@8.0.1: + version "8.0.1" + resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-8.0.1.tgz#dafd41023671249c01e4278e7103c93200b34e5e" + integrity sha512-DT2YjWi8l2eHyNTKZOhBkN/EakIMDDEglSCg+RWY4QzFaXYlSwfwfzzCujjtq1hxVSKim8NC7KqxgNetOiBegA== + dependencies: + "@babel/runtime" "^7.8.3" + another-json "^0.2.0" + browser-request "^0.3.3" + bs58 "^4.0.1" + content-type "^1.0.2" + loglevel "^1.6.4" + qs "^6.5.2" + request "^2.88.0" + unhomoglyph "^1.0.2" + matrix-js-sdk@8.0.1-rc.1: version "8.0.1-rc.1" resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-8.0.1-rc.1.tgz#dbc2544f0058e2530e84a5d3b3e1abe06e395597" -- 2.30.2 From 6b7909c73217b7de2f33c1ca7b1f36e02d650e36 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Wed, 5 Aug 2020 16:12:43 +0100 Subject: [PATCH 23/25] Upgrade matrix-react-sdk to 3.1.0 --- package.json | 2 +- yarn.lock | 25 +++++-------------------- 2 files changed, 6 insertions(+), 21 deletions(-) diff --git a/package.json b/package.json index aefc1e42..cfa11b1f 100644 --- a/package.json +++ b/package.json @@ -60,7 +60,7 @@ "gfm.css": "^1.1.2", "highlight.js": "^9.13.1", "matrix-js-sdk": "8.0.1", - "matrix-react-sdk": "3.1.0-rc.1", + "matrix-react-sdk": "3.1.0", "olm": "https://packages.matrix.org/npm/olm/olm-3.1.4.tgz", "prop-types": "^15.7.2", "react": "^16.9.0", diff --git a/yarn.lock b/yarn.lock index 51e288a7..43a04f50 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7327,21 +7327,6 @@ matrix-js-sdk@8.0.1: request "^2.88.0" unhomoglyph "^1.0.2" -matrix-js-sdk@8.0.1-rc.1: - version "8.0.1-rc.1" - resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-8.0.1-rc.1.tgz#dbc2544f0058e2530e84a5d3b3e1abe06e395597" - integrity sha512-K3wOAf8lVLBx3Xhgb57JoVtFRVf52PHDnsnj00ST4kCAbnlJ3iuJ8OuOX16Bbk0fvV7RLJi/At4bm1Ld6PsIkQ== - dependencies: - "@babel/runtime" "^7.8.3" - another-json "^0.2.0" - browser-request "^0.3.3" - bs58 "^4.0.1" - content-type "^1.0.2" - loglevel "^1.6.4" - qs "^6.5.2" - request "^2.88.0" - unhomoglyph "^1.0.2" - 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" @@ -7350,10 +7335,10 @@ matrix-mock-request@^1.2.3: bluebird "^3.5.0" expect "^1.20.2" -matrix-react-sdk@3.1.0-rc.1: - version "3.1.0-rc.1" - resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.1.0-rc.1.tgz#dbf6a9b9ad5542075d8a894d4009d04bba149566" - integrity sha512-CJVlYARIYBKVBtoyDVPeBGH/rbqTgerWiYovqVq3+TG+DUDFZYSRXLRymxVwTSB23PKP1PJ8+MEOA0Yx2r2gmg== +matrix-react-sdk@3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.1.0.tgz#d8349942e6aa705195b30415c96d7576b783f011" + integrity sha512-LNSm4gX+c9Z2z39QyaQTSZmIAEI5nmIZ7uVq2X3ktn0NwmGwTcvC983t68ooHmIzAqVmh4JrscgzmdvPqk/YPw== dependencies: "@babel/runtime" "^7.10.5" await-lock "^2.0.1" @@ -7381,7 +7366,7 @@ matrix-react-sdk@3.1.0-rc.1: is-ip "^2.0.0" linkifyjs "^2.1.9" lodash "^4.17.19" - matrix-js-sdk "8.0.1-rc.1" + matrix-js-sdk "8.0.1" minimist "^1.2.5" pako "^1.0.11" parse5 "^5.1.1" -- 2.30.2 From c411eabdac2c701d06997ac757d7587143c43cf1 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Wed, 5 Aug 2020 16:15:16 +0100 Subject: [PATCH 24/25] Prepare changelog for v1.7.3 --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 625eefa3..2a5d9fe7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +Changes in [1.7.3](https://github.com/vector-im/element-web/releases/tag/v1.7.3) (2020-08-05) +============================================================================================= +[Full Changelog](https://github.com/vector-im/element-web/compare/v1.7.3-rc.1...v1.7.3) + + * Upgrade to React SDK 3.1.0 and JS SDK 8.0.1 + Changes in [1.7.3-rc.1](https://github.com/vector-im/riot-web/releases/tag/v1.7.3-rc.1) (2020-07-31) ==================================================================================================== [Full Changelog](https://github.com/vector-im/riot-web/compare/v1.7.2...v1.7.3-rc.1) -- 2.30.2 From f8102105a9b6313d2c49904a21228838391fad2d Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Wed, 5 Aug 2020 16:15:17 +0100 Subject: [PATCH 25/25] v1.7.3 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index cfa11b1f..73d4da7a 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "riot-web", "productName": "Riot", - "version": "1.7.3-rc.1", + "version": "1.7.3", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "repository": { -- 2.30.2