From 02ca5011a3ccf62bdc2afd277f9f2b175c0ecdeb Mon Sep 17 00:00:00 2001 From: thomcatdotrocks <37344783+thomcatdotrocks@users.noreply.github.com> Date: Fri, 31 Jul 2020 15:59:13 -0500 Subject: [PATCH 001/119] Updating package.sh This should correct the tarball structure from `riot-$version` to `element-$version`. --- scripts/package.sh | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/scripts/package.sh b/scripts/package.sh index 70569fdacb2..3960208e285 100755 --- a/scripts/package.sh +++ b/scripts/package.sh @@ -16,20 +16,20 @@ yarn build cp config.sample.json webapp/ mkdir -p dist -cp -r webapp riot-$version +cp -r webapp element-$version # Just in case you have a local config, remove it before packaging -rm riot-$version/config.json || true +rm element-$version/config.json || true # if $version looks like semver with leading v, strip it before writing to file if [[ ${version} =~ ^v[[:digit:]]+\.[[:digit:]]+\.[[:digit:]]+(-.+)?$ ]]; then - echo ${version:1} > riot-$version/version + echo ${version:1} > element-$version/version else - echo ${version} > riot-$version/version + echo ${version} > element-$version/version fi -tar chvzf dist/riot-$version.tar.gz riot-$version -rm -r riot-$version +tar chvzf dist/element-$version.tar.gz element-$version +rm -r element-$version echo -echo "Packaged dist/riot-$version.tar.gz" +echo "Packaged dist/element-$version.tar.gz" From 65f37665e4254157f5d91c129c4b9220aeb5c681 Mon Sep 17 00:00:00 2001 From: thomcatdotrocks <37344783+thomcatdotrocks@users.noreply.github.com> Date: Fri, 31 Jul 2020 16:08:38 -0500 Subject: [PATCH 002/119] Update AUTHORS.rst --- AUTHORS.rst | 3 +++ 1 file changed, 3 insertions(+) diff --git a/AUTHORS.rst b/AUTHORS.rst index a92ca066cce..8845e9f9603 100644 --- a/AUTHORS.rst +++ b/AUTHORS.rst @@ -16,3 +16,6 @@ include: * Alexandr Korsak (https://github.com/oivoodoo) Improved multiple file uploading + +* Thom Cleary (https://github.com/thomcatdotrocks) + Small correction for tarball deployment From 6092bb3ae07c2a75158ca549ca93f8a70c1ceb84 Mon Sep 17 00:00:00 2001 From: thomcatdotrocks <37344783+thomcatdotrocks@users.noreply.github.com> Date: Mon, 3 Aug 2020 09:28:50 -0500 Subject: [PATCH 003/119] Update AUTHORS.rst --- AUTHORS.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/AUTHORS.rst b/AUTHORS.rst index 8845e9f9603..d027b59c998 100644 --- a/AUTHORS.rst +++ b/AUTHORS.rst @@ -18,4 +18,4 @@ include: Improved multiple file uploading * Thom Cleary (https://github.com/thomcatdotrocks) - Small correction for tarball deployment + Small update for tarball deployment From a40cc4fa3ef3494c7402965aa5bdcf3b7ccb9908 Mon Sep 17 00:00:00 2001 From: Aleks Kissinger Date: Thu, 24 Sep 2020 18:27:57 +0100 Subject: [PATCH 004/119] added katex.min.css to webpack for math support --- webpack.config.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/webpack.config.js b/webpack.config.js index 23db22890b7..b61a3e952fb 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -41,6 +41,9 @@ module.exports = (env, argv) => { "jitsi": "./src/vector/jitsi/index.ts", "usercontent": "./node_modules/matrix-react-sdk/src/usercontent/index.js", + // CSS for math outout + "katex": "./node_modules/matrix-react-sdk/node_modules/katex/dist/katex.min.css", + // CSS themes "theme-legacy": "./node_modules/matrix-react-sdk/res/themes/legacy-light/css/legacy-light.scss", "theme-legacy-dark": "./node_modules/matrix-react-sdk/res/themes/legacy-dark/css/legacy-dark.scss", From 1dae7df28a520549d2658b4d09b7e0d832c8e289 Mon Sep 17 00:00:00 2001 From: Aleks Kissinger Date: Sat, 10 Oct 2020 19:01:30 +0100 Subject: [PATCH 005/119] added doc for latex_maths feature flag --- docs/labs.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/docs/labs.md b/docs/labs.md index 50f9e589ed4..00f9d74cacd 100644 --- a/docs/labs.md +++ b/docs/labs.md @@ -7,6 +7,10 @@ to `Settings->Labs`. This list is non-exhaustive and subject to change, chat in **Be warned! Labs features are not finalised, they may be fragile, they may change, they may be dropped. Ask in the room if you are unclear about any details here.** +## LaTeX math in messages (`feature_latex_maths`) + +Enables LaTeX math in messages using [KaTeX](https://katex.org/). + ## New spinner design (`feature_new_spinner`) Replaces the old spinner image with a new, svg-based one featuring a sleeker design. From 3402236a0c2281c0c02d1dc3a6ae1d3e4b08f688 Mon Sep 17 00:00:00 2001 From: Marcelo Filho Date: Fri, 9 Oct 2020 18:25:19 +0000 Subject: [PATCH 006/119] Translated using Weblate (Portuguese) Currently translated at 42.4% (14 of 33 strings) Translation: Element Web/element-web Translate-URL: https://translate.riot.im/projects/element-web/element-web/pt/ --- src/i18n/strings/pt.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/i18n/strings/pt.json b/src/i18n/strings/pt.json index c29ed4a2af8..1092b667c38 100644 --- a/src/i18n/strings/pt.json +++ b/src/i18n/strings/pt.json @@ -3,7 +3,7 @@ "powered by Matrix": "powered by Matrix", "Unknown device": "Dispositivo desconhecido", "You need to be using HTTPS to place a screen-sharing call.": "Necessita de estar a usar HTTPS para poder iniciar uma chamada com partilha de ecrã.", - "Welcome to Element": "Bem-vindo ao Element", + "Welcome to Element": "Boas-vindas ao Element", "Decentralised, encrypted chat & collaboration powered by [matrix]": "Chat descentralizado, encriptado & colaborativo powered by [matrix]", "The message from the parser is: %(message)s": "A mensagem do parser é: %(message)s", "Invalid JSON": "JSON inválido", From 4ee538117b520cac436ff66c9a15858fb982ce6e Mon Sep 17 00:00:00 2001 From: Marcelo Filho Date: Fri, 9 Oct 2020 18:23:47 +0000 Subject: [PATCH 007/119] 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 9ad9220a7ce..8f83d05c7cc 100644 --- a/src/i18n/strings/pt_BR.json +++ b/src/i18n/strings/pt_BR.json @@ -3,7 +3,7 @@ "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": "Seja bem-vinda(o) a Element", + "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", "Create Account": "Criar Conta", From fd2895eb403cdddae47e33218aae36f453fa7410 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Mon, 12 Oct 2020 13:59:47 +0100 Subject: [PATCH 008/119] 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 b80ff39b365..6405b1f14b9 100644 --- a/package.json +++ b/package.json @@ -60,7 +60,7 @@ "gfm.css": "^1.1.2", "highlight.js": "^9.13.1", "jsrsasign": "^9.1.5", - "matrix-js-sdk": "8.5.0", + "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop", "matrix-react-sdk": "3.6.0", "matrix-widget-api": "^0.1.0-beta.2", "olm": "https://packages.matrix.org/npm/olm/olm-3.2.1.tgz", diff --git a/yarn.lock b/yarn.lock index 08dff379512..d0b3b7b9377 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7913,6 +7913,20 @@ matrix-js-sdk@8.5.0: request "^2.88.2" unhomoglyph "^1.0.6" +"matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop": + version "8.5.0" + resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/d8c4101fdd521e189f4755c6f02a8971b991ef5f" + dependencies: + "@babel/runtime" "^7.11.2" + another-json "^0.2.0" + browser-request "^0.3.3" + bs58 "^4.0.1" + content-type "^1.0.4" + loglevel "^1.7.0" + qs "^6.9.4" + 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 f8e84c42ad058104567025c12e8138242ed218b8 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Mon, 12 Oct 2020 13:59:58 +0100 Subject: [PATCH 009/119] 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 6405b1f14b9..c030f45a533 100644 --- a/package.json +++ b/package.json @@ -61,7 +61,7 @@ "highlight.js": "^9.13.1", "jsrsasign": "^9.1.5", "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop", - "matrix-react-sdk": "3.6.0", + "matrix-react-sdk": "github:matrix-org/matrix-react-sdk#develop", "matrix-widget-api": "^0.1.0-beta.2", "olm": "https://packages.matrix.org/npm/olm/olm-3.2.1.tgz", "prop-types": "^15.7.2", diff --git a/yarn.lock b/yarn.lock index d0b3b7b9377..d7beb0cc88b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7898,21 +7898,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.5.0: - version "8.5.0" - resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-8.5.0.tgz#02d77e0e95fe32dcc74e0a94707f9103badfdca5" - integrity sha512-RJCqK/QkesL+63rX4C4mShEFw/ZR20D1UMw1RKY8pQhv1/7Skz+v5BTv/UCqG45E3rRYMarNOwy13CZ+yq33FA== - dependencies: - "@babel/runtime" "^7.11.2" - another-json "^0.2.0" - browser-request "^0.3.3" - bs58 "^4.0.1" - content-type "^1.0.4" - loglevel "^1.7.0" - qs "^6.9.4" - request "^2.88.2" - unhomoglyph "^1.0.6" - "matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop": version "8.5.0" resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/d8c4101fdd521e189f4755c6f02a8971b991ef5f" @@ -7935,10 +7920,9 @@ matrix-mock-request@^1.2.3: bluebird "^3.5.0" expect "^1.20.2" -matrix-react-sdk@3.6.0: +"matrix-react-sdk@github:matrix-org/matrix-react-sdk#develop": version "3.6.0" - resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.6.0.tgz#fbac180f8a8681bd7ca80de915dc25bf225fdac8" - integrity sha512-14/Qo6zS6daPtNNVVhL2Uk6Z/k/KWGw4fsE3U4aVA1dupyOaPnEvPAjkvuRh3kzRI8b5sjXJvQCL/tuoxeInLg== + resolved "https://codeload.github.com/matrix-org/matrix-react-sdk/tar.gz/d007b06d7c245354c126e9ab41c8b4b3f8b85f54" dependencies: "@babel/runtime" "^7.10.5" await-lock "^2.0.1" @@ -7965,7 +7949,7 @@ matrix-react-sdk@3.6.0: is-ip "^2.0.0" linkifyjs "^2.1.9" lodash "^4.17.19" - matrix-js-sdk "8.5.0" + matrix-js-sdk "github:matrix-org/matrix-js-sdk#develop" matrix-widget-api "^0.1.0-beta.3" minimist "^1.2.5" pako "^1.0.11" From 5350c5e551120a405e19149ae3ab70d4a9378720 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Damir=20Jeli=C4=87?= Date: Tue, 13 Oct 2020 16:36:38 +0200 Subject: [PATCH 010/119] electron-platform: Pass the user/devce id pair when initializing the event index. --- src/vector/platform/ElectronPlatform.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/vector/platform/ElectronPlatform.tsx b/src/vector/platform/ElectronPlatform.tsx index 1ce7eefde39..ab3fc153c14 100644 --- a/src/vector/platform/ElectronPlatform.tsx +++ b/src/vector/platform/ElectronPlatform.tsx @@ -140,8 +140,8 @@ class SeshatIndexManager extends BaseEventIndexManager { return this._ipcCall('supportsEventIndexing'); } - async initEventIndex(): Promise { - return this._ipcCall('initEventIndex'); + async initEventIndex(user_id: string, device_id: string): Promise { + return this._ipcCall('initEventIndex', user_id, device_id); } async addEventToIndex(ev: MatrixEvent, profile: MatrixProfile): Promise { From 0507cd2d9003858612cc41f1fe2991fb2f1df29d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Damir=20Jeli=C4=87?= Date: Tue, 13 Oct 2020 17:04:40 +0200 Subject: [PATCH 011/119] electron-platform: Use camel case for the user/device id. --- src/vector/platform/ElectronPlatform.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/vector/platform/ElectronPlatform.tsx b/src/vector/platform/ElectronPlatform.tsx index ab3fc153c14..64835a00d43 100644 --- a/src/vector/platform/ElectronPlatform.tsx +++ b/src/vector/platform/ElectronPlatform.tsx @@ -140,8 +140,8 @@ class SeshatIndexManager extends BaseEventIndexManager { return this._ipcCall('supportsEventIndexing'); } - async initEventIndex(user_id: string, device_id: string): Promise { - return this._ipcCall('initEventIndex', user_id, device_id); + async initEventIndex(userId: string, deviceId: string): Promise { + return this._ipcCall('initEventIndex', userId, deviceId); } async addEventToIndex(ev: MatrixEvent, profile: MatrixProfile): Promise { From 427328f9348fd64ceb903f1db4aa7c0c9401fb08 Mon Sep 17 00:00:00 2001 From: TR_SLimey Date: Tue, 13 Oct 2020 19:35:38 +0000 Subject: [PATCH 012/119] Translated using Weblate (Polish) Currently translated at 90.9% (30 of 33 strings) Translation: Element Web/element-web Translate-URL: https://translate.riot.im/projects/element-web/element-web/pl/ --- src/i18n/strings/pl.json | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/i18n/strings/pl.json b/src/i18n/strings/pl.json index eec83f8b654..9138087cd97 100644 --- a/src/i18n/strings/pl.json +++ b/src/i18n/strings/pl.json @@ -25,5 +25,9 @@ "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.": "Możesz kontynuować używanie obecnej przeglądarki, lecz niektóre lub wszystkie funkcje mogą nie działać oraz wygląd aplikacji może być niepoprawny.", "I understand the risks and wish to continue": "Rozumiem ryzyko i chcę kontynuować", "Go to element.io": "Przejdź do element.io", - "Failed to start": "Nie udało się wystartować" + "Failed to start": "Nie udało się wystartować", + "Download Completed": "Pobieranie Zakończone", + "Open": "Otwórz", + "Your browser can't run %(brand)s": "Twoja przeglądarka nie obsługuje %(brand)s", + "%(brand)s uses advanced browser features which aren't supported by your current browser.": "%(brand)s używa zaawansowanych funkcji przeglądarki, które nie są dostępne w twojej przeglądarce." } From 917a85ead9d4c6af1d1ea724738e3472f4a040ee Mon Sep 17 00:00:00 2001 From: Travis Ralston Date: Wed, 14 Oct 2020 16:16:08 -0600 Subject: [PATCH 013/119] Don't fatally end the Jitsi widget when it's not being used as a widget --- src/vector/jitsi/index.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/vector/jitsi/index.ts b/src/vector/jitsi/index.ts index e1b6a58bc92..e1521f4ee7f 100644 --- a/src/vector/jitsi/index.ts +++ b/src/vector/jitsi/index.ts @@ -88,7 +88,7 @@ let meetApi: any; // JitsiMeetExternalAPI ]); widgetApi.start(); } else { - throw new Error("No parent URL or no widget ID"); + console.warn("No parent URL or no widget ID - assuming no widget API is available"); } // Populate the Jitsi params now From 7793f07c814a44151ca8e8d6701380dce22d903e Mon Sep 17 00:00:00 2001 From: "J. Ryan Stinnett" Date: Thu, 15 Oct 2020 18:01:38 +0100 Subject: [PATCH 014/119] Document customisation points https://github.com/matrix-org/matrix-react-sdk/pull/5327 adds a concept of "customisation points" to keep custom functionality contained. This adds some general guidance on how to use them. --- docs/customisations.md | 34 ++++++++++++++++++++++++++++++++++ src/customisations/README.md | 1 + 2 files changed, 35 insertions(+) create mode 100644 docs/customisations.md create mode 120000 src/customisations/README.md diff --git a/docs/customisations.md b/docs/customisations.md new file mode 100644 index 00000000000..cea95af478f --- /dev/null +++ b/docs/customisations.md @@ -0,0 +1,34 @@ +# Customisations + +Element Web and the React SDK support "customisation points" that can be used to +easily add custom logic specific to a particular deployment of Element Web. + +An example of this is the [security customisations +module](https://github.com/matrix-org/matrix-react-sdk/blob/develop/src/customisations/Security.ts). +This module in the React SDK only defines some empty functions and their types: +it does not do anything by default. + +To make use of these customisation points, you will first need to fork Element +Web so that you can add your own code. Even though the default module is part of +the React SDK, you can still override it from the Element Web layer: + +1. Copy the default customisation module to + `element-web/src/customisations/YourNameSecurity.js` +2. Edit customisations points and make sure export the ones you actually want to + activate +3. Tweak the Element build process to use the customised module instead of the + default by adding this to end of the `plugins` array in `webpack.config.js`: + +```js +new webpack.NormalModuleReplacementPlugin( + /src\/customisations\/Security.ts/, + path.resolve(__dirname, 'src/customisations/YourNameSecurity.ts'), +), +``` + +If we add more customisation modules in the future, we'll likely improve these +steps to remove the need for build changes like the above. + +By isolating customisations to their own module, this approach should remove the +chance of merge conflicts when updating your fork, and thus simplify ongoing +maintenance. diff --git a/src/customisations/README.md b/src/customisations/README.md new file mode 120000 index 00000000000..d2cbdd09d6c --- /dev/null +++ b/src/customisations/README.md @@ -0,0 +1 @@ +docs/customisations.md \ No newline at end of file From f37b63a6cb9bac0f2078ed265a739551633ee4e6 Mon Sep 17 00:00:00 2001 From: "J. Ryan Stinnett" Date: Fri, 16 Oct 2020 11:22:28 +0100 Subject: [PATCH 015/119] Fix file extension Co-authored-by: Travis Ralston --- docs/customisations.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/customisations.md b/docs/customisations.md index cea95af478f..2c36b54f9ba 100644 --- a/docs/customisations.md +++ b/docs/customisations.md @@ -13,7 +13,7 @@ Web so that you can add your own code. Even though the default module is part of the React SDK, you can still override it from the Element Web layer: 1. Copy the default customisation module to - `element-web/src/customisations/YourNameSecurity.js` + `element-web/src/customisations/YourNameSecurity.ts` 2. Edit customisations points and make sure export the ones you actually want to activate 3. Tweak the Element build process to use the customised module instead of the From 4053d598f81216596793d628c587ff77929e4ae6 Mon Sep 17 00:00:00 2001 From: "J. Ryan Stinnett" Date: Fri, 16 Oct 2020 11:32:57 +0100 Subject: [PATCH 016/119] Update README.md link --- src/customisations/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/customisations/README.md b/src/customisations/README.md index d2cbdd09d6c..cacf1166042 120000 --- a/src/customisations/README.md +++ b/src/customisations/README.md @@ -1 +1 @@ -docs/customisations.md \ No newline at end of file +../../docs/customisations.md \ No newline at end of file From 7f4f9b2cf1f6c84d51decc464b53a3ae8085b7bb Mon Sep 17 00:00:00 2001 From: Sebastian Denz Date: Fri, 16 Oct 2020 14:48:28 +0200 Subject: [PATCH 017/119] Use HTTPS_PROXY environment variable for downloading external_api.min.js if set --- package.json | 1 + scripts/build-jitsi.js | 9 ++++++++- yarn.lock | 15 +++++++++++++++ 3 files changed, 24 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index c030f45a533..10b146781c4 100644 --- a/package.json +++ b/package.json @@ -139,6 +139,7 @@ "postcss-strip-inline-comments": "^0.1.5", "rimraf": "^2.4.3", "shell-escape": "^0.2.0", + "simple-proxy-agent": "^1.1.0", "stylelint": "^12.0.1", "terser-webpack-plugin": "^2.3.0", "typescript": "^3.7.3", diff --git a/scripts/build-jitsi.js b/scripts/build-jitsi.js index 464ec6ea690..fb3f0ddd2bd 100644 --- a/scripts/build-jitsi.js +++ b/scripts/build-jitsi.js @@ -7,6 +7,7 @@ const fs = require("fs"); const path = require("path"); const mkdirp = require("mkdirp"); const fetch = require("node-fetch"); +const ProxyAgent = require("simple-proxy-agent"); console.log("Making webapp directory"); mkdirp.sync("webapp"); @@ -14,7 +15,13 @@ mkdirp.sync("webapp"); // curl -s https://jitsi.riot.im/libs/external_api.min.js > ./webapp/jitsi_external_api.min.js console.log("Downloading Jitsi script"); const fname = path.join("webapp", "jitsi_external_api.min.js"); -fetch("https://jitsi.riot.im/libs/external_api.min.js").then(res => { + +const options = {}; +if (process.env.HTTPS_PROXY) { + options.agent = new ProxyAgent(process.env.HTTPS_PROXY, { tunnel : true } ); +} + +fetch("https://jitsi.riot.im/libs/external_api.min.js", options).then(res => { const stream = fs.createWriteStream(fname); return new Promise((resolve, reject) => { res.body.pipe(stream); diff --git a/yarn.lock b/yarn.lock index d7beb0cc88b..4aeeb3d6945 100644 --- a/yarn.lock +++ b/yarn.lock @@ -11286,6 +11286,13 @@ simple-get@^3.0.3: once "^1.3.1" simple-concat "^1.0.0" +simple-proxy-agent@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/simple-proxy-agent/-/simple-proxy-agent-1.1.0.tgz#974cd1130dd32554775e2d4caeb70d701f7ca8b3" + integrity sha512-amJaLagzNELaNNB2UXdXiORVbbU/RC4yRwtGvF4cttJheTm4JvL2fZ1SfuLU952XC7TLamYdgzzJtWUbGM6Jcw== + dependencies: + socks "^2.3.2" + simple-swizzle@^0.2.2: version "0.2.2" resolved "https://registry.yarnpkg.com/simple-swizzle/-/simple-swizzle-0.2.2.tgz#a4da6b635ffcccca33f70d17cb92592de95e557a" @@ -11386,6 +11393,14 @@ socks-proxy-agent@^4.0.0: agent-base "~4.2.1" socks "~2.3.2" +socks@^2.3.2: + version "2.4.4" + resolved "https://registry.yarnpkg.com/socks/-/socks-2.4.4.tgz#f1a3382e7814ae28c97bb82a38bc1ac24b21cca2" + integrity sha512-7LmHN4IHj1Vpd/k8D872VGCHJ6yIVyeFkfIBExRmGPYQ/kdUkpdg9eKh9oOzYYYKQhuxavayJHTnmBG+EzluUA== + dependencies: + ip "^1.1.5" + smart-buffer "^4.1.0" + socks@~2.3.2: version "2.3.3" resolved "https://registry.yarnpkg.com/socks/-/socks-2.3.3.tgz#01129f0a5d534d2b897712ed8aceab7ee65d78e3" From d1a6b656bc274083453de42e46b673156a937309 Mon Sep 17 00:00:00 2001 From: Travis Ralston Date: Wed, 14 Oct 2020 16:16:08 -0600 Subject: [PATCH 018/119] Don't fatally end the Jitsi widget when it's not being used as a widget --- src/vector/jitsi/index.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/vector/jitsi/index.ts b/src/vector/jitsi/index.ts index e1b6a58bc92..e1521f4ee7f 100644 --- a/src/vector/jitsi/index.ts +++ b/src/vector/jitsi/index.ts @@ -88,7 +88,7 @@ let meetApi: any; // JitsiMeetExternalAPI ]); widgetApi.start(); } else { - throw new Error("No parent URL or no widget ID"); + console.warn("No parent URL or no widget ID - assuming no widget API is available"); } // Populate the Jitsi params now From 44bf49d41459497808a7947a0352a5cc217e016d Mon Sep 17 00:00:00 2001 From: Travis Ralston Date: Fri, 16 Oct 2020 13:15:08 -0600 Subject: [PATCH 019/119] Update scripts/build-jitsi.js --- scripts/build-jitsi.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/build-jitsi.js b/scripts/build-jitsi.js index fb3f0ddd2bd..3f2ba299060 100644 --- a/scripts/build-jitsi.js +++ b/scripts/build-jitsi.js @@ -18,7 +18,7 @@ const fname = path.join("webapp", "jitsi_external_api.min.js"); const options = {}; if (process.env.HTTPS_PROXY) { - options.agent = new ProxyAgent(process.env.HTTPS_PROXY, { tunnel : true } ); + options.agent = new ProxyAgent(process.env.HTTPS_PROXY, {tunnel: true}); } fetch("https://jitsi.riot.im/libs/external_api.min.js", options).then(res => { From 477886551d6c615238856a25e888f4fa0d9aeea4 Mon Sep 17 00:00:00 2001 From: TR_SLimey Date: Sat, 17 Oct 2020 11:02:41 +0000 Subject: [PATCH 020/119] Translated using Weblate (Polish) Currently translated at 96.9% (32 of 33 strings) Translation: Element Web/element-web Translate-URL: https://translate.element.io/projects/element-web/element-web/pl/ --- src/i18n/strings/pl.json | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/i18n/strings/pl.json b/src/i18n/strings/pl.json index 9138087cd97..707418edb08 100644 --- a/src/i18n/strings/pl.json +++ b/src/i18n/strings/pl.json @@ -29,5 +29,7 @@ "Download Completed": "Pobieranie Zakończone", "Open": "Otwórz", "Your browser can't run %(brand)s": "Twoja przeglądarka nie obsługuje %(brand)s", - "%(brand)s uses advanced browser features which aren't supported by your current browser.": "%(brand)s używa zaawansowanych funkcji przeglądarki, które nie są dostępne w twojej przeglądarce." + "%(brand)s uses advanced browser features which aren't supported by your current browser.": "%(brand)s używa zaawansowanych funkcji przeglądarki, które nie są dostępne w twojej przeglądarce.", + "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" } From 325ddbf5cade96188297e2d90478df4d10ad9223 Mon Sep 17 00:00:00 2001 From: Knugi Date: Sun, 18 Oct 2020 03:20:54 +0000 Subject: [PATCH 021/119] Translated using Weblate (Chinese (Traditional)) Currently translated at 100.0% (33 of 33 strings) Translation: Element Web/element-web Translate-URL: https://translate.element.io/projects/element-web/element-web/zh_Hant/ --- src/i18n/strings/zh_Hant.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/i18n/strings/zh_Hant.json b/src/i18n/strings/zh_Hant.json index b054181197b..f9eca46ba93 100644 --- a/src/i18n/strings/zh_Hant.json +++ b/src/i18n/strings/zh_Hant.json @@ -32,5 +32,5 @@ "Your Element configuration contains invalid JSON. Please correct the problem and reload the page.": "Element 的配置中包含無效JSON，請更正錯誤並重新加載網頁。", "Your browser can't run %(brand)s": "當前瀏覽器無法運行%(brand)s", "%(brand)s uses advanced browser features which aren't supported by your current browser.": "當前瀏覽器不支持%(brand)s使用的高級特性。", - "Powered by Matrix": "威力本源 Matrix" + "Powered by Matrix": "由 Matrix 提供" } From 94ffd69ce4dab813988978d9a64192bc65c303ba Mon Sep 17 00:00:00 2001 From: Slavi Pantaleev Date: Sun, 18 Oct 2020 09:32:56 +0000 Subject: [PATCH 022/119] Translated using Weblate (Bulgarian) Currently translated at 100.0% (33 of 33 strings) Translation: Element Web/element-web Translate-URL: https://translate.element.io/projects/element-web/element-web/bg/ --- src/i18n/strings/bg.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/i18n/strings/bg.json b/src/i18n/strings/bg.json index bc60010669a..b8d9db3e384 100644 --- a/src/i18n/strings/bg.json +++ b/src/i18n/strings/bg.json @@ -31,5 +31,6 @@ "Download Completed": "Свалянето завърши", "Open": "Отвори", "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 използва модерни функции на браузъра, които не се поддържат от Вашия." + "%(brand)s uses advanced browser features which aren't supported by your current browser.": "%(brand)s използва модерни функции на браузъра, които не се поддържат от Вашия.", + "Powered by Matrix": "Базирано на Matrix" } From dfb1579625d31c2475daf839f6d0b72815aee0f2 Mon Sep 17 00:00:00 2001 From: "J. Ryan Stinnett" Date: Mon, 19 Oct 2020 16:43:55 +0100 Subject: [PATCH 023/119] Adjust for new widget messaging APIs As part of changing to the `events` package, the API surface changed slightly. Related to https://github.com/vector-im/element-web/issues/15493 --- src/vector/jitsi/index.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/vector/jitsi/index.ts b/src/vector/jitsi/index.ts index e1521f4ee7f..aa8cb6585c4 100644 --- a/src/vector/jitsi/index.ts +++ b/src/vector/jitsi/index.ts @@ -76,7 +76,7 @@ let meetApi: any; // JitsiMeetExternalAPI widgetApi.requestCapabilities(VideoConferenceCapabilities); readyPromise = Promise.all([ new Promise(resolve => { - widgetApi.once>(`action:${ElementWidgetActions.ClientReady}`, ev => { + widgetApi.once(`action:${ElementWidgetActions.ClientReady}`, ev => { ev.preventDefault(); widgetApi.transport.reply(ev.detail, {}); resolve(); @@ -113,7 +113,7 @@ let meetApi: any; // JitsiMeetExternalAPI // TODO: register widgetApi listeners for PTT controls (https://github.com/vector-im/riot-web/issues/12795) - widgetApi.addEventListener(`action:${ElementWidgetActions.HangupCall}`, + widgetApi.on(`action:${ElementWidgetActions.HangupCall}`, (ev: CustomEvent) => { if (meetApi) meetApi.executeCommand('hangup'); widgetApi.transport.reply(ev.detail, {}); // ack From 0f76c858acc3995a68990550e62b5849c49e8f98 Mon Sep 17 00:00:00 2001 From: "J. Ryan Stinnett" Date: Mon, 19 Oct 2020 16:57:18 +0100 Subject: [PATCH 024/119] Upgrade widget API --- package.json | 2 +- yarn.lock | 17 ++++++++++++----- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index 10b146781c4..8a06b3c5820 100644 --- a/package.json +++ b/package.json @@ -62,7 +62,7 @@ "jsrsasign": "^9.1.5", "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop", "matrix-react-sdk": "github:matrix-org/matrix-react-sdk#develop", - "matrix-widget-api": "^0.1.0-beta.2", + "matrix-widget-api": "^0.1.0-beta.5", "olm": "https://packages.matrix.org/npm/olm/olm-3.2.1.tgz", "prop-types": "^15.7.2", "react": "^16.9.0", diff --git a/yarn.lock b/yarn.lock index 4aeeb3d6945..dc898b10e2e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4783,6 +4783,11 @@ events@^3.0.0: resolved "https://registry.yarnpkg.com/events/-/events-3.1.0.tgz#84279af1b34cb75aa88bf5ff291f6d0bd9b31a59" integrity sha512-Rv+u8MLHNOdMjTAFeT3nCjHn2aGlx435FP/sDHNaRhDEMwyI/aB22Kj2qIN8R0cw3z28psEQLYwxVKLsKrMgWg== +events@^3.2.0: + version "3.2.0" + resolved "https://registry.yarnpkg.com/events/-/events-3.2.0.tgz#93b87c18f8efcd4202a461aec4dfc0556b639379" + integrity sha512-/46HWwbfCX2xTawVfkKLGxMifJYQBWMwY1mjywRtb4c9x8l5NP3KoJtnIOiL1hfdRkIuYhETxQlo62IF8tcnlg== + eventsource@^1.0.7: version "1.0.7" resolved "https://registry.yarnpkg.com/eventsource/-/eventsource-1.0.7.tgz#8fbc72c93fcd34088090bc0a4e64f4b5cee6d8d0" @@ -7980,16 +7985,18 @@ matrix-react-test-utils@^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-widget-api@^0.1.0-beta.2: - version "0.1.0-beta.2" - resolved "https://registry.yarnpkg.com/matrix-widget-api/-/matrix-widget-api-0.1.0-beta.2.tgz#367da1ccd26b711f73fc5b6e02edf55ac2ea2692" - integrity sha512-q5g5RZN+RRjM4HmcJ+LYoQAYrB1wzyERmoQ+LvKbTV/+9Ov36Kp0QEP8CleSXEd5WLp6bkRlt60axDaY6pWGmg== - matrix-widget-api@^0.1.0-beta.3: version "0.1.0-beta.3" resolved "https://registry.yarnpkg.com/matrix-widget-api/-/matrix-widget-api-0.1.0-beta.3.tgz#356965ca357172ee056e3fd86fd96879b059a114" integrity sha512-j7nxdhLQfdU6snsdBA29KQR0DmT8/vl6otOvGqPCV0OCHpq1312cP79Eg4JzJKIFI3A76Qha3nYx6G9/aapwXg== +matrix-widget-api@^0.1.0-beta.5: + version "0.1.0-beta.5" + resolved "https://registry.yarnpkg.com/matrix-widget-api/-/matrix-widget-api-0.1.0-beta.5.tgz#dd7f24a177aa590d812bd4e92e2c3ac225c5557e" + integrity sha512-J3GBJtVMFuEM/EWFylc0IlkPjdgmWxrkGYPaZ0LSmxp+OlNJxYfnWPR6F6HveW+Z8C1i0vq+BTueofSqKv2zDg== + dependencies: + events "^3.2.0" + md5.js@^1.3.4: version "1.3.5" resolved "https://registry.yarnpkg.com/md5.js/-/md5.js-1.3.5.tgz#b5d07b8e3216e3e27cd728d72f70d1e6a342005f" From 06aa5a9aa9128459c050b139dd74aecf634d0100 Mon Sep 17 00:00:00 2001 From: "J. Ryan Stinnett" Date: Mon, 19 Oct 2020 17:08:07 +0100 Subject: [PATCH 025/119] Shake lock file --- yarn.lock | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/yarn.lock b/yarn.lock index dc898b10e2e..71d43659935 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4778,12 +4778,7 @@ eventemitter3@^4.0.0: resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-4.0.4.tgz#b5463ace635a083d018bdc7c917b4c5f10a85384" integrity sha512-rlaVLnVxtxvoyLsQQFBx53YmXHDxRIzzTLbdfxqi4yocpSjAxXwkU0cScM5JgSKMqEhrZpnvQ2D9gjylR0AimQ== -events@^3.0.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/events/-/events-3.1.0.tgz#84279af1b34cb75aa88bf5ff291f6d0bd9b31a59" - integrity sha512-Rv+u8MLHNOdMjTAFeT3nCjHn2aGlx435FP/sDHNaRhDEMwyI/aB22Kj2qIN8R0cw3z28psEQLYwxVKLsKrMgWg== - -events@^3.2.0: +events@^3.0.0, events@^3.2.0: version "3.2.0" resolved "https://registry.yarnpkg.com/events/-/events-3.2.0.tgz#93b87c18f8efcd4202a461aec4dfc0556b639379" integrity sha512-/46HWwbfCX2xTawVfkKLGxMifJYQBWMwY1mjywRtb4c9x8l5NP3KoJtnIOiL1hfdRkIuYhETxQlo62IF8tcnlg== @@ -7985,12 +7980,7 @@ matrix-react-test-utils@^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-widget-api@^0.1.0-beta.3: - version "0.1.0-beta.3" - resolved "https://registry.yarnpkg.com/matrix-widget-api/-/matrix-widget-api-0.1.0-beta.3.tgz#356965ca357172ee056e3fd86fd96879b059a114" - integrity sha512-j7nxdhLQfdU6snsdBA29KQR0DmT8/vl6otOvGqPCV0OCHpq1312cP79Eg4JzJKIFI3A76Qha3nYx6G9/aapwXg== - -matrix-widget-api@^0.1.0-beta.5: +matrix-widget-api@^0.1.0-beta.3, matrix-widget-api@^0.1.0-beta.5: version "0.1.0-beta.5" resolved "https://registry.yarnpkg.com/matrix-widget-api/-/matrix-widget-api-0.1.0-beta.5.tgz#dd7f24a177aa590d812bd4e92e2c3ac225c5557e" integrity sha512-J3GBJtVMFuEM/EWFylc0IlkPjdgmWxrkGYPaZ0LSmxp+OlNJxYfnWPR6F6HveW+Z8C1i0vq+BTueofSqKv2zDg== From ea4985819fa336fd6f4ed3e3f62cb2c787991ae1 Mon Sep 17 00:00:00 2001 From: "J. Ryan Stinnett" Date: Mon, 19 Oct 2020 16:43:55 +0100 Subject: [PATCH 026/119] Adjust for new widget messaging APIs As part of changing to the `events` package, the API surface changed slightly. Related to https://github.com/vector-im/element-web/issues/15493 --- src/vector/jitsi/index.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/vector/jitsi/index.ts b/src/vector/jitsi/index.ts index e1521f4ee7f..aa8cb6585c4 100644 --- a/src/vector/jitsi/index.ts +++ b/src/vector/jitsi/index.ts @@ -76,7 +76,7 @@ let meetApi: any; // JitsiMeetExternalAPI widgetApi.requestCapabilities(VideoConferenceCapabilities); readyPromise = Promise.all([ new Promise(resolve => { - widgetApi.once>(`action:${ElementWidgetActions.ClientReady}`, ev => { + widgetApi.once(`action:${ElementWidgetActions.ClientReady}`, ev => { ev.preventDefault(); widgetApi.transport.reply(ev.detail, {}); resolve(); @@ -113,7 +113,7 @@ let meetApi: any; // JitsiMeetExternalAPI // TODO: register widgetApi listeners for PTT controls (https://github.com/vector-im/riot-web/issues/12795) - widgetApi.addEventListener(`action:${ElementWidgetActions.HangupCall}`, + widgetApi.on(`action:${ElementWidgetActions.HangupCall}`, (ev: CustomEvent) => { if (meetApi) meetApi.executeCommand('hangup'); widgetApi.transport.reply(ev.detail, {}); // ack From 2d97ff4eba96d9d45f174a8492c384af80490b87 Mon Sep 17 00:00:00 2001 From: "J. Ryan Stinnett" Date: Mon, 19 Oct 2020 16:57:18 +0100 Subject: [PATCH 027/119] Upgrade widget API --- package.json | 2 +- yarn.lock | 17 ++++++++++++----- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index b80ff39b365..2bd69c44d06 100644 --- a/package.json +++ b/package.json @@ -62,7 +62,7 @@ "jsrsasign": "^9.1.5", "matrix-js-sdk": "8.5.0", "matrix-react-sdk": "3.6.0", - "matrix-widget-api": "^0.1.0-beta.2", + "matrix-widget-api": "^0.1.0-beta.5", "olm": "https://packages.matrix.org/npm/olm/olm-3.2.1.tgz", "prop-types": "^15.7.2", "react": "^16.9.0", diff --git a/yarn.lock b/yarn.lock index 08dff379512..a781d4f6492 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4783,6 +4783,11 @@ events@^3.0.0: resolved "https://registry.yarnpkg.com/events/-/events-3.1.0.tgz#84279af1b34cb75aa88bf5ff291f6d0bd9b31a59" integrity sha512-Rv+u8MLHNOdMjTAFeT3nCjHn2aGlx435FP/sDHNaRhDEMwyI/aB22Kj2qIN8R0cw3z28psEQLYwxVKLsKrMgWg== +events@^3.2.0: + version "3.2.0" + resolved "https://registry.yarnpkg.com/events/-/events-3.2.0.tgz#93b87c18f8efcd4202a461aec4dfc0556b639379" + integrity sha512-/46HWwbfCX2xTawVfkKLGxMifJYQBWMwY1mjywRtb4c9x8l5NP3KoJtnIOiL1hfdRkIuYhETxQlo62IF8tcnlg== + eventsource@^1.0.7: version "1.0.7" resolved "https://registry.yarnpkg.com/eventsource/-/eventsource-1.0.7.tgz#8fbc72c93fcd34088090bc0a4e64f4b5cee6d8d0" @@ -7982,16 +7987,18 @@ matrix-react-test-utils@^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-widget-api@^0.1.0-beta.2: - version "0.1.0-beta.2" - resolved "https://registry.yarnpkg.com/matrix-widget-api/-/matrix-widget-api-0.1.0-beta.2.tgz#367da1ccd26b711f73fc5b6e02edf55ac2ea2692" - integrity sha512-q5g5RZN+RRjM4HmcJ+LYoQAYrB1wzyERmoQ+LvKbTV/+9Ov36Kp0QEP8CleSXEd5WLp6bkRlt60axDaY6pWGmg== - matrix-widget-api@^0.1.0-beta.3: version "0.1.0-beta.3" resolved "https://registry.yarnpkg.com/matrix-widget-api/-/matrix-widget-api-0.1.0-beta.3.tgz#356965ca357172ee056e3fd86fd96879b059a114" integrity sha512-j7nxdhLQfdU6snsdBA29KQR0DmT8/vl6otOvGqPCV0OCHpq1312cP79Eg4JzJKIFI3A76Qha3nYx6G9/aapwXg== +matrix-widget-api@^0.1.0-beta.5: + version "0.1.0-beta.5" + resolved "https://registry.yarnpkg.com/matrix-widget-api/-/matrix-widget-api-0.1.0-beta.5.tgz#dd7f24a177aa590d812bd4e92e2c3ac225c5557e" + integrity sha512-J3GBJtVMFuEM/EWFylc0IlkPjdgmWxrkGYPaZ0LSmxp+OlNJxYfnWPR6F6HveW+Z8C1i0vq+BTueofSqKv2zDg== + dependencies: + events "^3.2.0" + md5.js@^1.3.4: version "1.3.5" resolved "https://registry.yarnpkg.com/md5.js/-/md5.js-1.3.5.tgz#b5d07b8e3216e3e27cd728d72f70d1e6a342005f" From 55153ba7d22bd7fa5e73f0d8d4f13da684873882 Mon Sep 17 00:00:00 2001 From: "J. Ryan Stinnett" Date: Mon, 19 Oct 2020 17:08:07 +0100 Subject: [PATCH 028/119] Shake lock file --- yarn.lock | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/yarn.lock b/yarn.lock index a781d4f6492..8371b9a3e3b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4778,12 +4778,7 @@ eventemitter3@^4.0.0: resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-4.0.4.tgz#b5463ace635a083d018bdc7c917b4c5f10a85384" integrity sha512-rlaVLnVxtxvoyLsQQFBx53YmXHDxRIzzTLbdfxqi4yocpSjAxXwkU0cScM5JgSKMqEhrZpnvQ2D9gjylR0AimQ== -events@^3.0.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/events/-/events-3.1.0.tgz#84279af1b34cb75aa88bf5ff291f6d0bd9b31a59" - integrity sha512-Rv+u8MLHNOdMjTAFeT3nCjHn2aGlx435FP/sDHNaRhDEMwyI/aB22Kj2qIN8R0cw3z28psEQLYwxVKLsKrMgWg== - -events@^3.2.0: +events@^3.0.0, events@^3.2.0: version "3.2.0" resolved "https://registry.yarnpkg.com/events/-/events-3.2.0.tgz#93b87c18f8efcd4202a461aec4dfc0556b639379" integrity sha512-/46HWwbfCX2xTawVfkKLGxMifJYQBWMwY1mjywRtb4c9x8l5NP3KoJtnIOiL1hfdRkIuYhETxQlo62IF8tcnlg== @@ -7987,12 +7982,7 @@ matrix-react-test-utils@^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-widget-api@^0.1.0-beta.3: - version "0.1.0-beta.3" - resolved "https://registry.yarnpkg.com/matrix-widget-api/-/matrix-widget-api-0.1.0-beta.3.tgz#356965ca357172ee056e3fd86fd96879b059a114" - integrity sha512-j7nxdhLQfdU6snsdBA29KQR0DmT8/vl6otOvGqPCV0OCHpq1312cP79Eg4JzJKIFI3A76Qha3nYx6G9/aapwXg== - -matrix-widget-api@^0.1.0-beta.5: +matrix-widget-api@^0.1.0-beta.3, matrix-widget-api@^0.1.0-beta.5: version "0.1.0-beta.5" resolved "https://registry.yarnpkg.com/matrix-widget-api/-/matrix-widget-api-0.1.0-beta.5.tgz#dd7f24a177aa590d812bd4e92e2c3ac225c5557e" integrity sha512-J3GBJtVMFuEM/EWFylc0IlkPjdgmWxrkGYPaZ0LSmxp+OlNJxYfnWPR6F6HveW+Z8C1i0vq+BTueofSqKv2zDg== From 593a56e2d760ce0f951a711164339f57df2975bc Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Mon, 19 Oct 2020 18:51:16 +0100 Subject: [PATCH 029/119] Jitsi accept theme variable and restyle Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- src/vector/jitsi/index.scss | 20 ++++++++++++++++---- src/vector/jitsi/index.ts | 5 +++++ 2 files changed, 21 insertions(+), 4 deletions(-) diff --git a/src/vector/jitsi/index.scss b/src/vector/jitsi/index.scss index 9b5f4b5b920..a4ae84cacf4 100644 --- a/src/vector/jitsi/index.scss +++ b/src/vector/jitsi/index.scss @@ -23,11 +23,19 @@ limitations under the License. src: url('~matrix-react-sdk/res/fonts/Nunito/Nunito-Regular.ttf') format('truetype'); } -$fg-color: #edf3ff; +$dark-fg: #edf3ff; +$dark-bg: rgba(141, 151, 165, 0.2); +$light-fg: #2e2f32; +$light-bg: #fff; body { font-family: Nunito, Arial, Helvetica, sans-serif; - background-color: #181b21; - color: $fg-color; + background-color: $dark-bg; + color: $dark-fg; +} + +body.theme-light { + background-color: $light-bg; + color: $light-fg; } body, html { @@ -82,7 +90,7 @@ body, html { &::before { content: ''; background-size: contain; - background-color: $fg-color; + background-color: $dark-fg; mask-repeat: no-repeat; mask-position: center; mask-image: url("~matrix-react-sdk/res/img/element-icons/call/video-call.svg"); @@ -93,3 +101,7 @@ body, html { margin: 0 auto; // center } } + +body.theme-light .icon::before { + background-color: $light-fg; +} diff --git a/src/vector/jitsi/index.ts b/src/vector/jitsi/index.ts index aa8cb6585c4..6aeba8f7aaf 100644 --- a/src/vector/jitsi/index.ts +++ b/src/vector/jitsi/index.ts @@ -67,6 +67,11 @@ let meetApi: any; // JitsiMeetExternalAPI // out into a browser. const parentUrl = qsParam('parentUrl', true); const widgetId = qsParam('widgetId', true); + const theme = qsParam('theme', true); + + if (theme) { + document.body.classList.add(`theme-${theme}`); + } // Set this up as early as possible because Element will be hitting it almost immediately. let readyPromise: Promise<[void, void]>; From 2716629642820ac1d20877d2e5a3b0daaac5c6b7 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Tue, 20 Oct 2020 11:38:05 +0100 Subject: [PATCH 030/119] Upgrade matrix-react-sdk to 3.6.1 --- package.json | 2 +- yarn.lock | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/package.json b/package.json index 2bd69c44d06..6f0f9b99aae 100644 --- a/package.json +++ b/package.json @@ -61,7 +61,7 @@ "highlight.js": "^9.13.1", "jsrsasign": "^9.1.5", "matrix-js-sdk": "8.5.0", - "matrix-react-sdk": "3.6.0", + "matrix-react-sdk": "3.6.1", "matrix-widget-api": "^0.1.0-beta.5", "olm": "https://packages.matrix.org/npm/olm/olm-3.2.1.tgz", "prop-types": "^15.7.2", diff --git a/yarn.lock b/yarn.lock index 8371b9a3e3b..601bbb8ff55 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7921,10 +7921,10 @@ matrix-mock-request@^1.2.3: bluebird "^3.5.0" expect "^1.20.2" -matrix-react-sdk@3.6.0: - version "3.6.0" - resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.6.0.tgz#fbac180f8a8681bd7ca80de915dc25bf225fdac8" - integrity sha512-14/Qo6zS6daPtNNVVhL2Uk6Z/k/KWGw4fsE3U4aVA1dupyOaPnEvPAjkvuRh3kzRI8b5sjXJvQCL/tuoxeInLg== +matrix-react-sdk@3.6.1: + version "3.6.1" + resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.6.1.tgz#bbad45b72b3f62c91fa5bcecfec333ee67bd4428" + integrity sha512-tuBTSbkxqY7hl1CqF9SbIYezUz64QsbnMuTkFnAiJrbyq8BFfcUW5/JQAME2epZDiP/6Kzc6y+tTCfZfQ6sQzQ== dependencies: "@babel/runtime" "^7.10.5" await-lock "^2.0.1" @@ -7952,7 +7952,7 @@ matrix-react-sdk@3.6.0: linkifyjs "^2.1.9" lodash "^4.17.19" matrix-js-sdk "8.5.0" - matrix-widget-api "^0.1.0-beta.3" + matrix-widget-api "^0.1.0-beta.5" minimist "^1.2.5" pako "^1.0.11" parse5 "^5.1.1" @@ -7982,7 +7982,7 @@ matrix-react-test-utils@^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-widget-api@^0.1.0-beta.3, matrix-widget-api@^0.1.0-beta.5: +matrix-widget-api@^0.1.0-beta.5: version "0.1.0-beta.5" resolved "https://registry.yarnpkg.com/matrix-widget-api/-/matrix-widget-api-0.1.0-beta.5.tgz#dd7f24a177aa590d812bd4e92e2c3ac225c5557e" integrity sha512-J3GBJtVMFuEM/EWFylc0IlkPjdgmWxrkGYPaZ0LSmxp+OlNJxYfnWPR6F6HveW+Z8C1i0vq+BTueofSqKv2zDg== From 847c15b2cdb85be00372e970dd53306a2c00a249 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Tue, 20 Oct 2020 11:40:07 +0100 Subject: [PATCH 031/119] Prepare changelog for v1.7.10 --- CHANGELOG.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6fd8102a02c..5b800393962 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,11 @@ +Changes in [1.7.10](https://github.com/vector-im/element-web/releases/tag/v1.7.10) (2020-10-20) +=============================================================================================== +[Full Changelog](https://github.com/vector-im/element-web/compare/v1.7.9...v1.7.10) + + * [Release] Adjust for new widget messaging APIs + [\#15497](https://github.com/vector-im/element-web/pull/15497) + * Upgrade to React SDK 3.6.1 + Changes in [1.7.9](https://github.com/vector-im/element-web/releases/tag/v1.7.9) (2020-10-12) ============================================================================================= [Full Changelog](https://github.com/vector-im/element-web/compare/v1.7.9-rc.1...v1.7.9) From 588566cae788a63b7f07d1bea448d835a70a97d6 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Tue, 20 Oct 2020 11:40:08 +0100 Subject: [PATCH 032/119] v1.7.10 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 6f0f9b99aae..2cfd051b948 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "riot-web", "productName": "Riot", - "version": "1.7.9", + "version": "1.7.10", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "repository": { From a4e28cce88eb2f4ac5eb2a327343c4fc44e4940b Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Tue, 20 Oct 2020 11:46:35 +0100 Subject: [PATCH 033/119] 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 99a82e646ca..0db385dc333 100644 --- a/package.json +++ b/package.json @@ -61,7 +61,7 @@ "highlight.js": "^9.13.1", "jsrsasign": "^9.1.5", "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop", - "matrix-react-sdk": "3.6.1", + "matrix-react-sdk": "github:matrix-org/matrix-react-sdk#develop", "matrix-widget-api": "^0.1.0-beta.5", "olm": "https://packages.matrix.org/npm/olm/olm-3.2.1.tgz", "prop-types": "^15.7.2", diff --git a/yarn.lock b/yarn.lock index ffd1e720ed9..8661f296505 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7898,21 +7898,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.5.0: - version "8.5.0" - resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-8.5.0.tgz#02d77e0e95fe32dcc74e0a94707f9103badfdca5" - integrity sha512-RJCqK/QkesL+63rX4C4mShEFw/ZR20D1UMw1RKY8pQhv1/7Skz+v5BTv/UCqG45E3rRYMarNOwy13CZ+yq33FA== - dependencies: - "@babel/runtime" "^7.11.2" - another-json "^0.2.0" - browser-request "^0.3.3" - bs58 "^4.0.1" - content-type "^1.0.4" - loglevel "^1.7.0" - qs "^6.9.4" - request "^2.88.2" - unhomoglyph "^1.0.6" - "matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop": version "8.5.0" resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/9f713781cdfea2349115ffaac2d665e8b07fd5dc" @@ -7935,10 +7920,9 @@ matrix-mock-request@^1.2.3: bluebird "^3.5.0" expect "^1.20.2" -matrix-react-sdk@3.6.1: +"matrix-react-sdk@github:matrix-org/matrix-react-sdk#develop": version "3.6.1" - resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.6.1.tgz#bbad45b72b3f62c91fa5bcecfec333ee67bd4428" - integrity sha512-tuBTSbkxqY7hl1CqF9SbIYezUz64QsbnMuTkFnAiJrbyq8BFfcUW5/JQAME2epZDiP/6Kzc6y+tTCfZfQ6sQzQ== + resolved "https://codeload.github.com/matrix-org/matrix-react-sdk/tar.gz/5caad82f9fdbd8b0e4bb6aedfe2827f0a952b9e7" dependencies: "@babel/runtime" "^7.10.5" await-lock "^2.0.1" @@ -7965,7 +7949,7 @@ matrix-react-sdk@3.6.1: is-ip "^2.0.0" linkifyjs "^2.1.9" lodash "^4.17.19" - matrix-js-sdk "8.5.0" + matrix-js-sdk "github:matrix-org/matrix-js-sdk#develop" matrix-widget-api "^0.1.0-beta.5" minimist "^1.2.5" pako "^1.0.11" From 78dd07cbfd6aba2425082877f03bd661378f606a Mon Sep 17 00:00:00 2001 From: "J. Ryan Stinnett" Date: Tue, 20 Oct 2020 11:57:02 +0100 Subject: [PATCH 034/119] Skip editor confirmation of upgrades In practice, the upgrades are always fine, and this editor prompt just adds delays. --- release.sh | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/release.sh b/release.sh index 79da9301339..a5fb9006989 100755 --- a/release.sh +++ b/release.sh @@ -38,9 +38,7 @@ do echo "Upgrading $i to $latestver..." yarn add -E $i@$latestver git add -u - # The `-e` flag opens the editor and gives you a chance to check - # the upgrade for correctness. - git commit -m "Upgrade $i to $latestver" -e + git commit -m "Upgrade $i to $latestver" fi fi done From 6420120dd4616b8d9cfda147cb3557d018e2a2fd Mon Sep 17 00:00:00 2001 From: "J. Ryan Stinnett" Date: Wed, 21 Oct 2020 13:16:43 +0100 Subject: [PATCH 035/119] Update Weblate URL --- README.md | 2 +- docs/translating.md | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index 429ad5046ef..93494dcf0df 100644 --- a/README.md +++ b/README.md @@ -333,7 +333,7 @@ To add a new translation, head to the [translating doc](docs/translating.md). For a developer guide, see the [translating dev doc](docs/translating-dev.md). -[translationsstatus](https://translate.riot.im/engage/element-web/?utm_source=widget) +[translationsstatus](https://translate.element.io/engage/element-web/?utm_source=widget) Triaging issues =============== diff --git a/docs/translating.md b/docs/translating.md index 1a00e630024..6907780cd39 100644 --- a/docs/translating.md +++ b/docs/translating.md @@ -6,27 +6,27 @@ - Be able to understand English - Be able to understand the language you want to translate Element into -## Step 0: Join #riotweb-translations:matrix.org +## Step 0: Join #element-translations:matrix.org -1. Come and join https://matrix.to/#/#riotweb-translations:matrix.org +1. Come and join https://matrix.to/#/#element-translations:matrix.org 2. Read scrollback and/or ask if anyone else is working on your language, and co-ordinate if needed. In general little-or-no coordination is needed though :) ## Step 1: Preparing your Weblate Profile -1. Head to https://translate.riot.im and register either via Github or email +1. Head to https://translate.element.io and register either via Github or email 2. After registering check if you got an email to verify your account and click the link (if there is none head to step 1.4) 3. Log into weblate -4. Head to https://translate.riot.im/accounts/profile/ and select the languages you know and maybe another language you know too. -6. Head to https://translate.riot.im/accounts/profile/#subscriptions and select Element Web as Project +4. Head to https://translate.element.io/accounts/profile/ and select the languages you know and maybe another language you know too. +6. Head to https://translate.element.io/accounts/profile/#subscriptions and select Element Web as Project ## How to check if your language already is being translated -Go to https://translate.riot.im/projects/riot-web/ and visit the 2 sub-projects. +Go to https://translate.element.io/projects/riot-web/ and visit the 2 sub-projects. If your language is listed go to Step 2a and if not go to Step 2b ## Step 2a: Helping on existing languages. -1. Head to one of the projects listed https://translate.riot.im/projects/riot-web/ +1. Head to one of the projects listed https://translate.element.io/projects/riot-web/ 2. Click on the ``translate`` button on the right side of your language 3. Fill in the translations in the writeable field. You will see the original English string and the string of your second language above. @@ -34,7 +34,7 @@ Head to the explanations under Steb 2b ## Step 2b: Adding a new language -1. Go to one of the projects listed https://translate.riot.im/projects/riot-web/ +1. Go to one of the projects listed https://translate.element.io/projects/riot-web/ 2. Click the ``Start new translation`` button at the bottom 3. Select a language 4. Start translating like in 2a.3 From 4d2e4d30ca883c5447084df2f027c737518453bc Mon Sep 17 00:00:00 2001 From: "J. Ryan Stinnett" Date: Wed, 21 Oct 2020 13:23:38 +0100 Subject: [PATCH 036/119] Update translation project names --- docs/translating.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/translating.md b/docs/translating.md index 6907780cd39..cdfb48f25e4 100644 --- a/docs/translating.md +++ b/docs/translating.md @@ -21,12 +21,12 @@ ## How to check if your language already is being translated -Go to https://translate.element.io/projects/riot-web/ and visit the 2 sub-projects. +Go to https://translate.element.io/projects/element-web/ and visit the 2 sub-projects. If your language is listed go to Step 2a and if not go to Step 2b ## Step 2a: Helping on existing languages. -1. Head to one of the projects listed https://translate.element.io/projects/riot-web/ +1. Head to one of the projects listed https://translate.element.io/projects/element-web/ 2. Click on the ``translate`` button on the right side of your language 3. Fill in the translations in the writeable field. You will see the original English string and the string of your second language above. @@ -34,7 +34,7 @@ Head to the explanations under Steb 2b ## Step 2b: Adding a new language -1. Go to one of the projects listed https://translate.element.io/projects/riot-web/ +1. Go to one of the projects listed https://translate.element.io/projects/element-web/ 2. Click the ``Start new translation`` button at the bottom 3. Select a language 4. Start translating like in 2a.3 From 6f6c6d7b7573afb864eb230117f1df501de8b7fa Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Wed, 21 Oct 2020 14:47:40 +0100 Subject: [PATCH 037/119] Upgrade matrix-js-sdk to 9.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 0db385dc333..edb45b59338 100644 --- a/package.json +++ b/package.json @@ -60,7 +60,7 @@ "gfm.css": "^1.1.2", "highlight.js": "^9.13.1", "jsrsasign": "^9.1.5", - "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop", + "matrix-js-sdk": "9.0.0-rc.1", "matrix-react-sdk": "github:matrix-org/matrix-react-sdk#develop", "matrix-widget-api": "^0.1.0-beta.5", "olm": "https://packages.matrix.org/npm/olm/olm-3.2.1.tgz", diff --git a/yarn.lock b/yarn.lock index 8661f296505..9e3a3412b54 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7898,6 +7898,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@9.0.0-rc.1: + version "9.0.0-rc.1" + resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-9.0.0-rc.1.tgz#d74638244dcdcea26f8b73f56883f6f05b613e7e" + integrity sha512-FWY6q2ahF0oRTEMtld8T9z6eLyc6K/4x9MJxYysxvgAnIsAVQNj78MbTX3SCAawjfv4JpwdaSFn8o2ZyqpW4yw== + dependencies: + "@babel/runtime" "^7.11.2" + another-json "^0.2.0" + browser-request "^0.3.3" + bs58 "^4.0.1" + content-type "^1.0.4" + loglevel "^1.7.0" + qs "^6.9.4" + request "^2.88.2" + unhomoglyph "^1.0.6" + "matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop": version "8.5.0" resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/9f713781cdfea2349115ffaac2d665e8b07fd5dc" From d005d1f1c60083ed2585891c86e10890f169c2dc Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Wed, 21 Oct 2020 14:48:47 +0100 Subject: [PATCH 038/119] Upgrade matrix-react-sdk to 3.7.0-rc.1 --- package.json | 2 +- yarn.lock | 24 +++++++++++++----------- 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/package.json b/package.json index edb45b59338..cbf41de9f43 100644 --- a/package.json +++ b/package.json @@ -61,7 +61,7 @@ "highlight.js": "^9.13.1", "jsrsasign": "^9.1.5", "matrix-js-sdk": "9.0.0-rc.1", - "matrix-react-sdk": "github:matrix-org/matrix-react-sdk#develop", + "matrix-react-sdk": "3.7.0-rc.1", "matrix-widget-api": "^0.1.0-beta.5", "olm": "https://packages.matrix.org/npm/olm/olm-3.2.1.tgz", "prop-types": "^15.7.2", diff --git a/yarn.lock b/yarn.lock index 9e3a3412b54..f33940843af 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7898,10 +7898,10 @@ 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@9.0.0-rc.1: - version "9.0.0-rc.1" - resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-9.0.0-rc.1.tgz#d74638244dcdcea26f8b73f56883f6f05b613e7e" - integrity sha512-FWY6q2ahF0oRTEMtld8T9z6eLyc6K/4x9MJxYysxvgAnIsAVQNj78MbTX3SCAawjfv4JpwdaSFn8o2ZyqpW4yw== +matrix-js-sdk@8.5.0: + version "8.5.0" + resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-8.5.0.tgz#02d77e0e95fe32dcc74e0a94707f9103badfdca5" + integrity sha512-RJCqK/QkesL+63rX4C4mShEFw/ZR20D1UMw1RKY8pQhv1/7Skz+v5BTv/UCqG45E3rRYMarNOwy13CZ+yq33FA== dependencies: "@babel/runtime" "^7.11.2" another-json "^0.2.0" @@ -7913,9 +7913,10 @@ matrix-js-sdk@9.0.0-rc.1: request "^2.88.2" unhomoglyph "^1.0.6" -"matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop": - version "8.5.0" - resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/9f713781cdfea2349115ffaac2d665e8b07fd5dc" +matrix-js-sdk@9.0.0-rc.1: + version "9.0.0-rc.1" + resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-9.0.0-rc.1.tgz#d74638244dcdcea26f8b73f56883f6f05b613e7e" + integrity sha512-FWY6q2ahF0oRTEMtld8T9z6eLyc6K/4x9MJxYysxvgAnIsAVQNj78MbTX3SCAawjfv4JpwdaSFn8o2ZyqpW4yw== dependencies: "@babel/runtime" "^7.11.2" another-json "^0.2.0" @@ -7935,9 +7936,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.6.1" - resolved "https://codeload.github.com/matrix-org/matrix-react-sdk/tar.gz/5caad82f9fdbd8b0e4bb6aedfe2827f0a952b9e7" +matrix-react-sdk@3.7.0-rc.1: + version "3.7.0-rc.1" + resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.7.0-rc.1.tgz#f9c320a91d47a86f3cfef0fc551c7994b1444223" + integrity sha512-TBbFHjxnfRDEqndiEu7H5+M/ojwsH+yswdlv+EA9Mj0vRxXne+nZ7NkkpdwvyMr5oSvERax7GCM1h4pTrZAwmg== dependencies: "@babel/runtime" "^7.10.5" await-lock "^2.0.1" @@ -7964,7 +7966,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.5.0" matrix-widget-api "^0.1.0-beta.5" minimist "^1.2.5" pako "^1.0.11" From 9856978d0a3fe14485dbaf3e0e540fff45da4d84 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Wed, 21 Oct 2020 15:25:48 +0100 Subject: [PATCH 039/119] Upgrade matrix-react-sdk to 3.7.0-rc.2 --- package.json | 2 +- yarn.lock | 25 +++++-------------------- 2 files changed, 6 insertions(+), 21 deletions(-) diff --git a/package.json b/package.json index cbf41de9f43..0e4b6e34c1e 100644 --- a/package.json +++ b/package.json @@ -61,7 +61,7 @@ "highlight.js": "^9.13.1", "jsrsasign": "^9.1.5", "matrix-js-sdk": "9.0.0-rc.1", - "matrix-react-sdk": "3.7.0-rc.1", + "matrix-react-sdk": "3.7.0-rc.2", "matrix-widget-api": "^0.1.0-beta.5", "olm": "https://packages.matrix.org/npm/olm/olm-3.2.1.tgz", "prop-types": "^15.7.2", diff --git a/yarn.lock b/yarn.lock index f33940843af..cfdc3ec741c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7898,21 +7898,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.5.0: - version "8.5.0" - resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-8.5.0.tgz#02d77e0e95fe32dcc74e0a94707f9103badfdca5" - integrity sha512-RJCqK/QkesL+63rX4C4mShEFw/ZR20D1UMw1RKY8pQhv1/7Skz+v5BTv/UCqG45E3rRYMarNOwy13CZ+yq33FA== - dependencies: - "@babel/runtime" "^7.11.2" - another-json "^0.2.0" - browser-request "^0.3.3" - bs58 "^4.0.1" - content-type "^1.0.4" - loglevel "^1.7.0" - qs "^6.9.4" - request "^2.88.2" - unhomoglyph "^1.0.6" - matrix-js-sdk@9.0.0-rc.1: version "9.0.0-rc.1" resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-9.0.0-rc.1.tgz#d74638244dcdcea26f8b73f56883f6f05b613e7e" @@ -7936,10 +7921,10 @@ matrix-mock-request@^1.2.3: bluebird "^3.5.0" expect "^1.20.2" -matrix-react-sdk@3.7.0-rc.1: - version "3.7.0-rc.1" - resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.7.0-rc.1.tgz#f9c320a91d47a86f3cfef0fc551c7994b1444223" - integrity sha512-TBbFHjxnfRDEqndiEu7H5+M/ojwsH+yswdlv+EA9Mj0vRxXne+nZ7NkkpdwvyMr5oSvERax7GCM1h4pTrZAwmg== +matrix-react-sdk@3.7.0-rc.2: + version "3.7.0-rc.2" + resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.7.0-rc.2.tgz#cf92aa924d9513fd580adba7de1d450755df7a0e" + integrity sha512-zMWCDasvMOMOuYhkJ5kEMi8gMGP3mg9Vl8+Y805cwwqjb7HvLhJplLOrXvDazKpRlRShPUJwm+g59l3q0xXiYA== dependencies: "@babel/runtime" "^7.10.5" await-lock "^2.0.1" @@ -7966,7 +7951,7 @@ matrix-react-sdk@3.7.0-rc.1: is-ip "^2.0.0" linkifyjs "^2.1.9" lodash "^4.17.19" - matrix-js-sdk "8.5.0" + matrix-js-sdk "9.0.0-rc.1" matrix-widget-api "^0.1.0-beta.5" minimist "^1.2.5" pako "^1.0.11" From beb98e9ebb4274b839eb8d54c995072f079924e7 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Wed, 21 Oct 2020 15:30:40 +0100 Subject: [PATCH 040/119] Prepare changelog for v1.7.11-rc.1 --- CHANGELOG.md | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5b800393962..405aba759d5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,28 @@ +Changes in [1.7.11-rc.1](https://github.com/vector-im/element-web/releases/tag/v1.7.11-rc.1) (2020-10-21) +========================================================================================================= +[Full Changelog](https://github.com/vector-im/element-web/compare/v1.7.10...v1.7.11-rc.1) + + * Upgrade to React SDK 3.7.0-rc.2 and JS SDK 9.0.0-rc.1 + * Update Weblate URL + [\#15516](https://github.com/vector-im/element-web/pull/15516) + * Translations update from Weblate + [\#15517](https://github.com/vector-im/element-web/pull/15517) + * Jitsi accept theme variable and restyle + [\#15499](https://github.com/vector-im/element-web/pull/15499) + * Skip editor confirmation of upgrades + [\#15506](https://github.com/vector-im/element-web/pull/15506) + * Adjust for new widget messaging APIs + [\#15495](https://github.com/vector-im/element-web/pull/15495) + * Use HTTPS_PROXY environment variable for downloading external_api.min… + [\#15479](https://github.com/vector-im/element-web/pull/15479) + * Document customisation points + [\#15475](https://github.com/vector-im/element-web/pull/15475) + * Don't fatally end the Jitsi widget when it's not being used as a widget + [\#15466](https://github.com/vector-im/element-web/pull/15466) + * electron-platform: Pass the user/devce id pair when initializing the event + index. + [\#15455](https://github.com/vector-im/element-web/pull/15455) + Changes in [1.7.10](https://github.com/vector-im/element-web/releases/tag/v1.7.10) (2020-10-20) =============================================================================================== [Full Changelog](https://github.com/vector-im/element-web/compare/v1.7.9...v1.7.10) From 13330c5b8cef5fe5a6739802b19a81c1595933a0 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Wed, 21 Oct 2020 15:30:41 +0100 Subject: [PATCH 041/119] v1.7.11-rc.1 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 0e4b6e34c1e..47aaaed18ee 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "riot-web", "productName": "Riot", - "version": "1.7.10", + "version": "1.7.11-rc.1", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "repository": { From 5a9cc764c67bf78aee0a5aa217c437e74cf70592 Mon Sep 17 00:00:00 2001 From: MamasLT Date: Thu, 22 Oct 2020 19:00:38 +0000 Subject: [PATCH 042/119] Translated using Weblate (Lithuanian) Currently translated at 100.0% (33 of 33 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 7fbe1245426..3932a2416e6 100644 --- a/src/i18n/strings/lt.json +++ b/src/i18n/strings/lt.json @@ -31,5 +31,6 @@ "Open": "Atidaryti", "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." + "Please install Chrome, Firefox, or Safari for the best experience.": "Geriausiam veikimui suinstaliuokite Chrome, Firefox, arba Safari.", + "Powered by Matrix": "Veikia su Matrix" } From 40384ffe42f0f72b122e5a9fb0635436dcb528c3 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Mon, 26 Oct 2020 16:58:20 +0000 Subject: [PATCH 043/119] Upgrade matrix-js-sdk to 9.0.0 --- package.json | 2 +- yarn.lock | 15 +++++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index 47aaaed18ee..d82afe3eeca 100644 --- a/package.json +++ b/package.json @@ -60,7 +60,7 @@ "gfm.css": "^1.1.2", "highlight.js": "^9.13.1", "jsrsasign": "^9.1.5", - "matrix-js-sdk": "9.0.0-rc.1", + "matrix-js-sdk": "9.0.0", "matrix-react-sdk": "3.7.0-rc.2", "matrix-widget-api": "^0.1.0-beta.5", "olm": "https://packages.matrix.org/npm/olm/olm-3.2.1.tgz", diff --git a/yarn.lock b/yarn.lock index cfdc3ec741c..55f33afda63 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7898,6 +7898,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@9.0.0: + version "9.0.0" + resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-9.0.0.tgz#97d995fcb4209161a761cf59238caf52ff34882b" + integrity sha512-GEQ51wxnBfY00m39aMWVa2/sZqUFBsRWrsImr+mkXtPYs1OQVXHVipL2B3/rObOO+A+3bo7tfoaTTxhpQl2CaQ== + dependencies: + "@babel/runtime" "^7.11.2" + another-json "^0.2.0" + browser-request "^0.3.3" + bs58 "^4.0.1" + content-type "^1.0.4" + loglevel "^1.7.0" + qs "^6.9.4" + request "^2.88.2" + unhomoglyph "^1.0.6" + matrix-js-sdk@9.0.0-rc.1: version "9.0.0-rc.1" resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-9.0.0-rc.1.tgz#d74638244dcdcea26f8b73f56883f6f05b613e7e" From 059366f07ad0006ea686f4d59635a6b8af7115be Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Mon, 26 Oct 2020 17:00:07 +0000 Subject: [PATCH 044/119] Upgrade matrix-react-sdk to 3.7.0 --- package.json | 2 +- yarn.lock | 25 +++++-------------------- 2 files changed, 6 insertions(+), 21 deletions(-) diff --git a/package.json b/package.json index d82afe3eeca..12bd5b80360 100644 --- a/package.json +++ b/package.json @@ -61,7 +61,7 @@ "highlight.js": "^9.13.1", "jsrsasign": "^9.1.5", "matrix-js-sdk": "9.0.0", - "matrix-react-sdk": "3.7.0-rc.2", + "matrix-react-sdk": "3.7.0", "matrix-widget-api": "^0.1.0-beta.5", "olm": "https://packages.matrix.org/npm/olm/olm-3.2.1.tgz", "prop-types": "^15.7.2", diff --git a/yarn.lock b/yarn.lock index 55f33afda63..0c3643db586 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7913,21 +7913,6 @@ matrix-js-sdk@9.0.0: request "^2.88.2" unhomoglyph "^1.0.6" -matrix-js-sdk@9.0.0-rc.1: - version "9.0.0-rc.1" - resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-9.0.0-rc.1.tgz#d74638244dcdcea26f8b73f56883f6f05b613e7e" - integrity sha512-FWY6q2ahF0oRTEMtld8T9z6eLyc6K/4x9MJxYysxvgAnIsAVQNj78MbTX3SCAawjfv4JpwdaSFn8o2ZyqpW4yw== - dependencies: - "@babel/runtime" "^7.11.2" - another-json "^0.2.0" - browser-request "^0.3.3" - bs58 "^4.0.1" - content-type "^1.0.4" - loglevel "^1.7.0" - qs "^6.9.4" - 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" @@ -7936,10 +7921,10 @@ matrix-mock-request@^1.2.3: bluebird "^3.5.0" expect "^1.20.2" -matrix-react-sdk@3.7.0-rc.2: - version "3.7.0-rc.2" - resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.7.0-rc.2.tgz#cf92aa924d9513fd580adba7de1d450755df7a0e" - integrity sha512-zMWCDasvMOMOuYhkJ5kEMi8gMGP3mg9Vl8+Y805cwwqjb7HvLhJplLOrXvDazKpRlRShPUJwm+g59l3q0xXiYA== +matrix-react-sdk@3.7.0: + version "3.7.0" + resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.7.0.tgz#433cb3c074a696a55eca9ed6542e9111687cbd15" + integrity sha512-6cRJF96hAVPxk6I84F4cruag/i2UUkcIfJ7C1SAVUrON3DKw4Q2OTBESak54OzZcxXYxV4Dn7AKxSQdh6oSHEA== dependencies: "@babel/runtime" "^7.10.5" await-lock "^2.0.1" @@ -7966,7 +7951,7 @@ matrix-react-sdk@3.7.0-rc.2: is-ip "^2.0.0" linkifyjs "^2.1.9" lodash "^4.17.19" - matrix-js-sdk "9.0.0-rc.1" + matrix-js-sdk "9.0.0" matrix-widget-api "^0.1.0-beta.5" minimist "^1.2.5" pako "^1.0.11" From 212e4f831fce13a9fd9edc36fb935f698ed1fd6f Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Mon, 26 Oct 2020 17:19:00 +0000 Subject: [PATCH 045/119] Prepare changelog for v1.7.11 --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 405aba759d5..03ea6869321 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +Changes in [1.7.11](https://github.com/vector-im/element-web/releases/tag/v1.7.11) (2020-10-26) +=============================================================================================== +[Full Changelog](https://github.com/vector-im/element-web/compare/v1.7.11-rc.1...v1.7.11) + + * Upgrade to React SDK 3.7.0 and JS SDK 9.0.0 + Changes in [1.7.11-rc.1](https://github.com/vector-im/element-web/releases/tag/v1.7.11-rc.1) (2020-10-21) ========================================================================================================= [Full Changelog](https://github.com/vector-im/element-web/compare/v1.7.10...v1.7.11-rc.1) From 6cef14e6cc99b7550398e97ea45637b9b7caefde Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Mon, 26 Oct 2020 17:19:01 +0000 Subject: [PATCH 046/119] v1.7.11 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 12bd5b80360..8cf8e2e7ca7 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "riot-web", "productName": "Riot", - "version": "1.7.11-rc.1", + "version": "1.7.11", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "repository": { From e9b7b36c8773f3a6f03c92f227ac4e100b660d50 Mon Sep 17 00:00:00 2001 From: John Date: Sun, 25 Oct 2020 16:55:33 +0000 Subject: [PATCH 047/119] Translated using Weblate (Greek) Currently translated at 100.0% (33 of 33 strings) Translation: Element Web/element-web Translate-URL: https://translate.element.io/projects/element-web/element-web/el/ --- src/i18n/strings/el.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/i18n/strings/el.json b/src/i18n/strings/el.json index af818ddd6d5..4efc9d94404 100644 --- a/src/i18n/strings/el.json +++ b/src/i18n/strings/el.json @@ -29,5 +29,8 @@ "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": "Αποτυχία έναρξης" + "Failed to start": "Αποτυχία έναρξης", + "%(appName)s (%(browserName)s, %(osName)s)": "%(appName)s (%(browserName)s, %(osName)s)", + "%(brand)s Desktop (%(platformName)s)": "%(brand)s Desktop (%(platformName)s)", + "Missing indexeddb worker script!": "Απουσία indexeddb worker script!" } From d8a7af0e7e2ffd9fd0de09373e0f3c5ad45f189a Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Mon, 26 Oct 2020 17:22:11 +0000 Subject: [PATCH 048/119] 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 8cf8e2e7ca7..68ee3dc4637 100644 --- a/package.json +++ b/package.json @@ -60,7 +60,7 @@ "gfm.css": "^1.1.2", "highlight.js": "^9.13.1", "jsrsasign": "^9.1.5", - "matrix-js-sdk": "9.0.0", + "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop", "matrix-react-sdk": "3.7.0", "matrix-widget-api": "^0.1.0-beta.5", "olm": "https://packages.matrix.org/npm/olm/olm-3.2.1.tgz", diff --git a/yarn.lock b/yarn.lock index 0c3643db586..5b7c03f0bba 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7913,6 +7913,20 @@ matrix-js-sdk@9.0.0: request "^2.88.2" unhomoglyph "^1.0.6" +"matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop": + version "9.0.0" + resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/c416dd01a7edcca11c5224d29916a0f123dec8e6" + dependencies: + "@babel/runtime" "^7.11.2" + another-json "^0.2.0" + browser-request "^0.3.3" + bs58 "^4.0.1" + content-type "^1.0.4" + loglevel "^1.7.0" + qs "^6.9.4" + 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 90d5c202c6a9c32399142288bd414a2788b961cf Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Mon, 26 Oct 2020 17:22:22 +0000 Subject: [PATCH 049/119] 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 68ee3dc4637..c5abb10f35b 100644 --- a/package.json +++ b/package.json @@ -61,7 +61,7 @@ "highlight.js": "^9.13.1", "jsrsasign": "^9.1.5", "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop", - "matrix-react-sdk": "3.7.0", + "matrix-react-sdk": "github:matrix-org/matrix-react-sdk#develop", "matrix-widget-api": "^0.1.0-beta.5", "olm": "https://packages.matrix.org/npm/olm/olm-3.2.1.tgz", "prop-types": "^15.7.2", diff --git a/yarn.lock b/yarn.lock index 5b7c03f0bba..ebd7209deef 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7898,21 +7898,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@9.0.0: - version "9.0.0" - resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-9.0.0.tgz#97d995fcb4209161a761cf59238caf52ff34882b" - integrity sha512-GEQ51wxnBfY00m39aMWVa2/sZqUFBsRWrsImr+mkXtPYs1OQVXHVipL2B3/rObOO+A+3bo7tfoaTTxhpQl2CaQ== - dependencies: - "@babel/runtime" "^7.11.2" - another-json "^0.2.0" - browser-request "^0.3.3" - bs58 "^4.0.1" - content-type "^1.0.4" - loglevel "^1.7.0" - qs "^6.9.4" - request "^2.88.2" - unhomoglyph "^1.0.6" - "matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop": version "9.0.0" resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/c416dd01a7edcca11c5224d29916a0f123dec8e6" @@ -7935,10 +7920,9 @@ matrix-mock-request@^1.2.3: bluebird "^3.5.0" expect "^1.20.2" -matrix-react-sdk@3.7.0: +"matrix-react-sdk@github:matrix-org/matrix-react-sdk#develop": version "3.7.0" - resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.7.0.tgz#433cb3c074a696a55eca9ed6542e9111687cbd15" - integrity sha512-6cRJF96hAVPxk6I84F4cruag/i2UUkcIfJ7C1SAVUrON3DKw4Q2OTBESak54OzZcxXYxV4Dn7AKxSQdh6oSHEA== + resolved "https://codeload.github.com/matrix-org/matrix-react-sdk/tar.gz/6f37875d38ed4309324d5290424508540ed1383f" dependencies: "@babel/runtime" "^7.10.5" await-lock "^2.0.1" @@ -7965,7 +7949,7 @@ matrix-react-sdk@3.7.0: is-ip "^2.0.0" linkifyjs "^2.1.9" lodash "^4.17.19" - matrix-js-sdk "9.0.0" + matrix-js-sdk "github:matrix-org/matrix-js-sdk#develop" matrix-widget-api "^0.1.0-beta.5" minimist "^1.2.5" pako "^1.0.11" From 7c895bd8c0f1c25859c7d2e4274bfa00ef6385a0 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Tue, 27 Oct 2020 11:13:55 +0000 Subject: [PATCH 050/119] Fix theme variable handling with invalid values --- src/vector/jitsi/index.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/vector/jitsi/index.ts b/src/vector/jitsi/index.ts index 6aeba8f7aaf..a5a8be36e21 100644 --- a/src/vector/jitsi/index.ts +++ b/src/vector/jitsi/index.ts @@ -70,7 +70,7 @@ let meetApi: any; // JitsiMeetExternalAPI const theme = qsParam('theme', true); if (theme) { - document.body.classList.add(`theme-${theme}`); + document.body.classList.add(`theme-${theme.replace(" ", "_")}`); } // Set this up as early as possible because Element will be hitting it almost immediately. From 0bdf979c46030d95c22359f55fcb09162429bfac Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Tue, 27 Oct 2020 11:24:52 +0000 Subject: [PATCH 051/119] fix the Jitsi bg colour to not be transparent as the app colours may be anything and bleed through --- src/vector/jitsi/index.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/vector/jitsi/index.scss b/src/vector/jitsi/index.scss index a4ae84cacf4..2c7e020c962 100644 --- a/src/vector/jitsi/index.scss +++ b/src/vector/jitsi/index.scss @@ -24,7 +24,7 @@ limitations under the License. } $dark-fg: #edf3ff; -$dark-bg: rgba(141, 151, 165, 0.2); +$dark-bg: #363c43; $light-fg: #2e2f32; $light-bg: #fff; body { From 5de910a9eb8819998780c25baede19c49fd46293 Mon Sep 17 00:00:00 2001 From: DO4TQe1jcGNLk9GvtDKqismfsIht20JBP7bps1OzQnvTDSwYSN Date: Tue, 27 Oct 2020 00:04:51 +0000 Subject: [PATCH 052/119] Translated using Weblate (Dutch) Currently translated at 87.8% (29 of 33 strings) Translation: Element Web/element-web Translate-URL: https://translate.element.io/projects/element-web/element-web/nl/ --- src/i18n/strings/nl.json | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/i18n/strings/nl.json b/src/i18n/strings/nl.json index 32d3dac7860..a41e8f30e44 100644 --- a/src/i18n/strings/nl.json +++ b/src/i18n/strings/nl.json @@ -22,8 +22,12 @@ "%(appName)s (%(browserName)s, %(osName)s)": "%(appName)s (%(browserName)s, %(osName)s)", "Unsupported browser": "Niet-ondersteunde browser", "Please install Chrome, Firefox, or Safari for the best experience.": "Installeer Chrome, Firefox, of Safari voor de beste gebruikservaring.", - "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.": "U kunt uw huidige browser blijven gebruiken, maar sommige of alle features zouden niet kunnen werken en de uitstraling van het programma kan verkeerd zijn.", + "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.": "U kunt uw huidige browser blijven gebruiken, maar sommige of alle functies zouden niet kunnen werken en de uitstraling van het programma kan verkeerd zijn.", "I understand the risks and wish to continue": "Ik begrijp de risico's en wil verder gaan", "Go to element.io": "Ga naar element.io", - "Failed to start": "Opstarten gefaald" + "Failed to start": "Opstarten mislukt", + "Open": "Openen", + "Your Element configuration contains invalid JSON. Please correct the problem and reload the page.": "Uw Element configuratie bevat ongeldige JSON. Gelieve het probleem te corrigeren daarna de pagina te herladen.", + "Download Completed": "Download voltooid", + "Your Element is misconfigured": "Uw Element is verkeerd geconfigureerd" } From d297ee5c7e3f15bfaa5904676da5c8b26f453f0f Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Tue, 27 Oct 2020 11:13:55 +0000 Subject: [PATCH 053/119] Fix theme variable handling with invalid values --- src/vector/jitsi/index.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/vector/jitsi/index.ts b/src/vector/jitsi/index.ts index 6aeba8f7aaf..a5a8be36e21 100644 --- a/src/vector/jitsi/index.ts +++ b/src/vector/jitsi/index.ts @@ -70,7 +70,7 @@ let meetApi: any; // JitsiMeetExternalAPI const theme = qsParam('theme', true); if (theme) { - document.body.classList.add(`theme-${theme}`); + document.body.classList.add(`theme-${theme.replace(" ", "_")}`); } // Set this up as early as possible because Element will be hitting it almost immediately. From be1e4552aaf288949e292c84c1b6af09a1176431 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Tue, 27 Oct 2020 11:24:52 +0000 Subject: [PATCH 054/119] fix the Jitsi bg colour to not be transparent as the app colours may be anything and bleed through --- src/vector/jitsi/index.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/vector/jitsi/index.scss b/src/vector/jitsi/index.scss index a4ae84cacf4..2c7e020c962 100644 --- a/src/vector/jitsi/index.scss +++ b/src/vector/jitsi/index.scss @@ -24,7 +24,7 @@ limitations under the License. } $dark-fg: #edf3ff; -$dark-bg: rgba(141, 151, 165, 0.2); +$dark-bg: #363c43; $light-fg: #2e2f32; $light-bg: #fff; body { From 71206e8e3d5fcf472ee0ea279939177cd743f0ca Mon Sep 17 00:00:00 2001 From: Travis Ralston Date: Tue, 27 Oct 2020 19:23:06 -0600 Subject: [PATCH 055/119] Add documentation for new UIFeature flag regarding room history settings --- docs/config.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/config.md b/docs/config.md index e557a792146..0e45e144675 100644 --- a/docs/config.md +++ b/docs/config.md @@ -192,3 +192,5 @@ Currently, the following UI feature flags are supported: useful if accounts are managed externally. * `UIFeature.advancedEncryption` - Whether or not advanced encryption options are shown to the user. +* `UIFeature.roomHistorySettings` - Whether or not the room history settings are shown to the user. + This should only be used if the room history visibility options are managed by the server. From d64639c70a59e3c3d337897e5a8d6ccb319afd2f Mon Sep 17 00:00:00 2001 From: "J. Ryan Stinnett" Date: Wed, 28 Oct 2020 14:32:25 +0000 Subject: [PATCH 056/119] Rename Docker repo in docs We now have a Docker repo named `element-web`, so this updates docs to match. Fixes https://github.com/vector-im/element-web/issues/14930 --- Dockerfile | 2 +- README.md | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 92d35e7d9a1..fd20404eab8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ FROM node:12 as builder # Support custom branches of the react-sdk and js-sdk. This also helps us build -# images of riot-web develop. +# images of element-web develop. ARG USE_CUSTOM_SDKS=false ARG REACT_SDK_REPO="https://github.com/matrix-org/matrix-react-sdk.git" ARG REACT_SDK_BRANCH="master" diff --git a/README.md b/README.md index 93494dcf0df..c54eac9dc53 100644 --- a/README.md +++ b/README.md @@ -129,14 +129,14 @@ Running from Docker The Docker image can be used to serve element-web as a web server. The easiest way to use it is to use the prebuilt image: ```bash -docker run -p 80:80 vectorim/riot-web +docker run -p 80:80 vectorim/element-web ``` To supply your own custom `config.json`, map a volume to `/app/config.json`. For example, if your custom config was located at `/etc/element-web/config.json` then your Docker command would be: ```bash -docker run -p 80:80 -v /etc/element-web/config.json:/app/config.json vectorim/riot-web +docker run -p 80:80 -v /etc/element-web/config.json:/app/config.json vectorim/element-web ``` To build the image yourself: From 469df236d925411395fdc79b51564a563a87cf02 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Wed, 28 Oct 2020 15:13:31 +0000 Subject: [PATCH 057/119] Upgrade matrix-js-sdk to 9.0.1 --- package.json | 2 +- yarn.lock | 15 +++++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index 8cf8e2e7ca7..fac99eaa6b7 100644 --- a/package.json +++ b/package.json @@ -60,7 +60,7 @@ "gfm.css": "^1.1.2", "highlight.js": "^9.13.1", "jsrsasign": "^9.1.5", - "matrix-js-sdk": "9.0.0", + "matrix-js-sdk": "9.0.1", "matrix-react-sdk": "3.7.0", "matrix-widget-api": "^0.1.0-beta.5", "olm": "https://packages.matrix.org/npm/olm/olm-3.2.1.tgz", diff --git a/yarn.lock b/yarn.lock index 0c3643db586..79764e0e243 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7913,6 +7913,21 @@ matrix-js-sdk@9.0.0: request "^2.88.2" unhomoglyph "^1.0.6" +matrix-js-sdk@9.0.1: + version "9.0.1" + resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-9.0.1.tgz#bb84a80db0dec1c21b6867c38bb2aa3f63811d6d" + integrity sha512-D2b/pf1/0FTnJoroZhhFCo9WFv+iXELqDgEozo0mBSTbQolIXjHLDQfmhi3p7nDZxxtjWvJjVaiKiVQPjwHCrg== + dependencies: + "@babel/runtime" "^7.11.2" + another-json "^0.2.0" + browser-request "^0.3.3" + bs58 "^4.0.1" + content-type "^1.0.4" + loglevel "^1.7.0" + qs "^6.9.4" + 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 f821b7c8bbc16775b5e8ab5062d8595459e2a120 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Wed, 28 Oct 2020 15:13:55 +0000 Subject: [PATCH 058/119] Upgrade matrix-react-sdk to 3.7.1 --- package.json | 2 +- yarn.lock | 25 +++++-------------------- 2 files changed, 6 insertions(+), 21 deletions(-) diff --git a/package.json b/package.json index fac99eaa6b7..e6822c64397 100644 --- a/package.json +++ b/package.json @@ -61,7 +61,7 @@ "highlight.js": "^9.13.1", "jsrsasign": "^9.1.5", "matrix-js-sdk": "9.0.1", - "matrix-react-sdk": "3.7.0", + "matrix-react-sdk": "3.7.1", "matrix-widget-api": "^0.1.0-beta.5", "olm": "https://packages.matrix.org/npm/olm/olm-3.2.1.tgz", "prop-types": "^15.7.2", diff --git a/yarn.lock b/yarn.lock index 79764e0e243..731d02269de 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7898,21 +7898,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@9.0.0: - version "9.0.0" - resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-9.0.0.tgz#97d995fcb4209161a761cf59238caf52ff34882b" - integrity sha512-GEQ51wxnBfY00m39aMWVa2/sZqUFBsRWrsImr+mkXtPYs1OQVXHVipL2B3/rObOO+A+3bo7tfoaTTxhpQl2CaQ== - dependencies: - "@babel/runtime" "^7.11.2" - another-json "^0.2.0" - browser-request "^0.3.3" - bs58 "^4.0.1" - content-type "^1.0.4" - loglevel "^1.7.0" - qs "^6.9.4" - request "^2.88.2" - unhomoglyph "^1.0.6" - matrix-js-sdk@9.0.1: version "9.0.1" resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-9.0.1.tgz#bb84a80db0dec1c21b6867c38bb2aa3f63811d6d" @@ -7936,10 +7921,10 @@ matrix-mock-request@^1.2.3: bluebird "^3.5.0" expect "^1.20.2" -matrix-react-sdk@3.7.0: - version "3.7.0" - resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.7.0.tgz#433cb3c074a696a55eca9ed6542e9111687cbd15" - integrity sha512-6cRJF96hAVPxk6I84F4cruag/i2UUkcIfJ7C1SAVUrON3DKw4Q2OTBESak54OzZcxXYxV4Dn7AKxSQdh6oSHEA== +matrix-react-sdk@3.7.1: + version "3.7.1" + resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.7.1.tgz#0a2d9c2c7d224297277532bcf78f60984f6bc49e" + integrity sha512-JwCURRs0WBuqVQ5/0fYg19SEb2Dg8y1F93GiiCssAoMW/bbTiMA6B/moLeZDO2mQPlhqwRtAH1aeLvdKrA/q6w== dependencies: "@babel/runtime" "^7.10.5" await-lock "^2.0.1" @@ -7966,7 +7951,7 @@ matrix-react-sdk@3.7.0: is-ip "^2.0.0" linkifyjs "^2.1.9" lodash "^4.17.19" - matrix-js-sdk "9.0.0" + matrix-js-sdk "9.0.1" matrix-widget-api "^0.1.0-beta.5" minimist "^1.2.5" pako "^1.0.11" From 9d6bbef04ef735f92b546f385f68ac76d764cc6a Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Wed, 28 Oct 2020 15:18:19 +0000 Subject: [PATCH 059/119] Prepare changelog for v1.7.12 --- CHANGELOG.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 03ea6869321..5441e8b4dfb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,11 @@ +Changes in [1.7.12](https://github.com/vector-im/element-web/releases/tag/v1.7.12) (2020-10-28) +=============================================================================================== +[Full Changelog](https://github.com/vector-im/element-web/compare/v1.7.11...v1.7.12) + + * Upgrade to React SDK 3.7.1 and JS SDK 9.0.1 + * [Release] Fix Jitsi regressions with custom themes + [\#15577](https://github.com/vector-im/element-web/pull/15577) + Changes in [1.7.11](https://github.com/vector-im/element-web/releases/tag/v1.7.11) (2020-10-26) =============================================================================================== [Full Changelog](https://github.com/vector-im/element-web/compare/v1.7.11-rc.1...v1.7.11) From cc7e64375dcd006497f31241c80dbe9ed26615b6 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Wed, 28 Oct 2020 15:18:19 +0000 Subject: [PATCH 060/119] v1.7.12 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index e6822c64397..fea84b01e97 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "riot-web", "productName": "Riot", - "version": "1.7.11", + "version": "1.7.12", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "repository": { From a3fdb1c2a22135db657b7f0a76814e3e4cbc60c1 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Wed, 28 Oct 2020 15:24:11 +0000 Subject: [PATCH 061/119] 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 fea84b01e97..49bc02b17c4 100644 --- a/package.json +++ b/package.json @@ -60,7 +60,7 @@ "gfm.css": "^1.1.2", "highlight.js": "^9.13.1", "jsrsasign": "^9.1.5", - "matrix-js-sdk": "9.0.1", + "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop", "matrix-react-sdk": "3.7.1", "matrix-widget-api": "^0.1.0-beta.5", "olm": "https://packages.matrix.org/npm/olm/olm-3.2.1.tgz", diff --git a/yarn.lock b/yarn.lock index 731d02269de..92e61e65204 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7913,6 +7913,20 @@ matrix-js-sdk@9.0.1: request "^2.88.2" unhomoglyph "^1.0.6" +"matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop": + version "9.0.1" + resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/f8863d5c2488a31a093f5a1b11761d7ac3829470" + dependencies: + "@babel/runtime" "^7.11.2" + another-json "^0.2.0" + browser-request "^0.3.3" + bs58 "^4.0.1" + content-type "^1.0.4" + loglevel "^1.7.0" + qs "^6.9.4" + 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 35327ff6a41062e96b167223136b68ed7c5084a1 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Wed, 28 Oct 2020 15:24:23 +0000 Subject: [PATCH 062/119] 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 49bc02b17c4..16c014100b0 100644 --- a/package.json +++ b/package.json @@ -61,7 +61,7 @@ "highlight.js": "^9.13.1", "jsrsasign": "^9.1.5", "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop", - "matrix-react-sdk": "3.7.1", + "matrix-react-sdk": "github:matrix-org/matrix-react-sdk#develop", "matrix-widget-api": "^0.1.0-beta.5", "olm": "https://packages.matrix.org/npm/olm/olm-3.2.1.tgz", "prop-types": "^15.7.2", diff --git a/yarn.lock b/yarn.lock index 92e61e65204..1a29b8b678d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7898,21 +7898,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@9.0.1: - version "9.0.1" - resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-9.0.1.tgz#bb84a80db0dec1c21b6867c38bb2aa3f63811d6d" - integrity sha512-D2b/pf1/0FTnJoroZhhFCo9WFv+iXELqDgEozo0mBSTbQolIXjHLDQfmhi3p7nDZxxtjWvJjVaiKiVQPjwHCrg== - dependencies: - "@babel/runtime" "^7.11.2" - another-json "^0.2.0" - browser-request "^0.3.3" - bs58 "^4.0.1" - content-type "^1.0.4" - loglevel "^1.7.0" - qs "^6.9.4" - request "^2.88.2" - unhomoglyph "^1.0.6" - "matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop": version "9.0.1" resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/f8863d5c2488a31a093f5a1b11761d7ac3829470" @@ -7935,10 +7920,9 @@ matrix-mock-request@^1.2.3: bluebird "^3.5.0" expect "^1.20.2" -matrix-react-sdk@3.7.1: +"matrix-react-sdk@github:matrix-org/matrix-react-sdk#develop": version "3.7.1" - resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.7.1.tgz#0a2d9c2c7d224297277532bcf78f60984f6bc49e" - integrity sha512-JwCURRs0WBuqVQ5/0fYg19SEb2Dg8y1F93GiiCssAoMW/bbTiMA6B/moLeZDO2mQPlhqwRtAH1aeLvdKrA/q6w== + resolved "https://codeload.github.com/matrix-org/matrix-react-sdk/tar.gz/a708dbf6e9ed26108ef86ee07ff36f9ca56c0ccd" dependencies: "@babel/runtime" "^7.10.5" await-lock "^2.0.1" @@ -7965,7 +7949,7 @@ matrix-react-sdk@3.7.1: is-ip "^2.0.0" linkifyjs "^2.1.9" lodash "^4.17.19" - matrix-js-sdk "9.0.1" + matrix-js-sdk "github:matrix-org/matrix-js-sdk#develop" matrix-widget-api "^0.1.0-beta.5" minimist "^1.2.5" pako "^1.0.11" From a84925259f6083645fd86cfef084bca4b0f3fa77 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Fri, 30 Oct 2020 10:32:21 +0000 Subject: [PATCH 063/119] Add countly experiment to develop/nightly configs --- element.io/develop/config.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/element.io/develop/config.json b/element.io/develop/config.json index bcf6142d182..02ce3822c93 100644 --- a/element.io/develop/config.json +++ b/element.io/develop/config.json @@ -18,6 +18,10 @@ "siteId": 1, "policyUrl": "https://element.io/cookie-policy" }, + "countly": { + "url": "https://try.count.ly", + "appKey": "8abf1ee15646bc884556b82e5053857904264b66" + }, "roomDirectory": { "servers": [ "matrix.org" From 5ae93b6916fa35593248190b62f062abdb23833e Mon Sep 17 00:00:00 2001 From: Hakim Oubouali Date: Fri, 30 Oct 2020 20:37:53 +0000 Subject: [PATCH 064/119] Added translation using Weblate (Central Atlas Tamazight) --- src/i18n/strings/tzm.json | 1 + 1 file changed, 1 insertion(+) create mode 100644 src/i18n/strings/tzm.json diff --git a/src/i18n/strings/tzm.json b/src/i18n/strings/tzm.json new file mode 100644 index 00000000000..0967ef424bc --- /dev/null +++ b/src/i18n/strings/tzm.json @@ -0,0 +1 @@ +{} From 47c8c5507a2a49a5ba0a55d8913d308e83af02ee Mon Sep 17 00:00:00 2001 From: DO4TQe1jcGNLk9GvtDKqismfsIht20JBP7bps1OzQnvTDSwYSN Date: Fri, 30 Oct 2020 14:23:48 +0000 Subject: [PATCH 065/119] Translated using Weblate (Dutch) Currently translated at 93.9% (31 of 33 strings) Translation: Element Web/element-web Translate-URL: https://translate.element.io/projects/element-web/element-web/nl/ --- src/i18n/strings/nl.json | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/i18n/strings/nl.json b/src/i18n/strings/nl.json index a41e8f30e44..1613422b4be 100644 --- a/src/i18n/strings/nl.json +++ b/src/i18n/strings/nl.json @@ -7,7 +7,7 @@ "Decentralised, encrypted chat & collaboration powered by [matrix]": "Gedecentraliseerd en versleuteld chatten & samenwerken dankzij [matrix]", "Sign In": "Aanmelden", "Create Account": "Account aanmaken", - "Explore rooms": "Gesprekken ontdekken", + "Explore rooms": "Kamers verkennen", "Unexpected error preparing the app. See console for details.": "Er is een onverwachte fout opgetreden bij het voorbereiden van de app. Zie de console voor details.", "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Configuratiefout: kan slechts één van default_server_config, default_server_name, of default_hs_url opgeven.", "Invalid configuration: no default server specified.": "Configuratie ongeldig: geen standaardserver opgegeven.", @@ -29,5 +29,6 @@ "Open": "Openen", "Your Element configuration contains invalid JSON. Please correct the problem and reload the page.": "Uw Element configuratie bevat ongeldige JSON. Gelieve het probleem te corrigeren daarna de pagina te herladen.", "Download Completed": "Download voltooid", - "Your Element is misconfigured": "Uw Element is verkeerd geconfigureerd" + "Your Element is misconfigured": "Uw Element is verkeerd geconfigureerd", + "Your browser can't run %(brand)s": "Uw browser kan %(brand)s niet draaien." } From f5283014355b0d95e9982d8f3cc941bc038832e6 Mon Sep 17 00:00:00 2001 From: "Peter C. S. Scholtens" Date: Fri, 30 Oct 2020 14:20:32 +0000 Subject: [PATCH 066/119] Translated using Weblate (Dutch) Currently translated at 93.9% (31 of 33 strings) Translation: Element Web/element-web Translate-URL: https://translate.element.io/projects/element-web/element-web/nl/ --- src/i18n/strings/nl.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/i18n/strings/nl.json b/src/i18n/strings/nl.json index 1613422b4be..7099f21fb9a 100644 --- a/src/i18n/strings/nl.json +++ b/src/i18n/strings/nl.json @@ -26,7 +26,7 @@ "I understand the risks and wish to continue": "Ik begrijp de risico's en wil verder gaan", "Go to element.io": "Ga naar element.io", "Failed to start": "Opstarten mislukt", - "Open": "Openen", + "Open": "Open", "Your Element configuration contains invalid JSON. Please correct the problem and reload the page.": "Uw Element configuratie bevat ongeldige JSON. Gelieve het probleem te corrigeren daarna de pagina te herladen.", "Download Completed": "Download voltooid", "Your Element is misconfigured": "Uw Element is verkeerd geconfigureerd", From 9c94f9f1ca4be89e8adb691eacfc37a012719e21 Mon Sep 17 00:00:00 2001 From: Joel Reis Date: Sat, 31 Oct 2020 16:46:06 +0000 Subject: [PATCH 067/119] Translated using Weblate (Portuguese) Currently translated at 57.5% (19 of 33 strings) Translation: Element Web/element-web Translate-URL: https://translate.element.io/projects/element-web/element-web/pt/ --- src/i18n/strings/pt.json | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/i18n/strings/pt.json b/src/i18n/strings/pt.json index 1092b667c38..eb08e31bacd 100644 --- a/src/i18n/strings/pt.json +++ b/src/i18n/strings/pt.json @@ -13,5 +13,10 @@ "Sign In": "Iniciar sessão", "Create Account": "Criar conta", "Explore rooms": "Explorar rooms", - "Go to your browser to complete Sign In": "Abra o seu navegador para completar o inicio de sessão" + "Go to your browser to complete Sign In": "Abra o seu navegador para completar o inicio de sessão", + "Open": "Abrir", + "Download Completed": "Transferência concluída", + "Unable to load config file: please refresh the page to try again.": "Não foi possível carregar o ficheiro de configuração: atualize a página para tentar novamente.", + "Your Element configuration contains invalid JSON. Please correct the problem and reload the page.": "A configuração do Element contém um JSON inválido. Corrija o problema e recarregue a página.", + "Your Element is misconfigured": "O Element está configurado incorretamente" } From 69bdb52c021141e5a746b7e591f272562d7e8e38 Mon Sep 17 00:00:00 2001 From: Hakim Oubouali Date: Sat, 31 Oct 2020 07:55:40 +0000 Subject: [PATCH 068/119] Translated using Weblate (Central Atlas Tamazight) Currently translated at 36.3% (12 of 33 strings) Translation: Element Web/element-web Translate-URL: https://translate.element.io/projects/element-web/element-web/tzm/ --- src/i18n/strings/tzm.json | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/src/i18n/strings/tzm.json b/src/i18n/strings/tzm.json index 0967ef424bc..80f2451a98a 100644 --- a/src/i18n/strings/tzm.json +++ b/src/i18n/strings/tzm.json @@ -1 +1,14 @@ -{} +{ + "Create Account": "Ssenflul amiḍan", + "Download Completed": "Ittusmed wagam", + "Powered by Matrix": "Ittusker s Matrix", + "Sign In": "Kcem", + "Go to your browser to complete Sign In": "Ddu ɣer umessara fad ad tsemded azemmem", + "Welcome to Element": "Azul g Element", + "Go to element.io": "Ddu ɣer element.io", + "%(appName)s (%(browserName)s, %(osName)s)": "%(appName)s (%(browserName)s, %(osName)s)", + "Unknown device": "Allal arussin", + "Open user settings": "Ṛẓem tisɣal n unessemres", + "Dismiss": "Nexxel", + "Open": "Ṛẓem" +} From 156752a22011427ad1ac410562aab966dc0bdc6d Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Wed, 4 Nov 2020 14:18:34 +0000 Subject: [PATCH 069/119] Upgrade matrix-js-sdk to 9.1.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 16c014100b0..dc740937f03 100644 --- a/package.json +++ b/package.json @@ -60,7 +60,7 @@ "gfm.css": "^1.1.2", "highlight.js": "^9.13.1", "jsrsasign": "^9.1.5", - "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop", + "matrix-js-sdk": "9.1.0-rc.1", "matrix-react-sdk": "github:matrix-org/matrix-react-sdk#develop", "matrix-widget-api": "^0.1.0-beta.5", "olm": "https://packages.matrix.org/npm/olm/olm-3.2.1.tgz", diff --git a/yarn.lock b/yarn.lock index 1a29b8b678d..184aa2b513d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7898,6 +7898,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@9.1.0-rc.1: + version "9.1.0-rc.1" + resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-9.1.0-rc.1.tgz#cbdad0d272152a27bb32fe74e02ad069717d2554" + integrity sha512-Y0ftnH3HtMaNPFyfYqbrhS6aZkdQxxeluErFmOmpMTRGuMiIGrqhdWP8Z/MCZMRP4NPAh/dN2eW0vgqH9ij52A== + dependencies: + "@babel/runtime" "^7.11.2" + another-json "^0.2.0" + browser-request "^0.3.3" + bs58 "^4.0.1" + content-type "^1.0.4" + loglevel "^1.7.0" + qs "^6.9.4" + request "^2.88.2" + unhomoglyph "^1.0.6" + "matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop": version "9.0.1" resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/f8863d5c2488a31a093f5a1b11761d7ac3829470" From f759c9b0a000c5d77227781b6916f11aa2250722 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Wed, 4 Nov 2020 14:19:39 +0000 Subject: [PATCH 070/119] Upgrade matrix-react-sdk to 3.8.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 dc740937f03..297b6e44ff1 100644 --- a/package.json +++ b/package.json @@ -61,7 +61,7 @@ "highlight.js": "^9.13.1", "jsrsasign": "^9.1.5", "matrix-js-sdk": "9.1.0-rc.1", - "matrix-react-sdk": "github:matrix-org/matrix-react-sdk#develop", + "matrix-react-sdk": "3.8.0-rc.1", "matrix-widget-api": "^0.1.0-beta.5", "olm": "https://packages.matrix.org/npm/olm/olm-3.2.1.tgz", "prop-types": "^15.7.2", diff --git a/yarn.lock b/yarn.lock index 184aa2b513d..5f556532a57 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7913,20 +7913,6 @@ matrix-js-sdk@9.1.0-rc.1: request "^2.88.2" unhomoglyph "^1.0.6" -"matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop": - version "9.0.1" - resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/f8863d5c2488a31a093f5a1b11761d7ac3829470" - dependencies: - "@babel/runtime" "^7.11.2" - another-json "^0.2.0" - browser-request "^0.3.3" - bs58 "^4.0.1" - content-type "^1.0.4" - loglevel "^1.7.0" - qs "^6.9.4" - 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" @@ -7935,9 +7921,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.7.1" - resolved "https://codeload.github.com/matrix-org/matrix-react-sdk/tar.gz/a708dbf6e9ed26108ef86ee07ff36f9ca56c0ccd" +matrix-react-sdk@3.8.0-rc.1: + version "3.8.0-rc.1" + resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.8.0-rc.1.tgz#8c8e8f038d5bb2a922ead93d20ac2a4303c6b494" + integrity sha512-dq/eZbpMSCP/CSGknfN98XLS+SESQSv/gl/J4uJNZbT5THcpbLBBbTHhRx19s3YwHRk7nC6med43L5ohpo3Ptw== dependencies: "@babel/runtime" "^7.10.5" await-lock "^2.0.1" @@ -7964,7 +7951,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 "9.1.0-rc.1" matrix-widget-api "^0.1.0-beta.5" minimist "^1.2.5" pako "^1.0.11" From 9baa3961aaea47d569b4d98360e4935c8bf8303e Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Wed, 4 Nov 2020 14:22:40 +0000 Subject: [PATCH 071/119] Prepare changelog for v1.7.13-rc.1 --- CHANGELOG.md | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5441e8b4dfb..d16ab9a0c04 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,19 @@ +Changes in [1.7.13-rc.1](https://github.com/vector-im/element-web/releases/tag/v1.7.13-rc.1) (2020-11-04) +========================================================================================================= +[Full Changelog](https://github.com/vector-im/element-web/compare/v1.7.12...v1.7.13-rc.1) + + * Upgrade to React SDK 3.8.0-rc.1 and JS SDK 9.1.0-rc.1 + * Translations update from Weblate + [\#15644](https://github.com/vector-im/element-web/pull/15644) + * Add countly experiment to develop/nightly configs + [\#15614](https://github.com/vector-im/element-web/pull/15614) + * Add documentation for new UIFeature flag regarding room history settings + [\#15592](https://github.com/vector-im/element-web/pull/15592) + * Rename Docker repo in docs + [\#15590](https://github.com/vector-im/element-web/pull/15590) + * Fix Jitsi regressions with custom themes + [\#15575](https://github.com/vector-im/element-web/pull/15575) + Changes in [1.7.12](https://github.com/vector-im/element-web/releases/tag/v1.7.12) (2020-10-28) =============================================================================================== [Full Changelog](https://github.com/vector-im/element-web/compare/v1.7.11...v1.7.12) From 70bbeeee3b8a6773d61f293c5eba0ec0a707954f Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Wed, 4 Nov 2020 14:22:41 +0000 Subject: [PATCH 072/119] v1.7.13-rc.1 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 297b6e44ff1..9734e7769a1 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "riot-web", "productName": "Riot", - "version": "1.7.12", + "version": "1.7.13-rc.1", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "repository": { From a12d617469d339f0a9e841e695d53bd890d0558f Mon Sep 17 00:00:00 2001 From: "Auri B. P" Date: Thu, 5 Nov 2020 17:37:48 +0000 Subject: [PATCH 073/119] Translated using Weblate (Catalan) Currently translated at 100.0% (33 of 33 strings) Translation: Element Web/element-web Translate-URL: https://translate.element.io/projects/element-web/element-web/ca/ --- src/i18n/strings/ca.json | 45 ++++++++++++++++++++-------------------- 1 file changed, 23 insertions(+), 22 deletions(-) diff --git a/src/i18n/strings/ca.json b/src/i18n/strings/ca.json index 1e186410e68..1bbf5ce184c 100644 --- a/src/i18n/strings/ca.json +++ b/src/i18n/strings/ca.json @@ -1,35 +1,36 @@ { "Dismiss": "Omet", "Unknown device": "Dispositiu desconegut", - "Welcome to Element": "Us donem la benvinguda a Element", - "You need to be using HTTPS to place a screen-sharing call.": "Heu d'utilitzar HTTPS per poder fer una trucada amb pantalla compartida.", + "Welcome to Element": "Benvingut/da a Element", + "You need to be using HTTPS to place a screen-sharing call.": "Necessites utilitzar HTTPS per poder fer una trucada amb pantalla compartida.", "powered by Matrix": "amb tecnologia de Matrix", - "Decentralised, encrypted chat & collaboration powered by [matrix]": "Xat descentralitzat, encriptat i col·laboratiu amb tecnologia de [matrix]", + "Decentralised, encrypted chat & collaboration powered by [matrix]": "Xat descentralitzat, encriptat & col·laboratiu amb tecnologia de [matrix]", "Create Account": "Crea un compte", - "Explore rooms": "Exploreu les sales", + "Explore rooms": "Explora sales", "Sign In": "Inicia la sessió", - "Invalid configuration: no default server specified.": "Configuració no vàlida: no s'ha especificat cap servidor per defecte.", - "Invalid JSON": "JSON no vàlid", - "Go to your browser to complete Sign In": "Aneu al vostre navegador per completar l'inici de sessió", - "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Configuració incorrecta: només podeu especificar una de les opcions default_server_config, default_server_name, o default_hs_url.", - "Your Element is misconfigured": "El vostre Element està mal configurat", - "Your Element configuration contains invalid JSON. Please correct the problem and reload the page.": "El vostre Element conté un JSON incorrecte. Si us plau arregleu el problema i recarregueu la pàgina.", + "Invalid configuration: no default server specified.": "Configuració invàlida: no s'ha especificat cap servidor predeterminat.", + "Invalid JSON": "JSON invàlid", + "Go to your browser to complete Sign In": "Ves al teu navegador per completar l'inici de sessió", + "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Configuració invàlida: només pots especificar una sol de default_server_config, default_server_name, o default_hs_url.", + "Your Element is misconfigured": "Element està mal configurat", + "Your Element configuration contains invalid JSON. Please correct the problem and reload the page.": "La configuració d'Element conté un JSON invàlid. Arregla el problema i actualitza la pàgina.", "The message from the parser is: %(message)s": "El missatge de l'analitzador és: %(message)s", - "Unable to load config file: please refresh the page to try again.": "No he pogut carregar l'arxiu de configuració: si us plau recarregueu la pàgina per provar-ho de nou.", - "Unexpected error preparing the app. See console for details.": "Error inesperat preparant l'app. Vegeu la consola pels detalls.", + "Unable to load config file: please refresh the page to try again.": "No s'ha pogut carregar el fitxer de configuració: actualitza la pàgina per tornar-ho a provar.", + "Unexpected error preparing the app. See console for details.": "Error inesperat preparant l'app. Consulta la consola pels a més detalls.", "Download Completed": "Descàrrega completada", "Open": "Obre", - "Open user settings": "Obre configuració d'usuari", - "Previous/next recently visited room or community": "Anterior/Següent sala o comunitat visitada recentment", + "Open user settings": "Obre la configuració d'usuari", + "Previous/next recently visited room or community": "Anterior/següent sala o comunitat visitada recentment", "%(brand)s Desktop (%(platformName)s)": "%(brand)s d'escriptori (%(platformName)s)", "%(appName)s (%(browserName)s, %(osName)s)": "%(appName)s (%(browserName)s, %(osName)s)", - "Powered by Matrix": "En funcionament gràcies a Matrix", - "Unsupported browser": "Navegador no suportat", - "Your browser can't run %(brand)s": "El vostre navegador no pot executar %(brand)s", - "%(brand)s uses advanced browser features which aren't supported by your current browser.": "%(brand)s usa característiques avançades del navegador que el vostre navegador no suporta.", - "Please install Chrome, Firefox, or Safari for the best experience.": "Si us plau instal·leuChrome, Firefox, o Safari per una millor 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.": "Podeu continuar usant el vostre navegador actual, però algunes o totes les característiques podrien no funcionar i l'aspepte de l'aplicació podria mostrar errors.", - "I understand the risks and wish to continue": "Entenc els riscos i voldria continuar", + "Powered by Matrix": "Amb tecnologia de Matrix", + "Unsupported browser": "Navegador no compatible", + "Your browser can't run %(brand)s": "El teu navegador no pot executar %(brand)s", + "%(brand)s uses advanced browser features which aren't supported by your current browser.": "%(brand)s utilitza funcions del navegador avançades que no són compatibles amb el teu navegador actual.", + "Please install Chrome, Firefox, or Safari for the best experience.": "Instal·la Chrome, Firefox, o Safari per obtenir la millor 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.": "Pots continuar utilitzant el teu navegador actual, però algunes o totes les funcions podrien no funcionar i l'aspecte de l'aplicació podria ser incorrecte.", + "I understand the risks and wish to continue": "Entenc els riscos i vull continuar", "Go to element.io": "Vés a element.io", - "Failed to start": "Ha fallat en iniciar-se" + "Failed to start": "Ha fallat l'inici", + "Missing indexeddb worker script!": "Falta l'script del treballador indexeddb!" } From fcb644477147223ff076ffa451c6f793a42eb2a1 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Mon, 9 Nov 2020 16:36:00 +0000 Subject: [PATCH 074/119] Upgrade matrix-js-sdk to 9.1.0 --- package.json | 2 +- yarn.lock | 15 +++++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index 9734e7769a1..42c6056de6c 100644 --- a/package.json +++ b/package.json @@ -60,7 +60,7 @@ "gfm.css": "^1.1.2", "highlight.js": "^9.13.1", "jsrsasign": "^9.1.5", - "matrix-js-sdk": "9.1.0-rc.1", + "matrix-js-sdk": "9.1.0", "matrix-react-sdk": "3.8.0-rc.1", "matrix-widget-api": "^0.1.0-beta.5", "olm": "https://packages.matrix.org/npm/olm/olm-3.2.1.tgz", diff --git a/yarn.lock b/yarn.lock index 5f556532a57..0dec62d3fc5 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7898,6 +7898,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@9.1.0: + version "9.1.0" + resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-9.1.0.tgz#51a3240f6545c0ae42ca0db0c579d17476b0ca94" + integrity sha512-4swrPb93qF2lid9mqzCDPMIvUlgS/MIUVxxD0EfNQoapdekFtnf7pMimYs+lMpRk3VDfa01FEsUu1k0q8O+Utw== + dependencies: + "@babel/runtime" "^7.11.2" + another-json "^0.2.0" + browser-request "^0.3.3" + bs58 "^4.0.1" + content-type "^1.0.4" + loglevel "^1.7.0" + qs "^6.9.4" + request "^2.88.2" + unhomoglyph "^1.0.6" + matrix-js-sdk@9.1.0-rc.1: version "9.1.0-rc.1" resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-9.1.0-rc.1.tgz#cbdad0d272152a27bb32fe74e02ad069717d2554" From cefe77befc2271683c48945e40ed78bbf83b5c2e Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Mon, 9 Nov 2020 16:36:47 +0000 Subject: [PATCH 075/119] Upgrade matrix-react-sdk to 3.8.0 --- package.json | 2 +- yarn.lock | 25 +++++-------------------- 2 files changed, 6 insertions(+), 21 deletions(-) diff --git a/package.json b/package.json index 42c6056de6c..97285e84d75 100644 --- a/package.json +++ b/package.json @@ -61,7 +61,7 @@ "highlight.js": "^9.13.1", "jsrsasign": "^9.1.5", "matrix-js-sdk": "9.1.0", - "matrix-react-sdk": "3.8.0-rc.1", + "matrix-react-sdk": "3.8.0", "matrix-widget-api": "^0.1.0-beta.5", "olm": "https://packages.matrix.org/npm/olm/olm-3.2.1.tgz", "prop-types": "^15.7.2", diff --git a/yarn.lock b/yarn.lock index 0dec62d3fc5..cdf0af81be0 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7913,21 +7913,6 @@ matrix-js-sdk@9.1.0: request "^2.88.2" unhomoglyph "^1.0.6" -matrix-js-sdk@9.1.0-rc.1: - version "9.1.0-rc.1" - resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-9.1.0-rc.1.tgz#cbdad0d272152a27bb32fe74e02ad069717d2554" - integrity sha512-Y0ftnH3HtMaNPFyfYqbrhS6aZkdQxxeluErFmOmpMTRGuMiIGrqhdWP8Z/MCZMRP4NPAh/dN2eW0vgqH9ij52A== - dependencies: - "@babel/runtime" "^7.11.2" - another-json "^0.2.0" - browser-request "^0.3.3" - bs58 "^4.0.1" - content-type "^1.0.4" - loglevel "^1.7.0" - qs "^6.9.4" - 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" @@ -7936,10 +7921,10 @@ matrix-mock-request@^1.2.3: bluebird "^3.5.0" expect "^1.20.2" -matrix-react-sdk@3.8.0-rc.1: - version "3.8.0-rc.1" - resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.8.0-rc.1.tgz#8c8e8f038d5bb2a922ead93d20ac2a4303c6b494" - integrity sha512-dq/eZbpMSCP/CSGknfN98XLS+SESQSv/gl/J4uJNZbT5THcpbLBBbTHhRx19s3YwHRk7nC6med43L5ohpo3Ptw== +matrix-react-sdk@3.8.0: + version "3.8.0" + resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.8.0.tgz#9ce1e80e6b7d6926c92215632f7ec1ed32a44cc7" + integrity sha512-8tPKs30LqXHLj0iKQvkO9P7Fwk9ux1UmdbvB775iH+auxTgyG721EMlXn3tgBpk/rmIikfhPEMCEM0m6nUPn4g== dependencies: "@babel/runtime" "^7.10.5" await-lock "^2.0.1" @@ -7966,7 +7951,7 @@ matrix-react-sdk@3.8.0-rc.1: is-ip "^2.0.0" linkifyjs "^2.1.9" lodash "^4.17.19" - matrix-js-sdk "9.1.0-rc.1" + matrix-js-sdk "9.1.0" matrix-widget-api "^0.1.0-beta.5" minimist "^1.2.5" pako "^1.0.11" From c8a3901633b6297cb2b9fe0877d18853a25886c8 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Mon, 9 Nov 2020 16:39:20 +0000 Subject: [PATCH 076/119] Prepare changelog for v1.7.13 --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index d16ab9a0c04..ae2fc5155c7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +Changes in [1.7.13](https://github.com/vector-im/element-web/releases/tag/v1.7.13) (2020-11-09) +=============================================================================================== +[Full Changelog](https://github.com/vector-im/element-web/compare/v1.7.13-rc.1...v1.7.13) + + * Upgrade to React SDK 3.8.0 and JS SDK 9.1.0 + Changes in [1.7.13-rc.1](https://github.com/vector-im/element-web/releases/tag/v1.7.13-rc.1) (2020-11-04) ========================================================================================================= [Full Changelog](https://github.com/vector-im/element-web/compare/v1.7.12...v1.7.13-rc.1) From c431177bda1de9f5102c9a63806bb9a1052baf4d Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Mon, 9 Nov 2020 16:39:21 +0000 Subject: [PATCH 077/119] v1.7.13 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 97285e84d75..5d726f26ec2 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "riot-web", "productName": "Riot", - "version": "1.7.13-rc.1", + "version": "1.7.13", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "repository": { From 83b9adadd79c62c01fb40382eeb9b936525eb3c2 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Mon, 9 Nov 2020 16:42:45 +0000 Subject: [PATCH 078/119] 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 5d726f26ec2..be7b3321c36 100644 --- a/package.json +++ b/package.json @@ -60,7 +60,7 @@ "gfm.css": "^1.1.2", "highlight.js": "^9.13.1", "jsrsasign": "^9.1.5", - "matrix-js-sdk": "9.1.0", + "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop", "matrix-react-sdk": "3.8.0", "matrix-widget-api": "^0.1.0-beta.5", "olm": "https://packages.matrix.org/npm/olm/olm-3.2.1.tgz", diff --git a/yarn.lock b/yarn.lock index cdf0af81be0..c5d836eb15f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7913,6 +7913,20 @@ matrix-js-sdk@9.1.0: request "^2.88.2" unhomoglyph "^1.0.6" +"matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop": + version "9.1.0" + resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/5ac00e346593f29f324b3af8e322928a6e1c427a" + dependencies: + "@babel/runtime" "^7.11.2" + another-json "^0.2.0" + browser-request "^0.3.3" + bs58 "^4.0.1" + content-type "^1.0.4" + loglevel "^1.7.0" + qs "^6.9.4" + 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 ca312254d557125014e9a0fd04474e68367c4c7f Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Mon, 9 Nov 2020 16:42:55 +0000 Subject: [PATCH 079/119] 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 be7b3321c36..07e555c6520 100644 --- a/package.json +++ b/package.json @@ -61,7 +61,7 @@ "highlight.js": "^9.13.1", "jsrsasign": "^9.1.5", "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop", - "matrix-react-sdk": "3.8.0", + "matrix-react-sdk": "github:matrix-org/matrix-react-sdk#develop", "matrix-widget-api": "^0.1.0-beta.5", "olm": "https://packages.matrix.org/npm/olm/olm-3.2.1.tgz", "prop-types": "^15.7.2", diff --git a/yarn.lock b/yarn.lock index c5d836eb15f..a19af5cbbed 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7898,21 +7898,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@9.1.0: - version "9.1.0" - resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-9.1.0.tgz#51a3240f6545c0ae42ca0db0c579d17476b0ca94" - integrity sha512-4swrPb93qF2lid9mqzCDPMIvUlgS/MIUVxxD0EfNQoapdekFtnf7pMimYs+lMpRk3VDfa01FEsUu1k0q8O+Utw== - dependencies: - "@babel/runtime" "^7.11.2" - another-json "^0.2.0" - browser-request "^0.3.3" - bs58 "^4.0.1" - content-type "^1.0.4" - loglevel "^1.7.0" - qs "^6.9.4" - request "^2.88.2" - unhomoglyph "^1.0.6" - "matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop": version "9.1.0" resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/5ac00e346593f29f324b3af8e322928a6e1c427a" @@ -7935,10 +7920,9 @@ matrix-mock-request@^1.2.3: bluebird "^3.5.0" expect "^1.20.2" -matrix-react-sdk@3.8.0: +"matrix-react-sdk@github:matrix-org/matrix-react-sdk#develop": version "3.8.0" - resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.8.0.tgz#9ce1e80e6b7d6926c92215632f7ec1ed32a44cc7" - integrity sha512-8tPKs30LqXHLj0iKQvkO9P7Fwk9ux1UmdbvB775iH+auxTgyG721EMlXn3tgBpk/rmIikfhPEMCEM0m6nUPn4g== + resolved "https://codeload.github.com/matrix-org/matrix-react-sdk/tar.gz/46e01196f0f4e0f291716de669d5aaad6b270c7d" dependencies: "@babel/runtime" "^7.10.5" await-lock "^2.0.1" @@ -7965,7 +7949,7 @@ matrix-react-sdk@3.8.0: is-ip "^2.0.0" linkifyjs "^2.1.9" lodash "^4.17.19" - matrix-js-sdk "9.1.0" + matrix-js-sdk "github:matrix-org/matrix-js-sdk#develop" matrix-widget-api "^0.1.0-beta.5" minimist "^1.2.5" pako "^1.0.11" From f2b51848b728169b4f02ab584c147706755e4a97 Mon Sep 17 00:00:00 2001 From: Travis Ralston Date: Thu, 12 Nov 2020 12:07:51 -0700 Subject: [PATCH 080/119] Update the widget-api for element-web To prevent accidental package conflicts --- package.json | 2 +- yarn.lock | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/package.json b/package.json index 07e555c6520..b5b896b4290 100644 --- a/package.json +++ b/package.json @@ -62,7 +62,7 @@ "jsrsasign": "^9.1.5", "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop", "matrix-react-sdk": "github:matrix-org/matrix-react-sdk#develop", - "matrix-widget-api": "^0.1.0-beta.5", + "matrix-widget-api": "^0.1.0-beta.8", "olm": "https://packages.matrix.org/npm/olm/olm-3.2.1.tgz", "prop-types": "^15.7.2", "react": "^16.9.0", diff --git a/yarn.lock b/yarn.lock index a19af5cbbed..620a5187441 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7922,7 +7922,7 @@ matrix-mock-request@^1.2.3: "matrix-react-sdk@github:matrix-org/matrix-react-sdk#develop": version "3.8.0" - resolved "https://codeload.github.com/matrix-org/matrix-react-sdk/tar.gz/46e01196f0f4e0f291716de669d5aaad6b270c7d" + resolved "https://codeload.github.com/matrix-org/matrix-react-sdk/tar.gz/962b964c07a904dd974e4e8d94a49050b97cbe1f" dependencies: "@babel/runtime" "^7.10.5" await-lock "^2.0.1" @@ -7950,7 +7950,7 @@ matrix-mock-request@^1.2.3: linkifyjs "^2.1.9" lodash "^4.17.19" matrix-js-sdk "github:matrix-org/matrix-js-sdk#develop" - matrix-widget-api "^0.1.0-beta.5" + matrix-widget-api "^0.1.0-beta.8" minimist "^1.2.5" pako "^1.0.11" parse5 "^5.1.1" @@ -7980,10 +7980,10 @@ matrix-react-test-utils@^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-widget-api@^0.1.0-beta.5: - version "0.1.0-beta.5" - resolved "https://registry.yarnpkg.com/matrix-widget-api/-/matrix-widget-api-0.1.0-beta.5.tgz#dd7f24a177aa590d812bd4e92e2c3ac225c5557e" - integrity sha512-J3GBJtVMFuEM/EWFylc0IlkPjdgmWxrkGYPaZ0LSmxp+OlNJxYfnWPR6F6HveW+Z8C1i0vq+BTueofSqKv2zDg== +matrix-widget-api@^0.1.0-beta.8: + version "0.1.0-beta.8" + resolved "https://registry.yarnpkg.com/matrix-widget-api/-/matrix-widget-api-0.1.0-beta.8.tgz#17e85c03c46353373890b869b1fd46162bdb0026" + integrity sha512-sWqyWs0RQqny/BimZUOxUd9BTJBzQmJlJ1i3lsSh1JBygV+aK5xQsONL97fc4i6/nwQPK72uCVDF+HwTtkpAbQ== dependencies: events "^3.2.0" From 501f17a4ca03d92f2cf1ea70b1d538e196aa0e37 Mon Sep 17 00:00:00 2001 From: MadsDyrmann Date: Thu, 12 Nov 2020 11:47:05 +0000 Subject: [PATCH 081/119] Translated using Weblate (Danish) Currently translated at 75.7% (25 of 33 strings) Translation: Element Web/element-web Translate-URL: https://translate.element.io/projects/element-web/element-web/da/ --- src/i18n/strings/da.json | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/i18n/strings/da.json b/src/i18n/strings/da.json index d31f055503f..f9fa3abcc00 100644 --- a/src/i18n/strings/da.json +++ b/src/i18n/strings/da.json @@ -17,5 +17,12 @@ "Unable to load config file: please refresh the page to try again.": "Ikke i stand til at loade config fil: genopfrisk venligst siden for at prøve igen.", "Open user settings": "Åbn brugerindstillinger", "Previous/next recently visited room or community": "Forrige/næste besøgte rum eller fællesskab", - "Go to your browser to complete Sign In": "Gå til din browser for at færdiggøre Log ind" + "Go to your browser to complete Sign In": "Gå til din browser for at færdiggøre Log ind", + "Go to element.io": "Gå til element.io", + "I understand the risks and wish to continue": "Jeg forstår risikoen og ønsker at fortsætte", + "Unsupported browser": "Usupporteret browser", + "Open": "Åbn", + "Download Completed": "Hentning færdig", + "Your Element configuration contains invalid JSON. Please correct the problem and reload the page.": "Din Element konfiguration indeholder ugyldig JSON. Løs venligst problemet og genindlæs siden.", + "Your Element is misconfigured": "Din Element er konfigureret forkert" } From 2ea3e67a656331830ed5708f940307dd5afce04b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bal=C3=A1zs=20Mesk=C3=B3?= Date: Thu, 12 Nov 2020 20:59:52 +0000 Subject: [PATCH 082/119] Translated using Weblate (Hungarian) Currently translated at 100.0% (33 of 33 strings) Translation: Element Web/element-web Translate-URL: https://translate.element.io/projects/element-web/element-web/hu/ --- src/i18n/strings/hu.json | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/i18n/strings/hu.json b/src/i18n/strings/hu.json index e33e527d5d6..d090dcef42d 100644 --- a/src/i18n/strings/hu.json +++ b/src/i18n/strings/hu.json @@ -2,35 +2,35 @@ "Dismiss": "Eltüntetés", "powered by Matrix": "a gépházban: Matrix", "Unknown device": "Ismeretlen eszköz", - "You need to be using HTTPS to place a screen-sharing call.": "Képernyőmegosztás indításához HTTPS-t kell használnod.", - "Welcome to Element": "Üdvözöl a Element", + "You need to be using HTTPS to place a screen-sharing call.": "Képernyőmegosztás indításához HTTPS-t kell használnia.", + "Welcome to Element": "Üdvözli az Element", "Decentralised, encrypted chat & collaboration powered by [matrix]": "Decentralizált, titkosított csevegés és kollaboráció [matrix] alapokon", "Sign In": "Bejelentkezés", "Create Account": "Fiók létrehozása", "Explore rooms": "Szobák felderítése", - "Unexpected error preparing the app. See console for details.": "Váratlan hiba történt az alkalmazás előkészítésénél. A részletekért nézd meg a konzolt.", + "Unexpected error preparing the app. See console for details.": "Váratlan hiba történt az alkalmazás előkészítésénél. A részletekért lásd a konzolt.", "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Érvénytelen konfiguráció: csak egyet lehet megadni a default_server_config, default_server_name és default_hs_url közül.", "Invalid configuration: no default server specified.": "Érvénytelen konfiguráció: nincs megadva alapértelmezett kiszolgáló.", "The message from the parser is: %(message)s": "A feldolgozó algoritmus üzenete: %(message)s", "Invalid JSON": "Érvénytelen JSON", - "Go to your browser to complete Sign In": "A böngészőben fejezd be a bejelentkezést", + "Go to your browser to complete Sign In": "A böngészőben fejezze be a bejelentkezést", "Open user settings": "Felhasználói beállítások megnyitása", "Missing indexeddb worker script!": "Hiányzó indexeddb worker parancsfájl!", - "Unable to load config file: please refresh the page to try again.": "A konfigurációs fájlt nem sikerült betölteni: frissítsd az oldalt és próbáld meg újra.", + "Unable to load config file: please refresh the page to try again.": "A konfigurációs fájlt nem sikerült betölteni: frissítse az oldalt és próbálja meg újra.", "Previous/next recently visited room or community": "Előző/következő nemrég meglátogatott szobák vagy közösségek", "%(brand)s Desktop (%(platformName)s)": "Asztali %(brand)s (%(platformName)s)", "%(appName)s (%(browserName)s, %(osName)s)": "%(appName)s (%(browserName)s, %(osName)s)", "Unsupported browser": "A böngésző nem támogatott", - "Please install Chrome, Firefox, or Safari for the best experience.": "A legjobb élmény eléréséhez kérlek telepíts Chrome-ot, Firefoxot vagy Safarit.", - "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.": "Folytathatod a jelenlegi böngésződdel, de néhány vagy az összes funkció használhatatlan lehet, vagy hibák lehetnek az alkalmazás kinézetében és viselkedésében.", + "Please install Chrome, Firefox, or Safari for the best experience.": "A legjobb élmény érdékében telepítsen Chrome-ot, Firefoxot vagy Safarit.", + "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.": "Folytathatja a jelenlegi böngészőjével, de néhány vagy az összes funkció használhatatlan lehet, vagy hibák lehetnek az alkalmazás kinézetében és viselkedésében.", "I understand the risks and wish to continue": "Megértettem a kockázatot és folytatom", "Go to element.io": "Irány a element.io", "Failed to start": "Az indítás sikertelen", "Download Completed": "A letöltés befejeződött", "Open": "Megnyitás", "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.", + "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. Javítsa és töltse újra az oldalt.", + "Your browser can't run %(brand)s": "A böngészője nem tudja futtatni ezt: %(brand)s", + "%(brand)s uses advanced browser features which aren't supported by your current browser.": "%(brand)s speciális böngészőfunkciókat használ, amelyeket a jelenlegi böngészője nem támogat.", "Powered by Matrix": "A gépházban: Matrix" } From b59cdaa7419c1f42343a117c4a975044bbe06bc4 Mon Sep 17 00:00:00 2001 From: Deleted User Date: Wed, 11 Nov 2020 18:13:47 +0000 Subject: [PATCH 083/119] =?UTF-8?q?Translated=20using=20Weblate=20(Norwegi?= =?UTF-8?q?an=20Bokm=C3=A5l)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Currently translated at 84.8% (28 of 33 strings) Translation: Element Web/element-web Translate-URL: https://translate.element.io/projects/element-web/element-web/nb_NO/ --- src/i18n/strings/nb_NO.json | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/src/i18n/strings/nb_NO.json b/src/i18n/strings/nb_NO.json index 2485a03ad01..e6350d8923d 100644 --- a/src/i18n/strings/nb_NO.json +++ b/src/i18n/strings/nb_NO.json @@ -11,8 +11,21 @@ "The message from the parser is: %(message)s": "Meldingen fra parseren er: %(message)s", "Invalid JSON": "Ugyldig JSON", "Invalid configuration: no default server specified.": "Ugyldig konfigurasjon: ingen standardserver spesifisert.", - "Unexpected error preparing the app. See console for details.": "Uventet feil oppsto mens appen ble gjort klar. Se konsollen for detaljer.", + "Unexpected error preparing the app. See console for details.": "Uventet feil ved klargjøring av appen. Se konsollen for detaljer.", "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Ugyldig konfigurasjon: Spesifiser kun en av følgende: default_server_config, default_server_name eller default_hs_url.", "Open user settings": "Åpne brukerinnstillinger", - "Go to your browser to complete Sign In": "Gå til nettleseren din for å fullføre innloggingen" + "Go to your browser to complete Sign In": "Gå til nettleseren din for å fullføre innloggingen", + "Failed to start": "Kunne ikke starte", + "Go to element.io": "Gå til element.io", + "I understand the risks and wish to continue": "Jeg forstår risikoen og ønsker å fortsette", + "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.": "Du kan fortsette å bruke din nåværende nettleser, men noen eller alle funksjonene fungerer kanskje ikke, og utseendet og følelsen av applikasjonen kan være feil.", + "Your browser can't run %(brand)s": "Nettleseren din kan ikke kjøre %(brand)s", + "Unsupported browser": "Ustøttet nettleser", + "Powered by Matrix": "Drevet av Matrix", + "Previous/next recently visited room or community": "Forrige/neste nylig besøkte rom eller samfunn", + "Download Completed": "Nedlasting Fullført", + "Unable to load config file: please refresh the page to try again.": "Kan ikke laste inn konfigurasjonsfil: oppdater siden for å prøve igjen.", + "Your Element configuration contains invalid JSON. Please correct the problem and reload the page.": "Ditt Element konfigurasjonen inneholder ugyldig JSON. Løs problemet og last siden på nytt.", + "Your Element is misconfigured": "Ditt Element er feilkonfigurert", + "Missing indexeddb worker script!": "Mangler indexeddb arbeiderskript!" } From a568f2ee0273ecbcf263b3d03bf3f0e834ca6821 Mon Sep 17 00:00:00 2001 From: Rintan Date: Tue, 17 Nov 2020 09:43:23 +0000 Subject: [PATCH 084/119] Translated using Weblate (Japanese) Currently translated at 96.9% (32 of 33 strings) Translation: Element Web/element-web Translate-URL: https://translate.element.io/projects/element-web/element-web/ja/ --- src/i18n/strings/ja.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/i18n/strings/ja.json b/src/i18n/strings/ja.json index eeaf0d4dbc9..ed0aed461ae 100644 --- a/src/i18n/strings/ja.json +++ b/src/i18n/strings/ja.json @@ -30,5 +30,6 @@ "Your Element is misconfigured": "Elementの設定が間違っています", "Your Element configuration contains invalid JSON. Please correct the problem and reload the page.": "Elementの設定ファイルに不正なJSONが含まれています。問題を修正してからページを再読込してください。", "Your browser can't run %(brand)s": "このブラウザでは%(brand)sが動きません", - "%(brand)s uses advanced browser features which aren't supported by your current browser.": "%(brand)sはブラウザの高度な機能を使う必要がありますが、このブラウザではその機能がサポートされていないようです。" + "%(brand)s uses advanced browser features which aren't supported by your current browser.": "%(brand)sはブラウザの高度な機能を使う必要がありますが、このブラウザではその機能がサポートされていないようです。", + "Powered by Matrix": "Powered by Matrix" } From 2b45efbdda3828fd58380e6336f0e33b50379668 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Wed, 18 Nov 2020 16:30:48 +0000 Subject: [PATCH 085/119] Upgrade matrix-js-sdk to 9.2.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 b5b896b4290..11d528ae9e0 100644 --- a/package.json +++ b/package.json @@ -60,7 +60,7 @@ "gfm.css": "^1.1.2", "highlight.js": "^9.13.1", "jsrsasign": "^9.1.5", - "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop", + "matrix-js-sdk": "9.2.0-rc.1", "matrix-react-sdk": "github:matrix-org/matrix-react-sdk#develop", "matrix-widget-api": "^0.1.0-beta.8", "olm": "https://packages.matrix.org/npm/olm/olm-3.2.1.tgz", diff --git a/yarn.lock b/yarn.lock index 620a5187441..4ff334517ab 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7898,6 +7898,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@9.2.0-rc.1: + version "9.2.0-rc.1" + resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-9.2.0-rc.1.tgz#db0750259170a79c5f51b9b5fc6949f8521a1926" + integrity sha512-cDbY8fSZQEaDU6m1V8MpZtr69sd4iWw/SshNDpQMsd4llCVhMA10EC0RrETfFRerSI+SEn9sdhjQaa4wEPCy9w== + dependencies: + "@babel/runtime" "^7.11.2" + another-json "^0.2.0" + browser-request "^0.3.3" + bs58 "^4.0.1" + content-type "^1.0.4" + loglevel "^1.7.0" + qs "^6.9.4" + request "^2.88.2" + unhomoglyph "^1.0.6" + "matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop": version "9.1.0" resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/5ac00e346593f29f324b3af8e322928a6e1c427a" From 09bfe1a7e698f352f8860a2de8080c116705d9f5 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Wed, 18 Nov 2020 16:31:54 +0000 Subject: [PATCH 086/119] Upgrade matrix-react-sdk to 3.9.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 11d528ae9e0..07fb2a222e3 100644 --- a/package.json +++ b/package.json @@ -61,7 +61,7 @@ "highlight.js": "^9.13.1", "jsrsasign": "^9.1.5", "matrix-js-sdk": "9.2.0-rc.1", - "matrix-react-sdk": "github:matrix-org/matrix-react-sdk#develop", + "matrix-react-sdk": "3.9.0-rc.1", "matrix-widget-api": "^0.1.0-beta.8", "olm": "https://packages.matrix.org/npm/olm/olm-3.2.1.tgz", "prop-types": "^15.7.2", diff --git a/yarn.lock b/yarn.lock index 4ff334517ab..22b61f0e5d1 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7913,20 +7913,6 @@ matrix-js-sdk@9.2.0-rc.1: request "^2.88.2" unhomoglyph "^1.0.6" -"matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop": - version "9.1.0" - resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/5ac00e346593f29f324b3af8e322928a6e1c427a" - dependencies: - "@babel/runtime" "^7.11.2" - another-json "^0.2.0" - browser-request "^0.3.3" - bs58 "^4.0.1" - content-type "^1.0.4" - loglevel "^1.7.0" - qs "^6.9.4" - 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" @@ -7935,9 +7921,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.8.0" - resolved "https://codeload.github.com/matrix-org/matrix-react-sdk/tar.gz/962b964c07a904dd974e4e8d94a49050b97cbe1f" +matrix-react-sdk@3.9.0-rc.1: + version "3.9.0-rc.1" + resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.9.0-rc.1.tgz#08c0df3885f4069e3e1325688de9f245234ff57a" + integrity sha512-YRugb0usacVy0i11nbg3UmkxX7I8CBnr+419PxK/nO0pca9qSgJPqELljyWnaZkvOSTOABSkrbdwr0z9tr+BSA== dependencies: "@babel/runtime" "^7.10.5" await-lock "^2.0.1" @@ -7964,7 +7951,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 "9.2.0-rc.1" matrix-widget-api "^0.1.0-beta.8" minimist "^1.2.5" pako "^1.0.11" From cd20ff15b103dc7dfb39bd2600947178982b4bd6 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Wed, 18 Nov 2020 16:34:59 +0000 Subject: [PATCH 087/119] Prepare changelog for v1.7.14-rc.1 --- CHANGELOG.md | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index ae2fc5155c7..bd04b1ca27c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,13 @@ +Changes in [1.7.14-rc.1](https://github.com/vector-im/element-web/releases/tag/v1.7.14-rc.1) (2020-11-18) +========================================================================================================= +[Full Changelog](https://github.com/vector-im/element-web/compare/v1.7.13...v1.7.14-rc.1) + + * Upgrade to React SDK 3.9.0-rc.1 and JS SDK 9.2.0-rc.1 + * Translations update from Weblate + [\#15767](https://github.com/vector-im/element-web/pull/15767) + * Update the widget-api for element-web + [\#15717](https://github.com/vector-im/element-web/pull/15717) + Changes in [1.7.13](https://github.com/vector-im/element-web/releases/tag/v1.7.13) (2020-11-09) =============================================================================================== [Full Changelog](https://github.com/vector-im/element-web/compare/v1.7.13-rc.1...v1.7.13) From 0ed6c550c25835d319d55a10cda82a8be7aed7f7 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Wed, 18 Nov 2020 16:35:00 +0000 Subject: [PATCH 088/119] v1.7.14-rc.1 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 07fb2a222e3..3b5e9b0133f 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "riot-web", "productName": "Riot", - "version": "1.7.13", + "version": "1.7.14-rc.1", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "repository": { From ab95183e4fb9f2f4ed4dfa1a477ef2028ca3a090 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=A0imon=20Brandner?= Date: Mon, 23 Nov 2020 08:45:21 +0100 Subject: [PATCH 089/119] Added inotify instance limit info --- README.md | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index c54eac9dc53..5cad146f57d 100644 --- a/README.md +++ b/README.md @@ -275,22 +275,29 @@ modifying it. See the [configuration docs](docs/config.md) for details. Open http://127.0.0.1:8080/ in your browser to see your newly built Element. **Note**: The build script uses inotify by default on Linux to monitor directories -for changes. If the inotify watch limit is too low your build will silently fail. -To avoid this issue, we recommend a limit of at least 128M. +for changes. If the inotify limits are too low your build will fail silently or with +`Error: EMFILE: too many open files`. To avoid these issues, we recommend a watch limit +of at least `128M` and instance limit around `512`. -To set a new inotify watch limit, execute: +Linked issues are [#15750](https://github.com/vector-im/element-web/issues/15750) and +[#15774](https://github.com/vector-im/element-web/issues/15774). + +To set a new inotify watch and instance limit, execute: ``` -$ sudo sysctl fs.inotify.max_user_watches=131072 -$ sudo sysctl -p +sudo sysctl fs.inotify.max_user_watches=131072 +sudo sysctl fs.inotify.max_user_instances=512 +sudo sysctl -p ``` -If you wish, you can make this new limit permanent, by executing: +If you wish, you can make the new limits permanent, by executing: ``` -$ echo fs.inotify.max_user_watches=524288 | sudo tee -a /etc/sysctl.conf -$ sudo sysctl -p +echo fs.inotify.max_user_watches=524288 | sudo tee -a /etc/sysctl.conf +echo fs.inotify.max_user_instances=512 | sudo tee -a /etc/sysctl.conf +sudo sysctl -p ``` + ___ When you make changes to `matrix-react-sdk` or `matrix-js-sdk` they should be From 06355213ad99021325dfb8b0e095fc8d152b7884 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Mon, 23 Nov 2020 16:45:23 +0000 Subject: [PATCH 090/119] Upgrade matrix-js-sdk to 9.2.0 --- package.json | 2 +- yarn.lock | 15 +++++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index 3b5e9b0133f..d903fec6863 100644 --- a/package.json +++ b/package.json @@ -60,7 +60,7 @@ "gfm.css": "^1.1.2", "highlight.js": "^9.13.1", "jsrsasign": "^9.1.5", - "matrix-js-sdk": "9.2.0-rc.1", + "matrix-js-sdk": "9.2.0", "matrix-react-sdk": "3.9.0-rc.1", "matrix-widget-api": "^0.1.0-beta.8", "olm": "https://packages.matrix.org/npm/olm/olm-3.2.1.tgz", diff --git a/yarn.lock b/yarn.lock index 22b61f0e5d1..b50e5a2ba8e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7898,6 +7898,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@9.2.0: + version "9.2.0" + resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-9.2.0.tgz#4b01dbb170266c4fe37be9397065d870561ad220" + integrity sha512-3lPgCB2in+AHDd+tLT8HbJ9elqDeJjYCE8i8Ti+NO2Myua62HIsf3pE/C/FE/QCDTuZBTjN0vgjym22M+GO65g== + dependencies: + "@babel/runtime" "^7.11.2" + another-json "^0.2.0" + browser-request "^0.3.3" + bs58 "^4.0.1" + content-type "^1.0.4" + loglevel "^1.7.0" + qs "^6.9.4" + request "^2.88.2" + unhomoglyph "^1.0.6" + matrix-js-sdk@9.2.0-rc.1: version "9.2.0-rc.1" resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-9.2.0-rc.1.tgz#db0750259170a79c5f51b9b5fc6949f8521a1926" From c1d3b4625930a6696154eaed869652db5e2ccc49 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Mon, 23 Nov 2020 16:46:04 +0000 Subject: [PATCH 091/119] Upgrade matrix-react-sdk to 3.9.0 --- package.json | 2 +- yarn.lock | 25 +++++-------------------- 2 files changed, 6 insertions(+), 21 deletions(-) diff --git a/package.json b/package.json index d903fec6863..046f117b1fa 100644 --- a/package.json +++ b/package.json @@ -61,7 +61,7 @@ "highlight.js": "^9.13.1", "jsrsasign": "^9.1.5", "matrix-js-sdk": "9.2.0", - "matrix-react-sdk": "3.9.0-rc.1", + "matrix-react-sdk": "3.9.0", "matrix-widget-api": "^0.1.0-beta.8", "olm": "https://packages.matrix.org/npm/olm/olm-3.2.1.tgz", "prop-types": "^15.7.2", diff --git a/yarn.lock b/yarn.lock index b50e5a2ba8e..0e3bc1126b4 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7913,21 +7913,6 @@ matrix-js-sdk@9.2.0: request "^2.88.2" unhomoglyph "^1.0.6" -matrix-js-sdk@9.2.0-rc.1: - version "9.2.0-rc.1" - resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-9.2.0-rc.1.tgz#db0750259170a79c5f51b9b5fc6949f8521a1926" - integrity sha512-cDbY8fSZQEaDU6m1V8MpZtr69sd4iWw/SshNDpQMsd4llCVhMA10EC0RrETfFRerSI+SEn9sdhjQaa4wEPCy9w== - dependencies: - "@babel/runtime" "^7.11.2" - another-json "^0.2.0" - browser-request "^0.3.3" - bs58 "^4.0.1" - content-type "^1.0.4" - loglevel "^1.7.0" - qs "^6.9.4" - 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" @@ -7936,10 +7921,10 @@ matrix-mock-request@^1.2.3: bluebird "^3.5.0" expect "^1.20.2" -matrix-react-sdk@3.9.0-rc.1: - version "3.9.0-rc.1" - resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.9.0-rc.1.tgz#08c0df3885f4069e3e1325688de9f245234ff57a" - integrity sha512-YRugb0usacVy0i11nbg3UmkxX7I8CBnr+419PxK/nO0pca9qSgJPqELljyWnaZkvOSTOABSkrbdwr0z9tr+BSA== +matrix-react-sdk@3.9.0: + version "3.9.0" + resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.9.0.tgz#23836f79d143d359ef63020d7ae9999c4a406c02" + integrity sha512-T24usyiQVepk/hptzFvCDYoWGjfrxe2TFR/59LaEn38+mRBzyogXshOLBpsZOLDAfvvE8RFfYmCH1z58AO2j/Q== dependencies: "@babel/runtime" "^7.10.5" await-lock "^2.0.1" @@ -7966,7 +7951,7 @@ matrix-react-sdk@3.9.0-rc.1: is-ip "^2.0.0" linkifyjs "^2.1.9" lodash "^4.17.19" - matrix-js-sdk "9.2.0-rc.1" + matrix-js-sdk "9.2.0" matrix-widget-api "^0.1.0-beta.8" minimist "^1.2.5" pako "^1.0.11" From 0c1a4c9a24f59d1b3aaced74709bf3e9abeed2dd Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Mon, 23 Nov 2020 16:48:30 +0000 Subject: [PATCH 092/119] Prepare changelog for v1.7.14 --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index bd04b1ca27c..8083cf31fa4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +Changes in [1.7.14](https://github.com/vector-im/element-web/releases/tag/v1.7.14) (2020-11-23) +=============================================================================================== +[Full Changelog](https://github.com/vector-im/element-web/compare/v1.7.14-rc.1...v1.7.14) + + * Upgrade to React SDK 3.9.0 and JS SDK 9.2.0 + Changes in [1.7.14-rc.1](https://github.com/vector-im/element-web/releases/tag/v1.7.14-rc.1) (2020-11-18) ========================================================================================================= [Full Changelog](https://github.com/vector-im/element-web/compare/v1.7.13...v1.7.14-rc.1) From f5d35462e41d05d778469cef4c2abed784a896cc Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Mon, 23 Nov 2020 16:48:31 +0000 Subject: [PATCH 093/119] v1.7.14 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 046f117b1fa..6f1673500c0 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "riot-web", "productName": "Riot", - "version": "1.7.14-rc.1", + "version": "1.7.14", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "repository": { From 19cc55f95d8f61ffb0fe0bbbb6767002e4cfda9d Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Mon, 23 Nov 2020 16:52:12 +0000 Subject: [PATCH 094/119] 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 6f1673500c0..19b7c488f26 100644 --- a/package.json +++ b/package.json @@ -60,7 +60,7 @@ "gfm.css": "^1.1.2", "highlight.js": "^9.13.1", "jsrsasign": "^9.1.5", - "matrix-js-sdk": "9.2.0", + "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop", "matrix-react-sdk": "3.9.0", "matrix-widget-api": "^0.1.0-beta.8", "olm": "https://packages.matrix.org/npm/olm/olm-3.2.1.tgz", diff --git a/yarn.lock b/yarn.lock index 0e3bc1126b4..2dcbdcaca14 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7913,6 +7913,20 @@ matrix-js-sdk@9.2.0: request "^2.88.2" unhomoglyph "^1.0.6" +"matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop": + version "9.2.0" + resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/6661bde6088e6e43f31198e8532432e162aef33c" + dependencies: + "@babel/runtime" "^7.11.2" + another-json "^0.2.0" + browser-request "^0.3.3" + bs58 "^4.0.1" + content-type "^1.0.4" + loglevel "^1.7.0" + qs "^6.9.4" + 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 9e2648877a5208b4cbc8d7bf8d503fba95ac9753 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Mon, 23 Nov 2020 16:52:23 +0000 Subject: [PATCH 095/119] Reset matrix-react-sdk back to develop branch --- package.json | 2 +- yarn.lock | 31 +++++++++++-------------------- 2 files changed, 12 insertions(+), 21 deletions(-) diff --git a/package.json b/package.json index 19b7c488f26..d2c2e274afa 100644 --- a/package.json +++ b/package.json @@ -61,7 +61,7 @@ "highlight.js": "^9.13.1", "jsrsasign": "^9.1.5", "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop", - "matrix-react-sdk": "3.9.0", + "matrix-react-sdk": "github:matrix-org/matrix-react-sdk#develop", "matrix-widget-api": "^0.1.0-beta.8", "olm": "https://packages.matrix.org/npm/olm/olm-3.2.1.tgz", "prop-types": "^15.7.2", diff --git a/yarn.lock b/yarn.lock index 2dcbdcaca14..8c82719dee0 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7898,21 +7898,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@9.2.0: - version "9.2.0" - resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-9.2.0.tgz#4b01dbb170266c4fe37be9397065d870561ad220" - integrity sha512-3lPgCB2in+AHDd+tLT8HbJ9elqDeJjYCE8i8Ti+NO2Myua62HIsf3pE/C/FE/QCDTuZBTjN0vgjym22M+GO65g== - dependencies: - "@babel/runtime" "^7.11.2" - another-json "^0.2.0" - browser-request "^0.3.3" - bs58 "^4.0.1" - content-type "^1.0.4" - loglevel "^1.7.0" - qs "^6.9.4" - request "^2.88.2" - unhomoglyph "^1.0.6" - "matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop": version "9.2.0" resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/6661bde6088e6e43f31198e8532432e162aef33c" @@ -7935,10 +7920,9 @@ matrix-mock-request@^1.2.3: bluebird "^3.5.0" expect "^1.20.2" -matrix-react-sdk@3.9.0: +"matrix-react-sdk@github:matrix-org/matrix-react-sdk#develop": version "3.9.0" - resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.9.0.tgz#23836f79d143d359ef63020d7ae9999c4a406c02" - integrity sha512-T24usyiQVepk/hptzFvCDYoWGjfrxe2TFR/59LaEn38+mRBzyogXshOLBpsZOLDAfvvE8RFfYmCH1z58AO2j/Q== + resolved "https://codeload.github.com/matrix-org/matrix-react-sdk/tar.gz/ddc3f275a803269ee301d73d788fd1053120d59a" dependencies: "@babel/runtime" "^7.10.5" await-lock "^2.0.1" @@ -7965,8 +7949,8 @@ matrix-react-sdk@3.9.0: is-ip "^2.0.0" linkifyjs "^2.1.9" lodash "^4.17.19" - matrix-js-sdk "9.2.0" - matrix-widget-api "^0.1.0-beta.8" + matrix-js-sdk "github:matrix-org/matrix-js-sdk#develop" + matrix-widget-api "^0.1.0-beta.9" minimist "^1.2.5" pako "^1.0.11" parse5 "^5.1.1" @@ -8003,6 +7987,13 @@ matrix-widget-api@^0.1.0-beta.8: dependencies: events "^3.2.0" +matrix-widget-api@^0.1.0-beta.9: + version "0.1.0-beta.9" + resolved "https://registry.yarnpkg.com/matrix-widget-api/-/matrix-widget-api-0.1.0-beta.9.tgz#83952132c1610e013acb3e695f923f971ddd5637" + integrity sha512-nXo4iaquSya6hYLXccX8o1K960ckSQ0YXIubRDha+YmB+L09F5a7bUPS5JN2tYANOMzyfFAzWVuFwjHv4+K+rg== + dependencies: + events "^3.2.0" + md5.js@^1.3.4: version "1.3.5" resolved "https://registry.yarnpkg.com/md5.js/-/md5.js-1.3.5.tgz#b5d07b8e3216e3e27cd728d72f70d1e6a342005f" From 80e5c220658c1ae6680d5f94cda4960998b6ad61 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=A0imon=20Brandner?= Date: Mon, 23 Nov 2020 18:35:29 +0100 Subject: [PATCH 096/119] Better wording Co-authored-by: J. Ryan Stinnett --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 5cad146f57d..a74c8fbbf2e 100644 --- a/README.md +++ b/README.md @@ -279,8 +279,8 @@ for changes. If the inotify limits are too low your build will fail silently or `Error: EMFILE: too many open files`. To avoid these issues, we recommend a watch limit of at least `128M` and instance limit around `512`. -Linked issues are [#15750](https://github.com/vector-im/element-web/issues/15750) and -[#15774](https://github.com/vector-im/element-web/issues/15774). +You may be interested in issues [#15750](https://github.com/vector-im/element-web/issues/15750) and +[#15774](https://github.com/vector-im/element-web/issues/15774) for further details. To set a new inotify watch and instance limit, execute: From 4c1752e18cd1b6eba0cd385153897865122efbc4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=A0imon=20Brandner?= Date: Mon, 23 Nov 2020 18:36:20 +0100 Subject: [PATCH 097/119] Cleanup Co-authored-by: J. Ryan Stinnett --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index a74c8fbbf2e..936154d06a7 100644 --- a/README.md +++ b/README.md @@ -293,7 +293,7 @@ sudo sysctl -p If you wish, you can make the new limits permanent, by executing: ``` -echo fs.inotify.max_user_watches=524288 | sudo tee -a /etc/sysctl.conf +echo fs.inotify.max_user_watches=131072 | sudo tee -a /etc/sysctl.conf echo fs.inotify.max_user_instances=512 | sudo tee -a /etc/sysctl.conf sudo sysctl -p ``` From 6583064cb418acba04f10bfc8c92744b2a5234f2 Mon Sep 17 00:00:00 2001 From: "J. Ryan Stinnett" Date: Tue, 24 Nov 2020 14:05:44 +0000 Subject: [PATCH 098/119] A few additional packaging changes This renames a few more packaging bits to match the new brand. Fixes https://github.com/vector-im/element-web/issues/14896 --- README.md | 4 ++-- element.io/app/deploy.py | 2 +- package.json | 2 +- scripts/ci_package.sh | 2 +- scripts/deploy.py | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index c54eac9dc53..1f2a5c1fa58 100644 --- a/README.md +++ b/README.md @@ -39,14 +39,14 @@ released version of Element: 1. Download the latest version from https://github.com/vector-im/element-web/releases 1. Untar the tarball on your web server -1. Move (or symlink) the `riot-x.x.x` directory to an appropriate name +1. Move (or symlink) the `element-x.x.x` directory to an appropriate name 1. Configure the correct caching headers in your webserver (see below) 1. If desired, copy `config.sample.json` to `config.json` and edit it as desired. See the [configuration docs](docs/config.md) for details. 1. Enter the URL into your browser and log into Element! Releases are signed using gpg and the OpenPGP standard, and can be checked against the public key located -at https://packages.riot.im/riot-release-key.asc. +at https://packages.riot.im/element-release-key.asc. Note that for the security of your chats will need to serve Element over HTTPS. Major browsers also do not allow you to use VoIP/video diff --git a/element.io/app/deploy.py b/element.io/app/deploy.py index 33aa0af017e..a0e8d96dcbf 100755 --- a/element.io/app/deploy.py +++ b/element.io/app/deploy.py @@ -1,6 +1,6 @@ #!/usr/bin/env python # -# download and unpack a riot-web tarball. +# download and unpack a element-web tarball. # # Allows `bundles` to be extracted to a common directory, and a link to # config.json to be added. diff --git a/package.json b/package.json index b5b896b4290..13df8e19577 100644 --- a/package.json +++ b/package.json @@ -6,7 +6,7 @@ "author": "New Vector Ltd.", "repository": { "type": "git", - "url": "https://github.com/vector-im/riot-web" + "url": "https://github.com/vector-im/element-web" }, "license": "Apache-2.0", "files": [ diff --git a/scripts/ci_package.sh b/scripts/ci_package.sh index 4c6f280012e..2b82db737fe 100755 --- a/scripts/ci_package.sh +++ b/scripts/ci_package.sh @@ -6,7 +6,7 @@ set -ex -rm dist/riot-*.tar.gz || true # rm previous artifacts without failing if it doesn't exist +rm dist/element-*.tar.gz || true # rm previous artifacts without failing if it doesn't exist # Since the deps are fetched from git, we can rev-parse REACT_SHA=$(cd node_modules/matrix-react-sdk; git rev-parse --short=12 HEAD) diff --git a/scripts/deploy.py b/scripts/deploy.py index 33aa0af017e..a0e8d96dcbf 100755 --- a/scripts/deploy.py +++ b/scripts/deploy.py @@ -1,6 +1,6 @@ #!/usr/bin/env python # -# download and unpack a riot-web tarball. +# download and unpack a element-web tarball. # # Allows `bundles` to be extracted to a common directory, and a link to # config.json to be added. From 40998b799a751a1a499909a9b515ee742dd03ca1 Mon Sep 17 00:00:00 2001 From: "J. Ryan Stinnett" Date: Tue, 24 Nov 2020 15:52:39 +0000 Subject: [PATCH 099/119] Stop publishing Element to NPM It generally does not make much sense to publish an entire application like this to NPM, so we've agreed to stop doing so going forward. Fixes https://github.com/vector-im/element-web/issues/14902 --- release.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/release.sh b/release.sh index a5fb9006989..9886fb74789 100755 --- a/release.sh +++ b/release.sh @@ -43,7 +43,7 @@ do fi done -./node_modules/matrix-js-sdk/release.sh -u vector-im -z "$orig_args" +./node_modules/matrix-js-sdk/release.sh -n -z "$orig_args" release="${1#v}" tag="v${release}" From 8c916721d2e1ab6d809981c493ab94ccad719475 Mon Sep 17 00:00:00 2001 From: Travis Ralston Date: Tue, 24 Nov 2020 09:46:32 -0700 Subject: [PATCH 100/119] Update widget API for good measure in Element Web --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index d2c2e274afa..9ccb6ddc97d 100644 --- a/package.json +++ b/package.json @@ -62,7 +62,7 @@ "jsrsasign": "^9.1.5", "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop", "matrix-react-sdk": "github:matrix-org/matrix-react-sdk#develop", - "matrix-widget-api": "^0.1.0-beta.8", + "matrix-widget-api": "^0.1.0-beta.10", "olm": "https://packages.matrix.org/npm/olm/olm-3.2.1.tgz", "prop-types": "^15.7.2", "react": "^16.9.0", diff --git a/yarn.lock b/yarn.lock index 8c82719dee0..80d3447c404 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7980,10 +7980,10 @@ matrix-react-test-utils@^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-widget-api@^0.1.0-beta.8: - version "0.1.0-beta.8" - resolved "https://registry.yarnpkg.com/matrix-widget-api/-/matrix-widget-api-0.1.0-beta.8.tgz#17e85c03c46353373890b869b1fd46162bdb0026" - integrity sha512-sWqyWs0RQqny/BimZUOxUd9BTJBzQmJlJ1i3lsSh1JBygV+aK5xQsONL97fc4i6/nwQPK72uCVDF+HwTtkpAbQ== +matrix-widget-api@^0.1.0-beta.10: + version "0.1.0-beta.10" + resolved "https://registry.yarnpkg.com/matrix-widget-api/-/matrix-widget-api-0.1.0-beta.10.tgz#2e4d658d90ff3152c5567089b4ddd21fb44ec1dd" + integrity sha512-yX2UURjM1zVp7snPiOFcH9+FDBdHfAdt5HEAyDUHGJ7w/F2zOtcK/y0dMlZ1+XhxY7Wv0IBZH0US8X/ioJRX1A== dependencies: events "^3.2.0" From 278c81fbc624488fb72cc207654dd1ef3b1c6f5e Mon Sep 17 00:00:00 2001 From: Travis Ralston Date: Tue, 24 Nov 2020 10:46:07 -0700 Subject: [PATCH 101/119] Update the react-sdk reference in the lockfile --- yarn.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/yarn.lock b/yarn.lock index 80d3447c404..74e1bdbd9ec 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7922,7 +7922,7 @@ matrix-mock-request@^1.2.3: "matrix-react-sdk@github:matrix-org/matrix-react-sdk#develop": version "3.9.0" - resolved "https://codeload.github.com/matrix-org/matrix-react-sdk/tar.gz/ddc3f275a803269ee301d73d788fd1053120d59a" + resolved "https://codeload.github.com/matrix-org/matrix-react-sdk/tar.gz/1db130b8f0a77ebf442e8ff7ca5f2a379d176ea9" dependencies: "@babel/runtime" "^7.10.5" await-lock "^2.0.1" @@ -7950,7 +7950,7 @@ matrix-mock-request@^1.2.3: linkifyjs "^2.1.9" lodash "^4.17.19" matrix-js-sdk "github:matrix-org/matrix-js-sdk#develop" - matrix-widget-api "^0.1.0-beta.9" + matrix-widget-api "^0.1.0-beta.10" minimist "^1.2.5" pako "^1.0.11" parse5 "^5.1.1" From deb40fe172b1996aa7e4fae800e7fc93c0afb55a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 24 Nov 2020 23:45:32 +0000 Subject: [PATCH 102/119] Bump highlight.js from 9.18.1 to 10.1.2 Bumps [highlight.js](https://github.com/highlightjs/highlight.js) from 9.18.1 to 10.1.2. - [Release notes](https://github.com/highlightjs/highlight.js/releases) - [Changelog](https://github.com/highlightjs/highlight.js/blob/10.1.2/CHANGES.md) - [Commits](https://github.com/highlightjs/highlight.js/compare/9.18.1...10.1.2) Signed-off-by: dependabot[bot] --- package.json | 2 +- yarn.lock | 12 ------------ 2 files changed, 1 insertion(+), 13 deletions(-) diff --git a/package.json b/package.json index 9ccb6ddc97d..99d451f5998 100644 --- a/package.json +++ b/package.json @@ -58,7 +58,7 @@ "dependencies": { "browser-request": "^0.3.3", "gfm.css": "^1.1.2", - "highlight.js": "^9.13.1", + "highlight.js": "^10.1.2", "jsrsasign": "^9.1.5", "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop", "matrix-react-sdk": "github:matrix-org/matrix-react-sdk#develop", diff --git a/yarn.lock b/yarn.lock index 74e1bdbd9ec..6ba37f1e804 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5797,11 +5797,6 @@ highlight.js@^10.1.2: resolved "https://registry.yarnpkg.com/highlight.js/-/highlight.js-10.1.2.tgz#c20db951ba1c22c055010648dfffd7b2a968e00c" integrity sha512-Q39v/Mn5mfBlMff9r+zzA+gWxRsCRKwEMvYTiisLr/XUiFI/4puWt0Ojdko3R3JCNWGdOWaA5g/Yxqa23kC5AA== -highlight.js@^9.13.1: - version "9.18.1" - resolved "https://registry.yarnpkg.com/highlight.js/-/highlight.js-9.18.1.tgz#ed21aa001fe6252bb10a3d76d47573c6539fe13c" - integrity sha512-OrVKYz70LHsnCgmbXctv/bfuvntIKDz177h0Co37DQ5jamGZLVmoCVMtjMtNZY3X9DrCcKfklHPNeA0uPZhSJg== - hmac-drbg@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/hmac-drbg/-/hmac-drbg-1.0.1.tgz#d2745701025a6c775a6c545793ed502fc0c649a1" @@ -7987,13 +7982,6 @@ matrix-widget-api@^0.1.0-beta.10: dependencies: events "^3.2.0" -matrix-widget-api@^0.1.0-beta.9: - version "0.1.0-beta.9" - resolved "https://registry.yarnpkg.com/matrix-widget-api/-/matrix-widget-api-0.1.0-beta.9.tgz#83952132c1610e013acb3e695f923f971ddd5637" - integrity sha512-nXo4iaquSya6hYLXccX8o1K960ckSQ0YXIubRDha+YmB+L09F5a7bUPS5JN2tYANOMzyfFAzWVuFwjHv4+K+rg== - dependencies: - events "^3.2.0" - md5.js@^1.3.4: version "1.3.5" resolved "https://registry.yarnpkg.com/md5.js/-/md5.js-1.3.5.tgz#b5d07b8e3216e3e27cd728d72f70d1e6a342005f" From 06611cb9cbc989156480bb81b40c5016f31f9085 Mon Sep 17 00:00:00 2001 From: "J. Ryan Stinnett" Date: Wed, 25 Nov 2020 14:14:34 +0000 Subject: [PATCH 103/119] Change package name now that publishing to NPM has stopped --- package.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/package.json b/package.json index 8d3f93fbf7d..45f81aedfad 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,5 @@ { - "name": "riot-web", - "productName": "Riot", + "name": "element-web", "version": "1.7.14", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", From d05c022d4f2ea05b35ccc49ad4d40b268ee3ceef Mon Sep 17 00:00:00 2001 From: "J. Ryan Stinnett" Date: Wed, 25 Nov 2020 14:16:55 +0000 Subject: [PATCH 104/119] Rebrand some GitHub links --- .stylelintrc.js | 2 +- src/vector/jitsi/index.scss | 2 +- src/vector/jitsi/index.ts | 2 +- src/vector/platform/VectorBasePlatform.ts | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.stylelintrc.js b/.stylelintrc.js index 72962102858..1e03f2fbf62 100644 --- a/.stylelintrc.js +++ b/.stylelintrc.js @@ -19,7 +19,7 @@ module.exports = { "at-rule-no-unknown": null, "no-descending-specificity": null, "scss/at-rule-no-unknown": [true, { - // https://github.com/vector-im/riot-web/issues/10544 + // https://github.com/vector-im/element-web/issues/10544 "ignoreAtRules": ["define-mixin"], }], } diff --git a/src/vector/jitsi/index.scss b/src/vector/jitsi/index.scss index 2c7e020c962..95a23c1772d 100644 --- a/src/vector/jitsi/index.scss +++ b/src/vector/jitsi/index.scss @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// TODO: Match the user's theme: https://github.com/vector-im/riot-web/issues/12794 +// TODO: Match the user's theme: https://github.com/vector-im/element-web/issues/12794 @font-face { font-family: 'Nunito'; diff --git a/src/vector/jitsi/index.ts b/src/vector/jitsi/index.ts index a5a8be36e21..9ee8d58aa5e 100644 --- a/src/vector/jitsi/index.ts +++ b/src/vector/jitsi/index.ts @@ -116,7 +116,7 @@ let meetApi: any; // JitsiMeetExternalAPI console.log("Got OpenID Connect token"); } - // TODO: register widgetApi listeners for PTT controls (https://github.com/vector-im/riot-web/issues/12795) + // TODO: register widgetApi listeners for PTT controls (https://github.com/vector-im/element-web/issues/12795) widgetApi.on(`action:${ElementWidgetActions.HangupCall}`, (ev: CustomEvent) => { diff --git a/src/vector/platform/VectorBasePlatform.ts b/src/vector/platform/VectorBasePlatform.ts index 8345c3f9970..28038d8e5d9 100644 --- a/src/vector/platform/VectorBasePlatform.ts +++ b/src/vector/platform/VectorBasePlatform.ts @@ -40,7 +40,7 @@ export default abstract class VectorBasePlatform extends BasePlatform { /** * Delay creating the `Favicon` instance until first use (on the first notification) as * it uses canvas, which can trigger a permission prompt in Firefox's resist fingerprinting mode. - * See https://github.com/vector-im/riot-web/issues/9605. + * See https://github.com/vector-im/element-web/issues/9605. */ get favicon() { if (this._favicon) { From f1e89bf833d1b72faf26ad541b4641546533a83c Mon Sep 17 00:00:00 2001 From: "J. Ryan Stinnett" Date: Wed, 25 Nov 2020 17:01:19 +0000 Subject: [PATCH 105/119] Replace various instances of Riot with Element --- docs/app-load.md | 2 +- docs/config.md | 2 +- docs/jitsi.md | 2 +- docs/review.md | 2 +- docs/skinning thoughts.md | 2 +- scripts/issues-no-state.pl | 2 +- src/vector/init.tsx | 4 ++-- src/vector/platform/ElectronPlatform.tsx | 2 +- src/vector/rageshakesetup.ts | 2 +- webpack.config.js | 2 +- 10 files changed, 11 insertions(+), 11 deletions(-) diff --git a/docs/app-load.md b/docs/app-load.md index bdc0243c508..7908ce68b08 100644 --- a/docs/app-load.md +++ b/docs/app-load.md @@ -74,7 +74,7 @@ Key: Notes: + A task begins when all its dependencies (arrows going into it) are fulfilled. -+ The success of setting up rageshake is never asserted, riot-web has a fallback path for running without IDB (and thus rageshake). ++ The success of setting up rageshake is never asserted, element-web has a fallback path for running without IDB (and thus rageshake). + Everything is awaited to be settled before the Modernizr check, to allow it to make use of things like i18n if they are successful. Underlying dependencies: diff --git a/docs/config.md b/docs/config.md index 0e45e144675..063cdffb64c 100644 --- a/docs/config.md +++ b/docs/config.md @@ -152,7 +152,7 @@ decentralised. Desktop app configuration ========================= -See https://github.com/vector-im/riot-desktop#user-specified-configjson +See https://github.com/vector-im/element-desktop#user-specified-configjson UI Features =========== diff --git a/docs/jitsi.md b/docs/jitsi.md index d289cc3818a..57d9f064cb5 100644 --- a/docs/jitsi.md +++ b/docs/jitsi.md @@ -40,7 +40,7 @@ should start a new conference on your Jitsi server. domain will appear later in the URL as a configuration parameter. **Hint**: If you want everyone on your homeserver to use the same Jitsi server by -default, and you are using riot-web 1.6 or newer, set the following on your homeserver's +default, and you are using element-web 1.6 or newer, set the following on your homeserver's `/.well-known/matrix/client` config: ```json { diff --git a/docs/review.md b/docs/review.md index 16d6c240485..75fd77704ac 100644 --- a/docs/review.md +++ b/docs/review.md @@ -43,7 +43,7 @@ When reviewing code, here are some things we look for and also things we avoid: ### Workflow -* Authors should request review from the riot-web team by default (if someone on +* Authors should request review from the element-web team by default (if someone on the team is clearly the expert in an area, a direct review request to them may be more appropriate) * Reviewers should remove the team review request and request review from diff --git a/docs/skinning thoughts.md b/docs/skinning thoughts.md index 46f9948ed84..0466aaa0350 100644 --- a/docs/skinning thoughts.md +++ b/docs/skinning thoughts.md @@ -52,7 +52,7 @@ other changes: - skins/vector/themes/foo/css - skins/vector/themes/foo/img - skins/vector/themes/foo/fonts - - ideally riot-web would contain almost nothing but skins/vector directory. + - ideally element-web would contain almost nothing but skins/vector directory. - ability to entirely replace CSS rather than override it for a given theme - e.g. if we replace `Login.js` with `StatusLogin.js`, then we should similarly be able to replace `_Login.scss` with `_StatusLogin.scss`. diff --git a/scripts/issues-no-state.pl b/scripts/issues-no-state.pl index 748809c59ae..f1f71f581d3 100755 --- a/scripts/issues-no-state.pl +++ b/scripts/issues-no-state.pl @@ -18,7 +18,7 @@ login => 'ara4n', pass => read_password("github password: "), ); -$gh->set_default_user_repo('vector-im', 'riot-web'); +$gh->set_default_user_repo('vector-im', 'element-web'); #my @issues = $gh->issue->repos_issues({ state => 'all', milestone => 3 }); my @issues = $gh->issue->repos_issues({ state => 'all' }); diff --git a/src/vector/init.tsx b/src/vector/init.tsx index 139e67a3bf8..f625644d04e 100644 --- a/src/vector/init.tsx +++ b/src/vector/init.tsx @@ -126,7 +126,7 @@ export async function loadSkin() { /* webpackPreload: true */ "matrix-react-sdk"), import( - /* webpackChunkName: "riot-web-component-index" */ + /* webpackChunkName: "element-web-component-index" */ /* webpackPreload: true */ // eslint-disable-next-line @typescript-eslint/ban-ts-comment // @ts-ignore - this module is generated so may fail lint @@ -143,7 +143,7 @@ export async function loadTheme() { export async function loadApp(fragParams: {}) { // load app.js async so that its code is not executed immediately and we can catch any exceptions const module = await import( - /* webpackChunkName: "riot-web-app" */ + /* webpackChunkName: "element-web-app" */ /* webpackPreload: true */ "./app"); window.matrixChat = ReactDOM.render(await module.loadApp(fragParams), diff --git a/src/vector/platform/ElectronPlatform.tsx b/src/vector/platform/ElectronPlatform.tsx index 64835a00d43..48fce171504 100644 --- a/src/vector/platform/ElectronPlatform.tsx +++ b/src/vector/platform/ElectronPlatform.tsx @@ -239,7 +239,7 @@ export default class ElectronPlatform extends VectorBasePlatform { // try to flush the rageshake logs to indexeddb before quit. ipcRenderer.on('before-quit', function() { - console.log('riot-desktop closing'); + console.log('element-desktop closing'); rageshake.flush(); }); diff --git a/src/vector/rageshakesetup.ts b/src/vector/rageshakesetup.ts index cc296702131..425246268f3 100644 --- a/src/vector/rageshakesetup.ts +++ b/src/vector/rageshakesetup.ts @@ -38,7 +38,7 @@ export function initRageshake() { "Meatball menu → Settings → Blackboxing → Add /rageshake\\.js$"); window.addEventListener('beforeunload', (e) => { - console.log('riot-web closing'); + console.log('element-web closing'); // try to flush the logs to indexeddb rageshake.flush(); }); diff --git a/webpack.config.js b/webpack.config.js index 23db22890b7..2b540f7bbbd 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -249,7 +249,7 @@ module.exports = (env, argv) => { }, { // cache-bust languages.json file placed in - // riot-web/webapp/i18n during build by copy-res.js + // element-web/webapp/i18n during build by copy-res.js test: /\.*languages.json$/, type: "javascript/auto", loader: 'file-loader', From 6e7826f41672e6b5f42ae39d355bb20b3e3749af Mon Sep 17 00:00:00 2001 From: m4sk1n Date: Tue, 24 Nov 2020 07:42:15 +0000 Subject: [PATCH 106/119] Translated using Weblate (Polish) Currently translated at 100.0% (33 of 33 strings) Translation: Element Web/element-web Translate-URL: https://translate.element.io/projects/element-web/element-web/pl/ --- src/i18n/strings/pl.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/i18n/strings/pl.json b/src/i18n/strings/pl.json index 707418edb08..4c9329cf0ce 100644 --- a/src/i18n/strings/pl.json +++ b/src/i18n/strings/pl.json @@ -31,5 +31,6 @@ "Your browser can't run %(brand)s": "Twoja przeglądarka nie obsługuje %(brand)s", "%(brand)s uses advanced browser features which aren't supported by your current browser.": "%(brand)s używa zaawansowanych funkcji przeglądarki, które nie są dostępne w twojej przeglądarce.", "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" + "Your Element is misconfigured": "Element jest nieprawidłowo skonfigurowany", + "Powered by Matrix": "Zasilane przez Matrix" } From 58445efdde195bc5f3a16bf3d17b339f0794ab12 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=AE=D1=80=D0=B8=D0=B9=20=D0=A0=D1=83=D1=80=D0=B5=D0=BD?= =?UTF-8?q?=D0=BA=D0=BE?= Date: Tue, 24 Nov 2020 08:35:56 +0000 Subject: [PATCH 107/119] Translated using Weblate (Ukrainian) Currently translated at 100.0% (33 of 33 strings) Translation: Element Web/element-web Translate-URL: https://translate.element.io/projects/element-web/element-web/uk/ --- src/i18n/strings/uk.json | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/src/i18n/strings/uk.json b/src/i18n/strings/uk.json index fe57f2f679d..8151a78bd62 100644 --- a/src/i18n/strings/uk.json +++ b/src/i18n/strings/uk.json @@ -2,35 +2,35 @@ "Dismiss": "Відхилити", "powered by Matrix": "працює на Matrix", "Unknown device": "Невідомий пристрій", - "You need to be using HTTPS to place a screen-sharing call.": "Ви маєте використовувати HTTPS щоб зробити виклик із поширенням екрану.", + "You need to be using HTTPS to place a screen-sharing call.": "Ви маєте використовувати HTTPS щоб зробити виклик із спільним доступом до екрану.", "Welcome to Element": "Ласкаво просимо до Element", - "Decentralised, encrypted chat & collaboration powered by [matrix]": "Децентралізована, зашифрована балачка та засіб для співробітництва, що працює на [matrix]", + "Decentralised, encrypted chat & collaboration powered by [matrix]": "Децентралізований, зашифрований чат та засіб для співпраці, заснований на [matrix]", "Sign In": "Увійти", "Create Account": "Створити обліковий запис", "Explore rooms": "Шукати кімнати", - "Unexpected error preparing the app. See console for details.": "Неочікувана помилка при готуванні програми. Дивіться деталі у виводі консолі.", + "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", + "Invalid configuration: no default server specified.": "Невірна конфігурація: не вказано сервер за замовчуванням.", + "The message from the parser is: %(message)s": "Повідомлення від аналізатора : %(message)s", "Invalid JSON": "Хибний JSON", - "Unsupported browser": "Непідтримуваний переглядач", + "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 налаштовано неправильно", + "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.": "Неможливо завантажити файл конфігурації. Оновіть, будь ласка, сторінку.", + "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 Desktop (%(platformName)s)", - "Go to your browser to complete Sign In": "Перейдіть у ваш переглядач щоб завершити входження", + "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 використовує передові властивості, які ваш переглядач не підтримує." + "%(brand)s uses advanced browser features which aren't supported by your current browser.": "%(brand)s використовує передові властивості, які ваш браузер не підтримує." } From 899bcc067f397b624000ec76e9381a0c5d97bc58 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Priit=20J=C3=B5er=C3=BC=C3=BCt?= Date: Tue, 24 Nov 2020 21:55:52 +0000 Subject: [PATCH 108/119] Translated using Weblate (Estonian) Currently translated at 100.0% (33 of 33 strings) Translation: Element Web/element-web Translate-URL: https://translate.element.io/projects/element-web/element-web/et/ --- src/i18n/strings/et.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/i18n/strings/et.json b/src/i18n/strings/et.json index 8b6dc8d1d14..7ebc4312120 100644 --- a/src/i18n/strings/et.json +++ b/src/i18n/strings/et.json @@ -15,7 +15,7 @@ "Previous/next recently visited room or community": "Eelmine/järgmine hiljuti kasutatud jututuba või kogukond", "You need to be using HTTPS to place a screen-sharing call.": "Ekraani jagava kõne jaoks pead kasutama HTTPS-ühendust.", "powered by Matrix": "põhineb Matrix'il", - "Welcome to Element": "Tere tulemast Element kasutajaks", + "Welcome to Element": "Tere tulemast kasutama suhtlusrakendust Element", "Sign In": "Logi sisse", "Create Account": "Loo konto", "%(brand)s Desktop (%(platformName)s)": "%(brand)s'i töölauaversioon (%(platformName)s)", From e743a12f30d456fd09fd498f4cc4ff65a3212b18 Mon Sep 17 00:00:00 2001 From: Aleks Kissinger Date: Thu, 26 Nov 2020 17:40:14 +0000 Subject: [PATCH 109/119] matched setting name to PR in matrix-react-sdk --- docs/labs.md | 4 ++-- webpack.config.js | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/labs.md b/docs/labs.md index 198d94f4f11..9188de9c74b 100644 --- a/docs/labs.md +++ b/docs/labs.md @@ -7,9 +7,9 @@ to `Settings->Labs`. This list is non-exhaustive and subject to change, chat in **Be warned! Labs features are not finalised, they may be fragile, they may change, they may be dropped. Ask in the room if you are unclear about any details here.** -## LaTeX math in messages (`feature_latex_maths`) +## Render LaTeX maths in messages (`feature_latex_maths`) -Enables LaTeX math in messages using [KaTeX](https://katex.org/). +Enables rendering of LaTeX maths in messages using [KaTeX](https://katex.org/). LaTeX between single dollar-signs is interpreted as inline maths and double dollar-signs as display maths (i.e. centred on its own line). ## New spinner design (`feature_new_spinner`) diff --git a/webpack.config.js b/webpack.config.js index b61a3e952fb..b20f3722a79 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -41,7 +41,7 @@ module.exports = (env, argv) => { "jitsi": "./src/vector/jitsi/index.ts", "usercontent": "./node_modules/matrix-react-sdk/src/usercontent/index.js", - // CSS for math outout + // CSS for LaTeX maths outout "katex": "./node_modules/matrix-react-sdk/node_modules/katex/dist/katex.min.css", // CSS themes From 078a1223b2bba9b0a7d7717b115251ddf81835c0 Mon Sep 17 00:00:00 2001 From: MamasLT Date: Sat, 28 Nov 2020 18:42:15 +0000 Subject: [PATCH 110/119] Translated using Weblate (Lithuanian) Currently translated at 100.0% (33 of 33 strings) Translation: Element Web/element-web Translate-URL: https://translate.element.io/projects/element-web/element-web/lt/ --- src/i18n/strings/lt.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/i18n/strings/lt.json b/src/i18n/strings/lt.json index 3932a2416e6..f5a7826b59f 100644 --- a/src/i18n/strings/lt.json +++ b/src/i18n/strings/lt.json @@ -18,7 +18,7 @@ "Missing indexeddb worker script!": "Trūksta indexeddb worker skripto!", "Unable to load config file: please refresh the page to try again.": "Nepavyko įkelti konfigūracijos failo: atnaujinkite puslapį, kad pabandytumėte dar kartą.", "Previous/next recently visited room or community": "Ankstesnis/sekantis neseniai lankytas kambarys ar bendruomenė", - "%(brand)s Desktop (%(platformName)s)": "%(brand)s Kompiuteriui (%(platformName)s)", + "%(brand)s Desktop (%(platformName)s)": "%(brand)s Kompiuteryje (%(platformName)s)", "%(appName)s (%(browserName)s, %(osName)s)": "%(appName)s (%(browserName)s, %(osName)s)", "Unsupported browser": "Nepalaikoma naršyklė", "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.": "Jūs galite toliau naudotis savo dabartine naršykle, bet kai kurios arba visos funkcijos gali neveikti ir programos išvaizda bei sąsaja gali būti neteisingai rodoma.", From 512212b021cd2596ce217a3fcb3cc4fcf0d9ab70 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Wed, 2 Dec 2020 14:41:03 +0000 Subject: [PATCH 111/119] Upgrade matrix-js-sdk to 9.3.0-rc.1 --- package.json | 2 +- yarn.lock | 27 +++++++++++++++++++++++++++ 2 files changed, 28 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index 61bbdd762a2..765b4ff8d08 100644 --- a/package.json +++ b/package.json @@ -59,7 +59,7 @@ "gfm.css": "^1.1.2", "highlight.js": "^10.1.2", "jsrsasign": "^9.1.5", - "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop", + "matrix-js-sdk": "9.3.0-rc.1", "matrix-react-sdk": "github:matrix-org/matrix-react-sdk#develop", "matrix-widget-api": "^0.1.0-beta.10", "olm": "https://packages.matrix.org/npm/olm/olm-3.2.1.tgz", diff --git a/yarn.lock b/yarn.lock index 6ba37f1e804..6df1cc56227 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1055,6 +1055,13 @@ dependencies: regenerator-runtime "^0.13.4" +"@babel/runtime@^7.12.5": + version "7.12.5" + resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.12.5.tgz#410e7e487441e1b360c29be715d870d9b985882e" + integrity sha512-plcc+hbExy3McchJCEQG3knOsuh3HH+Prx1P6cLIkET/0dLuQDEnrT+s27Axgc9bqfsmNUNHfscgMUdBpC9xfg== + dependencies: + regenerator-runtime "^0.13.4" + "@babel/template@^7.10.1", "@babel/template@^7.4.0": version "7.10.1" resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.10.1.tgz#e167154a94cb5f14b28dc58f5356d2162f539811" @@ -7755,6 +7762,11 @@ loglevel@^1.7.0: resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.7.0.tgz#728166855a740d59d38db01cf46f042caa041bb0" integrity sha512-i2sY04nal5jDcagM3FMfG++T69GEEM8CYuOfeOIvmXzOIcwE9a/CJPR0MFM97pYMj/u10lzz7/zd7+qwhrBTqQ== +loglevel@^1.7.1: + version "1.7.1" + resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.7.1.tgz#005fde2f5e6e47068f935ff28573e125ef72f197" + integrity sha512-Hesni4s5UkWkwCGJMQGAh71PaLUmKFM60dHvq0zi/vDhhrzuk+4GgNbTXJ12YYQJn6ZKBDNIjYcuQGKudvqrIw== + lolex@^5.0.0: version "5.1.2" resolved "https://registry.yarnpkg.com/lolex/-/lolex-5.1.2.tgz#953694d098ce7c07bc5ed6d0e42bc6c0c6d5a367" @@ -7893,6 +7905,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@9.3.0-rc.1: + version "9.3.0-rc.1" + resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-9.3.0-rc.1.tgz#d6ad2d9a5e0c539c6aec9e587a6dd2b5aa8bf2f6" + integrity sha512-H20QLwsgzBIO0Lp75CYBlw4QTOHT98vCESNZrnjIsu8FlFqsXIhdTa5C8BIYsNLex5luufxdp2an5BQtJEuAUQ== + 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.4" + request "^2.88.2" + unhomoglyph "^1.0.6" + "matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop": version "9.2.0" resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/6661bde6088e6e43f31198e8532432e162aef33c" From b4167eaeaf46c093277b7cdcfdfcf318313c52d5 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Wed, 2 Dec 2020 14:41:28 +0000 Subject: [PATCH 112/119] Upgrade matrix-react-sdk to 3.10.0-rc.1 --- package.json | 2 +- yarn.lock | 84 +++++++++++++++++++++++++++++++--------------------- 2 files changed, 51 insertions(+), 35 deletions(-) diff --git a/package.json b/package.json index 765b4ff8d08..05c0c043430 100644 --- a/package.json +++ b/package.json @@ -60,7 +60,7 @@ "highlight.js": "^10.1.2", "jsrsasign": "^9.1.5", "matrix-js-sdk": "9.3.0-rc.1", - "matrix-react-sdk": "github:matrix-org/matrix-react-sdk#develop", + "matrix-react-sdk": "3.10.0-rc.1", "matrix-widget-api": "^0.1.0-beta.10", "olm": "https://packages.matrix.org/npm/olm/olm-3.2.1.tgz", "prop-types": "^15.7.2", diff --git a/yarn.lock b/yarn.lock index 6df1cc56227..85cca7d07ef 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1048,13 +1048,6 @@ dependencies: regenerator-runtime "^0.13.4" -"@babel/runtime@^7.11.2": - version "7.11.2" - resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.11.2.tgz#f549c13c754cc40b87644b9fa9f09a6a95fe0736" - integrity sha512-TeWkU52so0mPtDcaCTxNBI/IHiz0pZgr8VEFqXFtZWpYD08ZB6FaSwVAS8MKRQAP3bYKiVjwysOJgMFY28o6Tw== - dependencies: - regenerator-runtime "^0.13.4" - "@babel/runtime@^7.12.5": version "7.12.5" resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.12.5.tgz#410e7e487441e1b360c29be715d870d9b985882e" @@ -3017,6 +3010,18 @@ chardet@^0.7.0: resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.7.0.tgz#90094849f0937f2eedc2425d0d28a9e5f0cbad9e" integrity sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA== +cheerio@^1.0.0-rc.3: + version "1.0.0-rc.3" + resolved "https://registry.yarnpkg.com/cheerio/-/cheerio-1.0.0-rc.3.tgz#094636d425b2e9c0f4eb91a46c05630c9a1a8bf6" + integrity sha512-0td5ijfUPuubwLUu0OBoe98gZj8C/AA+RW3v67GPlGOrvxWjZmBXiBCRU+I8VEiNyJzjth40POfHiz2RB3gImA== + dependencies: + css-select "~1.2.0" + dom-serializer "~0.1.1" + entities "~1.1.1" + htmlparser2 "^3.9.1" + lodash "^4.15.0" + parse5 "^3.0.1" + chokidar@^1.6.0: version "1.7.0" resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-1.7.0.tgz#798e689778151c8076b4b360e5edd28cda2bb468" @@ -3259,7 +3264,7 @@ commander@2.17.x: resolved "https://registry.yarnpkg.com/commander/-/commander-2.17.1.tgz#bd77ab7de6de94205ceacc72f1716d29f20a77bf" integrity sha512-wPMUt6FnH2yzG95SA6mzjQOEKUU3aLaDEmzs1ti+1E9h+CsrZghRlqEM/EJ4KscsQVG8uNN4uVreUeT8+drlgg== -commander@^2.15.1, commander@^2.20.0: +commander@^2.15.1, commander@^2.19.0, commander@^2.20.0: version "2.20.3" resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33" integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ== @@ -3624,7 +3629,7 @@ css-select-base-adapter@^0.1.1: resolved "https://registry.yarnpkg.com/css-select-base-adapter/-/css-select-base-adapter-0.1.1.tgz#3b2ff4972cc362ab88561507a95408a1432135d7" integrity sha512-jQVeeRG70QI08vSTwf1jHxp74JoZsr2XSgETae8/xC8ovSnL2WF87GTLO86Sbwdt2lK4Umg4HnnwMO4YF3Ce7w== -css-select@^1.1.0: +css-select@^1.1.0, css-select@~1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/css-select/-/css-select-1.2.0.tgz#2b3a110539c5355f1cd8d314623e870b121ec858" integrity sha1-KzoRBTnFNV8c2NMUYj6HCxIeyFg= @@ -4115,12 +4120,20 @@ dom-serializer@0, dom-serializer@^0.2.1: domelementtype "^2.0.1" entities "^2.0.0" +dom-serializer@~0.1.1: + version "0.1.1" + resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-0.1.1.tgz#1ec4059e284babed36eec2941d4a970a189ce7c0" + integrity sha512-l0IU0pPzLWSHBcieZbpOKgkIn3ts3vAh7ZuFyXNwJxJXk/c4Gwj9xaTJwIDVQCXawWD0qb3IzMGH5rglQaO0XA== + dependencies: + domelementtype "^1.3.0" + entities "^1.1.1" + domain-browser@^1.1.1: version "1.2.0" resolved "https://registry.yarnpkg.com/domain-browser/-/domain-browser-1.2.0.tgz#3d31f50191a6749dd1375a7f522e823d42e54eda" integrity sha512-jnjyiM6eRyZl2H+W8Q/zLMA481hzi0eszAaBUzIVnmYVDBbnLxVNnfu1HgEBvCbL+71FrxMl3E6lpKH7Ge3OXA== -domelementtype@1, domelementtype@^1.3.1: +domelementtype@1, domelementtype@^1.3.0, domelementtype@^1.3.1: version "1.3.1" resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-1.3.1.tgz#d048c44b37b0d10a7f2a3d5fee3f4333d790481f" integrity sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w== @@ -5912,7 +5925,7 @@ html-webpack-plugin@^3.2.0: toposort "^1.0.0" util.promisify "1.0.0" -htmlparser2@^3.10.0, htmlparser2@^3.3.0: +htmlparser2@^3.10.0, htmlparser2@^3.3.0, htmlparser2@^3.9.1: version "3.10.1" resolved "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-3.10.1.tgz#bd679dc3f59897b6a34bb10749c855bb53a9392f" integrity sha512-IgieNijUMbkDovyoKObU1DUhm1iwNYE/fuifEoEHfd1oZKZDaONBSkal7Y01shxsM49R4XaMdGez3WnF9UfiCQ== @@ -7498,6 +7511,13 @@ jsx-ast-utils@^2.4.1: array-includes "^3.1.1" object.assign "^4.1.0" +katex@^0.12.0: + version "0.12.0" + resolved "https://registry.yarnpkg.com/katex/-/katex-0.12.0.tgz#2fb1c665dbd2b043edcf8a1f5c555f46beaa0cb9" + integrity sha512-y+8btoc/CK70XqcHqjxiGWBOeIL8upbS0peTPXTvgrh21n1RiWWcIpSWM+4uXq+IAgNh9YYQWdc7LVDPDAEEAg== + dependencies: + commander "^2.19.0" + killable@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/killable/-/killable-1.0.1.tgz#4c8ce441187a061c7474fb87ca08e2a638194892" @@ -7733,6 +7753,11 @@ lodash.uniq@^4.5.0: resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773" integrity sha1-0CJTc662Uq3BvILklFM5qEJ1R3M= +lodash@^4.15.0: + version "4.17.20" + resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.20.tgz#b44a9b6297bcb698f1c51a3545a2b3b368d59c52" + integrity sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA== + lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.13, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.16, lodash@^4.17.19, lodash@^4.17.3, lodash@^4.17.5, lodash@^4.2.1: version "4.17.19" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.19.tgz#e48ddedbe30b3321783c5b4301fbd353bc1e4a4b" @@ -7757,11 +7782,6 @@ loglevel@^1.6.8: resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.6.8.tgz#8a25fb75d092230ecd4457270d80b54e28011171" integrity sha512-bsU7+gc9AJ2SqpzxwU3+1fedl8zAntbtC5XYlt3s2j1hJcn2PsXSmgN8TaLG/J1/2mod4+cE/3vNL70/c1RNCA== -loglevel@^1.7.0: - version "1.7.0" - resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.7.0.tgz#728166855a740d59d38db01cf46f042caa041bb0" - integrity sha512-i2sY04nal5jDcagM3FMfG++T69GEEM8CYuOfeOIvmXzOIcwE9a/CJPR0MFM97pYMj/u10lzz7/zd7+qwhrBTqQ== - loglevel@^1.7.1: version "1.7.1" resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.7.1.tgz#005fde2f5e6e47068f935ff28573e125ef72f197" @@ -7920,20 +7940,6 @@ matrix-js-sdk@9.3.0-rc.1: request "^2.88.2" unhomoglyph "^1.0.6" -"matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop": - version "9.2.0" - resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/6661bde6088e6e43f31198e8532432e162aef33c" - dependencies: - "@babel/runtime" "^7.11.2" - another-json "^0.2.0" - browser-request "^0.3.3" - bs58 "^4.0.1" - content-type "^1.0.4" - loglevel "^1.7.0" - qs "^6.9.4" - 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" @@ -7942,15 +7948,17 @@ 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.9.0" - resolved "https://codeload.github.com/matrix-org/matrix-react-sdk/tar.gz/1db130b8f0a77ebf442e8ff7ca5f2a379d176ea9" +matrix-react-sdk@3.10.0-rc.1: + version "3.10.0-rc.1" + resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.10.0-rc.1.tgz#4c65dd5333e5c9c7a6d9207e68430c3666eef4f7" + integrity sha512-SG8vOTSAV7+4lb6stIi+ymYVSW5s9bLQWbF0oj/EVTY9EJmhxf7Lskj/UqliZVxoCXoKIhMVGZZ2LcDjOKmBeg== dependencies: "@babel/runtime" "^7.10.5" await-lock "^2.0.1" blueimp-canvas-to-blob "^3.27.0" browser-encrypt-attachment "^0.3.0" browser-request "^0.3.3" + cheerio "^1.0.0-rc.3" classnames "^2.2.6" commonmark "^0.29.1" counterpart "^0.18.6" @@ -7969,9 +7977,10 @@ matrix-mock-request@^1.2.3: highlight.js "^10.1.2" html-entities "^1.3.1" is-ip "^2.0.0" + katex "^0.12.0" linkifyjs "^2.1.9" lodash "^4.17.19" - matrix-js-sdk "github:matrix-org/matrix-js-sdk#develop" + matrix-js-sdk "9.3.0-rc.1" matrix-widget-api "^0.1.0-beta.10" minimist "^1.2.5" pako "^1.0.11" @@ -9057,6 +9066,13 @@ parse5@5.1.1, parse5@^5.1.1: resolved "https://registry.yarnpkg.com/parse5/-/parse5-5.1.1.tgz#f68e4e5ba1852ac2cadc00f4555fff6c2abb6178" integrity sha512-ugq4DFI0Ptb+WWjAdOK16+u/nHfiIrcE+sh8kZMaM0WllQKLI9rOUq6c2b7cwPkXdzfQESqvoqK6ug7U/Yyzug== +parse5@^3.0.1: + version "3.0.3" + resolved "https://registry.yarnpkg.com/parse5/-/parse5-3.0.3.tgz#042f792ffdd36851551cf4e9e066b3874ab45b5c" + integrity sha512-rgO9Zg5LLLkfJF9E6CCmXlSE4UVceloys8JrFqCcHloC3usd/kJCyPDwH2SOlzix2j3xaP9sUX3e8+kvkuleAA== + dependencies: + "@types/node" "*" + parseurl@~1.3.2, parseurl@~1.3.3: version "1.3.3" resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.3.tgz#9da19e7bee8d12dff0513ed5b76957793bc2e8d4" From 1a635f6bf0acc6d4c401b61a2ae848ca43357c56 Mon Sep 17 00:00:00 2001 From: "J. Ryan Stinnett" Date: Fri, 27 Nov 2020 12:18:24 +0000 Subject: [PATCH 113/119] Include KaTeX CSS as a dependency This changes the KaTeX CSS inclusion to function just like the other bits of the CSS that we import from dependencies. --- package.json | 1 + src/vector/index.ts | 1 + webpack.config.js | 3 --- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index 05c0c043430..214c7c38d5d 100644 --- a/package.json +++ b/package.json @@ -59,6 +59,7 @@ "gfm.css": "^1.1.2", "highlight.js": "^10.1.2", "jsrsasign": "^9.1.5", + "katex": "^0.12.0", "matrix-js-sdk": "9.3.0-rc.1", "matrix-react-sdk": "3.10.0-rc.1", "matrix-widget-api": "^0.1.0-beta.10", diff --git a/src/vector/index.ts b/src/vector/index.ts index a88c1d068d0..a3a7bbb90c7 100644 --- a/src/vector/index.ts +++ b/src/vector/index.ts @@ -23,6 +23,7 @@ limitations under the License. // in webpack.config.js require('gfm.css/gfm.css'); require('highlight.js/styles/github.css'); +require('katex/dist/katex.css') // These are things that can run before the skin loads - be careful not to reference the react-sdk though. import {parseQsFromFragment} from "./url_utils"; diff --git a/webpack.config.js b/webpack.config.js index 326e48e2ef5..2b540f7bbbd 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -41,9 +41,6 @@ module.exports = (env, argv) => { "jitsi": "./src/vector/jitsi/index.ts", "usercontent": "./node_modules/matrix-react-sdk/src/usercontent/index.js", - // CSS for LaTeX maths outout - "katex": "./node_modules/matrix-react-sdk/node_modules/katex/dist/katex.min.css", - // CSS themes "theme-legacy": "./node_modules/matrix-react-sdk/res/themes/legacy-light/css/legacy-light.scss", "theme-legacy-dark": "./node_modules/matrix-react-sdk/res/themes/legacy-dark/css/legacy-dark.scss", From 1c63db6441fe8e5f6e8c2e71ab2f052cb2cd1f21 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Wed, 2 Dec 2020 14:45:16 +0000 Subject: [PATCH 114/119] Prepare changelog for v1.7.15-rc.1 --- CHANGELOG.md | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8083cf31fa4..4dc04d23b79 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,30 @@ +Changes in [1.7.15-rc.1](https://github.com/vector-im/element-web/releases/tag/v1.7.15-rc.1) (2020-12-02) +========================================================================================================= +[Full Changelog](https://github.com/vector-im/element-web/compare/v1.7.14...v1.7.15-rc.1) + + * Upgrade to React SDK 3.10.0-rc.1 and JS SDK 9.3.0-rc.1 + * Include KaTeX CSS as a dependency + [\#15843](https://github.com/vector-im/element-web/pull/15843) + * Translations update from Weblate + [\#15884](https://github.com/vector-im/element-web/pull/15884) + * added katex.min.css to webpack for math support (main PR in matrix-react- + sdk) + [\#15277](https://github.com/vector-im/element-web/pull/15277) + * Rebrand package name and other details + [\#15828](https://github.com/vector-im/element-web/pull/15828) + * Bump highlight.js from 9.18.1 to 10.1.2 + [\#15819](https://github.com/vector-im/element-web/pull/15819) + * Update branding of packaging artifacts + [\#15810](https://github.com/vector-im/element-web/pull/15810) + * Update the react-sdk reference in the lockfile + [\#15814](https://github.com/vector-im/element-web/pull/15814) + * Update widget API for good measure in Element Web + [\#15812](https://github.com/vector-im/element-web/pull/15812) + * Stop publishing Element to NPM + [\#15811](https://github.com/vector-im/element-web/pull/15811) + * Add inotify instance limit info to README + [\#15795](https://github.com/vector-im/element-web/pull/15795) + Changes in [1.7.14](https://github.com/vector-im/element-web/releases/tag/v1.7.14) (2020-11-23) =============================================================================================== [Full Changelog](https://github.com/vector-im/element-web/compare/v1.7.14-rc.1...v1.7.14) From 9084a70e2e9614221c850104ee2c9fb50ccafc2f Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Wed, 2 Dec 2020 15:02:39 +0000 Subject: [PATCH 115/119] v1.7.15-rc.1 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 214c7c38d5d..b53a510c3f6 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "element-web", - "version": "1.7.14", + "version": "1.7.15-rc.1", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "repository": { From dab75ec0c2ead25964637e1c5e5ebaa4fe84fa7b Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Mon, 7 Dec 2020 12:34:41 +0000 Subject: [PATCH 116/119] Upgrade matrix-js-sdk to 9.3.0 --- package.json | 2 +- yarn.lock | 15 +++++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index b53a510c3f6..c5a727f5e49 100644 --- a/package.json +++ b/package.json @@ -60,7 +60,7 @@ "highlight.js": "^10.1.2", "jsrsasign": "^9.1.5", "katex": "^0.12.0", - "matrix-js-sdk": "9.3.0-rc.1", + "matrix-js-sdk": "9.3.0", "matrix-react-sdk": "3.10.0-rc.1", "matrix-widget-api": "^0.1.0-beta.10", "olm": "https://packages.matrix.org/npm/olm/olm-3.2.1.tgz", diff --git a/yarn.lock b/yarn.lock index 85cca7d07ef..d562a2cdc51 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7925,6 +7925,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@9.3.0: + version "9.3.0" + resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-9.3.0.tgz#e5fa3f6cb5a56e5c5386ecf3110dc35072170dbb" + integrity sha512-rzvYJS5mMP42iQVfGokX8DgmJpTUH+k15vATyB5JyBq/3r/kP22tN78RgoNxYzrIP/R4rB4OHUFNtgGzBH2u8g== + 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.4" + request "^2.88.2" + unhomoglyph "^1.0.6" + matrix-js-sdk@9.3.0-rc.1: version "9.3.0-rc.1" resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-9.3.0-rc.1.tgz#d6ad2d9a5e0c539c6aec9e587a6dd2b5aa8bf2f6" From 110f4dc907913987e0108f99c1652ad166f75fe6 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Mon, 7 Dec 2020 12:36:01 +0000 Subject: [PATCH 117/119] Upgrade matrix-react-sdk to 3.10.0 --- package.json | 2 +- yarn.lock | 25 +++++-------------------- 2 files changed, 6 insertions(+), 21 deletions(-) diff --git a/package.json b/package.json index c5a727f5e49..6f90f862bb6 100644 --- a/package.json +++ b/package.json @@ -61,7 +61,7 @@ "jsrsasign": "^9.1.5", "katex": "^0.12.0", "matrix-js-sdk": "9.3.0", - "matrix-react-sdk": "3.10.0-rc.1", + "matrix-react-sdk": "3.10.0", "matrix-widget-api": "^0.1.0-beta.10", "olm": "https://packages.matrix.org/npm/olm/olm-3.2.1.tgz", "prop-types": "^15.7.2", diff --git a/yarn.lock b/yarn.lock index d562a2cdc51..d1583441716 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7940,21 +7940,6 @@ matrix-js-sdk@9.3.0: request "^2.88.2" unhomoglyph "^1.0.6" -matrix-js-sdk@9.3.0-rc.1: - version "9.3.0-rc.1" - resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-9.3.0-rc.1.tgz#d6ad2d9a5e0c539c6aec9e587a6dd2b5aa8bf2f6" - integrity sha512-H20QLwsgzBIO0Lp75CYBlw4QTOHT98vCESNZrnjIsu8FlFqsXIhdTa5C8BIYsNLex5luufxdp2an5BQtJEuAUQ== - 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.4" - 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" @@ -7963,10 +7948,10 @@ matrix-mock-request@^1.2.3: bluebird "^3.5.0" expect "^1.20.2" -matrix-react-sdk@3.10.0-rc.1: - version "3.10.0-rc.1" - resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.10.0-rc.1.tgz#4c65dd5333e5c9c7a6d9207e68430c3666eef4f7" - integrity sha512-SG8vOTSAV7+4lb6stIi+ymYVSW5s9bLQWbF0oj/EVTY9EJmhxf7Lskj/UqliZVxoCXoKIhMVGZZ2LcDjOKmBeg== +matrix-react-sdk@3.10.0: + version "3.10.0" + resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.10.0.tgz#07575b7dc5f12093a1dab313068673a82a939dfc" + integrity sha512-LatG4kCKKy7ybUnvpoV3p6KEMSaECBIh0alw1JisuVBMw4nAYXEIbM1kGOI0h2vBF2826YqwXGj/vEyFHr7Euw== dependencies: "@babel/runtime" "^7.10.5" await-lock "^2.0.1" @@ -7995,7 +7980,7 @@ matrix-react-sdk@3.10.0-rc.1: katex "^0.12.0" linkifyjs "^2.1.9" lodash "^4.17.19" - matrix-js-sdk "9.3.0-rc.1" + matrix-js-sdk "9.3.0" matrix-widget-api "^0.1.0-beta.10" minimist "^1.2.5" pako "^1.0.11" From 44fefec9ea620b7ff74e33a2bdf6d4d3a754fd1c Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Mon, 7 Dec 2020 12:54:58 +0000 Subject: [PATCH 118/119] Prepare changelog for v1.7.15 --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4dc04d23b79..6dbd66676ca 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +Changes in [1.7.15](https://github.com/vector-im/element-web/releases/tag/v1.7.15) (2020-12-07) +=============================================================================================== +[Full Changelog](https://github.com/vector-im/element-web/compare/v1.7.15-rc.1...v1.7.15) + + * Upgrade to React SDK 3.10.0 and JS SDK 9.3.0 + Changes in [1.7.15-rc.1](https://github.com/vector-im/element-web/releases/tag/v1.7.15-rc.1) (2020-12-02) ========================================================================================================= [Full Changelog](https://github.com/vector-im/element-web/compare/v1.7.14...v1.7.15-rc.1) From 1b481c2a135d81fc09061fe50856178301ec737a Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Mon, 7 Dec 2020 12:54:59 +0000 Subject: [PATCH 119/119] v1.7.15 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 6f90f862bb6..75ef8a52396 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "element-web", - "version": "1.7.15-rc.1", + "version": "1.7.15", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "repository": {