From 6004d02b98742f1d5fd373c53c7a737c14b55afd Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Fri, 31 Jul 2020 13:33:19 +0100 Subject: [PATCH 001/268] Upgrade matrix-js-sdk to 8.0.1-rc.1 --- package.json | 2 +- yarn.lock | 15 +++++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index 8cf9f7bbe8..7c4f85e8fa 100644 --- a/package.json +++ b/package.json @@ -59,7 +59,7 @@ "browser-request": "^0.3.3", "gfm.css": "^1.1.2", "highlight.js": "^9.13.1", - "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop", + "matrix-js-sdk": "8.0.1-rc.1", "matrix-react-sdk": "github:matrix-org/matrix-react-sdk#develop", "olm": "https://packages.matrix.org/npm/olm/olm-3.1.4.tgz", "prop-types": "^15.7.2", diff --git a/yarn.lock b/yarn.lock index 0d9337be30..6b05372b21 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7312,6 +7312,21 @@ mathml-tag-names@^2.1.1: resolved "https://registry.yarnpkg.com/mathml-tag-names/-/mathml-tag-names-2.1.3.tgz#4ddadd67308e780cf16a47685878ee27b736a0a3" integrity sha512-APMBEanjybaPzUrfqU0IMU5I0AswKMH7k8OTLs0vvV4KZpExkTkY87nR/zpbuTPj+gARop7aGUbl11pnDfW6xg== +matrix-js-sdk@8.0.1-rc.1: + version "8.0.1-rc.1" + resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-8.0.1-rc.1.tgz#dbc2544f0058e2530e84a5d3b3e1abe06e395597" + integrity sha512-K3wOAf8lVLBx3Xhgb57JoVtFRVf52PHDnsnj00ST4kCAbnlJ3iuJ8OuOX16Bbk0fvV7RLJi/At4bm1Ld6PsIkQ== + dependencies: + "@babel/runtime" "^7.8.3" + another-json "^0.2.0" + browser-request "^0.3.3" + bs58 "^4.0.1" + content-type "^1.0.2" + loglevel "^1.6.4" + qs "^6.5.2" + request "^2.88.0" + unhomoglyph "^1.0.2" + "matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop": version "8.0.0" resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/c669382e12c8cd1d7d538421dfad4f50812af44d" From 7f0c8216aecd48f6e7772306d761a4cad5f4dddf Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Fri, 31 Jul 2020 13:35:05 +0100 Subject: [PATCH 002/268] Upgrade matrix-react-sdk to 3.1.0-rc.1 --- package.json | 2 +- yarn.lock | 23 +++++------------------ 2 files changed, 6 insertions(+), 19 deletions(-) diff --git a/package.json b/package.json index 7c4f85e8fa..3962b8acdc 100644 --- a/package.json +++ b/package.json @@ -60,7 +60,7 @@ "gfm.css": "^1.1.2", "highlight.js": "^9.13.1", "matrix-js-sdk": "8.0.1-rc.1", - "matrix-react-sdk": "github:matrix-org/matrix-react-sdk#develop", + "matrix-react-sdk": "3.1.0-rc.1", "olm": "https://packages.matrix.org/npm/olm/olm-3.1.4.tgz", "prop-types": "^15.7.2", "react": "^16.9.0", diff --git a/yarn.lock b/yarn.lock index 6b05372b21..cc09e0d983 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7327,20 +7327,6 @@ matrix-js-sdk@8.0.1-rc.1: request "^2.88.0" unhomoglyph "^1.0.2" -"matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop": - version "8.0.0" - resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/c669382e12c8cd1d7d538421dfad4f50812af44d" - dependencies: - "@babel/runtime" "^7.8.3" - another-json "^0.2.0" - browser-request "^0.3.3" - bs58 "^4.0.1" - content-type "^1.0.2" - loglevel "^1.6.4" - qs "^6.5.2" - request "^2.88.0" - unhomoglyph "^1.0.2" - matrix-mock-request@^1.2.3: version "1.2.3" resolved "https://registry.yarnpkg.com/matrix-mock-request/-/matrix-mock-request-1.2.3.tgz#56b15d86e2601a9b48a854844396d18caab649c8" @@ -7349,9 +7335,10 @@ matrix-mock-request@^1.2.3: bluebird "^3.5.0" expect "^1.20.2" -"matrix-react-sdk@github:matrix-org/matrix-react-sdk#develop": - version "3.0.0" - resolved "https://codeload.github.com/matrix-org/matrix-react-sdk/tar.gz/f9540dd7cd67666ad58beac9b11c7bc4a5872673" +matrix-react-sdk@3.1.0-rc.1: + version "3.1.0-rc.1" + resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.1.0-rc.1.tgz#dbf6a9b9ad5542075d8a894d4009d04bba149566" + integrity sha512-CJVlYARIYBKVBtoyDVPeBGH/rbqTgerWiYovqVq3+TG+DUDFZYSRXLRymxVwTSB23PKP1PJ8+MEOA0Yx2r2gmg== dependencies: "@babel/runtime" "^7.10.5" await-lock "^2.0.1" @@ -7379,7 +7366,7 @@ matrix-mock-request@^1.2.3: is-ip "^2.0.0" linkifyjs "^2.1.9" lodash "^4.17.19" - matrix-js-sdk "github:matrix-org/matrix-js-sdk#develop" + matrix-js-sdk "8.0.1-rc.1" minimist "^1.2.5" pako "^1.0.11" parse5 "^5.1.1" From 1a916435da24c5bb29096172428febe1ce3a09df Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Fri, 31 Jul 2020 13:40:26 +0100 Subject: [PATCH 003/268] Prepare changelog for v1.7.3-rc.1 --- CHANGELOG.md | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index b8172453e1..625eefa35f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,21 @@ +Changes in [1.7.3-rc.1](https://github.com/vector-im/riot-web/releases/tag/v1.7.3-rc.1) (2020-07-31) +==================================================================================================== +[Full Changelog](https://github.com/vector-im/riot-web/compare/v1.7.2...v1.7.3-rc.1) + + * Upgrade to React SDK 3.1.0-rc.1 and JS SDK 8.0.1-rc.1 + * Make Lojban translation available + [\#14703](https://github.com/vector-im/riot-web/pull/14703) + * Update from Weblate + [\#14841](https://github.com/vector-im/riot-web/pull/14841) + * Remove redundant lint dependencies + [\#14810](https://github.com/vector-im/riot-web/pull/14810) + * Bump elliptic from 6.5.2 to 6.5.3 + [\#14826](https://github.com/vector-im/riot-web/pull/14826) + * Update mobile config intercept URL + [\#14796](https://github.com/vector-im/riot-web/pull/14796) + * Fix typo in https:// + [\#14791](https://github.com/vector-im/riot-web/pull/14791) + Changes in [1.7.2](https://github.com/vector-im/riot-web/releases/tag/v1.7.2) (2020-07-27) ========================================================================================== [Full Changelog](https://github.com/vector-im/riot-web/compare/v1.7.1...v1.7.2) From 0b3487981cb2e80751adf0e519ecf15220c4078f Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Fri, 31 Jul 2020 13:40:26 +0100 Subject: [PATCH 004/268] v1.7.3-rc.1 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 3962b8acdc..c128a656b2 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "riot-web", "productName": "Riot", - "version": "1.7.2", + "version": "1.7.3-rc.1", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "repository": { From bbc9693865bd32a4a707f78157a64b54b7f79a80 Mon Sep 17 00:00:00 2001 From: tusooa Date: Tue, 4 Aug 2020 00:12:01 +0000 Subject: [PATCH 005/268] Translated using Weblate (Chinese (Simplified)) 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/zh_Hans/ --- src/i18n/strings/zh_Hans.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/i18n/strings/zh_Hans.json b/src/i18n/strings/zh_Hans.json index 3a7f003127..89b796ab82 100644 --- a/src/i18n/strings/zh_Hans.json +++ b/src/i18n/strings/zh_Hans.json @@ -7,7 +7,7 @@ "Decentralised, encrypted chat & collaboration powered by [matrix]": "去中心化、加密聊天&与协作，由 [matrix] 驱动", "Sign In": "登入", "Create Account": "创建帐号", - "Explore rooms": "探索房间", + "Explore rooms": "探索聊天室", "The message from the parser is: %(message)s": "语法分析器的信息：%(message)s", "Invalid JSON": "无效的 JSON", "Unexpected error preparing the app. See console for details.": "软件准备时出错，详细信息请查看控制台。", From d08628901a97a9bcf2cd8f861fb5bfa4e31c158e Mon Sep 17 00:00:00 2001 From: Marcelo Filho Date: Mon, 3 Aug 2020 07:00:59 +0000 Subject: [PATCH 006/268] 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 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/i18n/strings/pt_BR.json b/src/i18n/strings/pt_BR.json index 88c3932c9d..dd280da2a6 100644 --- a/src/i18n/strings/pt_BR.json +++ b/src/i18n/strings/pt_BR.json @@ -2,7 +2,7 @@ "Dismiss": "Descartar", "powered by Matrix": "oferecido por Matrix", "Unknown device": "Aparelho desconhecido", - "You need to be using HTTPS to place a screen-sharing call.": "Você precisa estar usando HTTPS para poder iniciar uma chamada com compartilhamento de tela.", + "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", "Decentralised, encrypted chat & collaboration powered by [matrix]": "Chat descentralizado, criptografado e colaborativo construído com [matrix]", "Sign In": "Entrar", @@ -11,7 +11,7 @@ "The message from the parser is: %(message)s": "A mensagem do parser é: %(message)s", "Invalid JSON": "JSON inválido", "Unexpected error preparing the app. See console for details.": "Erro inesperado preparando o aplicativo. Veja o console para mais detalhes.", - "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Configuração inválida: somente se pode especificar um valor entre default_server_config, default_server_name, ou default_hs_url.", + "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Configuração inválida: somente se pode especificar um valor dentre default_server_config, default_server_name, ou default_hs_url.", "Invalid configuration: no default server specified.": "Configuração inválida: servidor padrão não especificado.", "Unable to load config file: please refresh the page to try again.": "Não foi possível carregar o arquivo de configuração: por favor, atualize a página para tentar novamente.", "Download Completed": "Download Concluído", From aa190f0fd33f901a0b211c73c9ce86f5d37f2f93 Mon Sep 17 00:00:00 2001 From: riverside6 Date: Tue, 4 Aug 2020 14:24:56 +0000 Subject: [PATCH 007/268] Translated using Weblate (German) 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/de/ --- src/i18n/strings/de_DE.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json index 15381a4b51..ba21b25010 100644 --- a/src/i18n/strings/de_DE.json +++ b/src/i18n/strings/de_DE.json @@ -32,5 +32,5 @@ "Open": "Offen", "%(brand)s uses advanced browser features which aren't supported by your current browser.": "%(brand)s verwendet erweiterte Browserfunktionen, die von Ihrem aktuellen Browser nicht unterstützt werden.", "Your browser can't run %(brand)s": "Dein Browser kann %(brand)s nicht ausführen", - "Powered by Matrix": "Powered by Matrix" + "Powered by Matrix": "Betrieben von Matrix" } From 33834b4933202ea423fbbfaaffa42520be186d11 Mon Sep 17 00:00:00 2001 From: Maik Wagner Date: Tue, 4 Aug 2020 14:25:27 +0000 Subject: [PATCH 008/268] Translated using Weblate (German) 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/de/ --- src/i18n/strings/de_DE.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json index ba21b25010..3dcb173110 100644 --- a/src/i18n/strings/de_DE.json +++ b/src/i18n/strings/de_DE.json @@ -16,7 +16,7 @@ "Go to your browser to complete Sign In": "Gehe zu deinem Browser, um die Anmeldung abzuschließen", "Open user settings": "Öffne Nutzer-Einstellungen", "Unable to load config file: please refresh the page to try again.": "Konfigurationsdatei kann nicht geladen werden: Bitte aktualisieren Sie die Seite, um es erneut zu versuchen.", - "Missing indexeddb worker script!": "Indexeddb worker Skript fehlt!", + "Missing indexeddb worker script!": "Fehlendes indexeddb Worker-Skript!", "Previous/next recently visited room or community": "Vorheriger/nächster kürzlich besuchter Raum oder Community", "Unsupported browser": "Nicht unterstützter Browser", "Go to element.io": "Gehe zu element.io", From d283b4161c43d80f4133213148dfa184160a8539 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Wed, 5 Aug 2020 16:12:29 +0100 Subject: [PATCH 009/268] Upgrade matrix-js-sdk to 8.0.1 --- package.json | 2 +- yarn.lock | 15 +++++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index c128a656b2..aefc1e4261 100644 --- a/package.json +++ b/package.json @@ -59,7 +59,7 @@ "browser-request": "^0.3.3", "gfm.css": "^1.1.2", "highlight.js": "^9.13.1", - "matrix-js-sdk": "8.0.1-rc.1", + "matrix-js-sdk": "8.0.1", "matrix-react-sdk": "3.1.0-rc.1", "olm": "https://packages.matrix.org/npm/olm/olm-3.1.4.tgz", "prop-types": "^15.7.2", diff --git a/yarn.lock b/yarn.lock index cc09e0d983..51e288a709 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7312,6 +7312,21 @@ mathml-tag-names@^2.1.1: resolved "https://registry.yarnpkg.com/mathml-tag-names/-/mathml-tag-names-2.1.3.tgz#4ddadd67308e780cf16a47685878ee27b736a0a3" integrity sha512-APMBEanjybaPzUrfqU0IMU5I0AswKMH7k8OTLs0vvV4KZpExkTkY87nR/zpbuTPj+gARop7aGUbl11pnDfW6xg== +matrix-js-sdk@8.0.1: + version "8.0.1" + resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-8.0.1.tgz#dafd41023671249c01e4278e7103c93200b34e5e" + integrity sha512-DT2YjWi8l2eHyNTKZOhBkN/EakIMDDEglSCg+RWY4QzFaXYlSwfwfzzCujjtq1hxVSKim8NC7KqxgNetOiBegA== + dependencies: + "@babel/runtime" "^7.8.3" + another-json "^0.2.0" + browser-request "^0.3.3" + bs58 "^4.0.1" + content-type "^1.0.2" + loglevel "^1.6.4" + qs "^6.5.2" + request "^2.88.0" + unhomoglyph "^1.0.2" + matrix-js-sdk@8.0.1-rc.1: version "8.0.1-rc.1" resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-8.0.1-rc.1.tgz#dbc2544f0058e2530e84a5d3b3e1abe06e395597" From 6b7909c73217b7de2f33c1ca7b1f36e02d650e36 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Wed, 5 Aug 2020 16:12:43 +0100 Subject: [PATCH 010/268] Upgrade matrix-react-sdk to 3.1.0 --- package.json | 2 +- yarn.lock | 25 +++++-------------------- 2 files changed, 6 insertions(+), 21 deletions(-) diff --git a/package.json b/package.json index aefc1e4261..cfa11b1fe8 100644 --- a/package.json +++ b/package.json @@ -60,7 +60,7 @@ "gfm.css": "^1.1.2", "highlight.js": "^9.13.1", "matrix-js-sdk": "8.0.1", - "matrix-react-sdk": "3.1.0-rc.1", + "matrix-react-sdk": "3.1.0", "olm": "https://packages.matrix.org/npm/olm/olm-3.1.4.tgz", "prop-types": "^15.7.2", "react": "^16.9.0", diff --git a/yarn.lock b/yarn.lock index 51e288a709..43a04f5029 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7327,21 +7327,6 @@ matrix-js-sdk@8.0.1: request "^2.88.0" unhomoglyph "^1.0.2" -matrix-js-sdk@8.0.1-rc.1: - version "8.0.1-rc.1" - resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-8.0.1-rc.1.tgz#dbc2544f0058e2530e84a5d3b3e1abe06e395597" - integrity sha512-K3wOAf8lVLBx3Xhgb57JoVtFRVf52PHDnsnj00ST4kCAbnlJ3iuJ8OuOX16Bbk0fvV7RLJi/At4bm1Ld6PsIkQ== - dependencies: - "@babel/runtime" "^7.8.3" - another-json "^0.2.0" - browser-request "^0.3.3" - bs58 "^4.0.1" - content-type "^1.0.2" - loglevel "^1.6.4" - qs "^6.5.2" - request "^2.88.0" - unhomoglyph "^1.0.2" - matrix-mock-request@^1.2.3: version "1.2.3" resolved "https://registry.yarnpkg.com/matrix-mock-request/-/matrix-mock-request-1.2.3.tgz#56b15d86e2601a9b48a854844396d18caab649c8" @@ -7350,10 +7335,10 @@ matrix-mock-request@^1.2.3: bluebird "^3.5.0" expect "^1.20.2" -matrix-react-sdk@3.1.0-rc.1: - version "3.1.0-rc.1" - resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.1.0-rc.1.tgz#dbf6a9b9ad5542075d8a894d4009d04bba149566" - integrity sha512-CJVlYARIYBKVBtoyDVPeBGH/rbqTgerWiYovqVq3+TG+DUDFZYSRXLRymxVwTSB23PKP1PJ8+MEOA0Yx2r2gmg== +matrix-react-sdk@3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.1.0.tgz#d8349942e6aa705195b30415c96d7576b783f011" + integrity sha512-LNSm4gX+c9Z2z39QyaQTSZmIAEI5nmIZ7uVq2X3ktn0NwmGwTcvC983t68ooHmIzAqVmh4JrscgzmdvPqk/YPw== dependencies: "@babel/runtime" "^7.10.5" await-lock "^2.0.1" @@ -7381,7 +7366,7 @@ matrix-react-sdk@3.1.0-rc.1: is-ip "^2.0.0" linkifyjs "^2.1.9" lodash "^4.17.19" - matrix-js-sdk "8.0.1-rc.1" + matrix-js-sdk "8.0.1" minimist "^1.2.5" pako "^1.0.11" parse5 "^5.1.1" From c411eabdac2c701d06997ac757d7587143c43cf1 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Wed, 5 Aug 2020 16:15:16 +0100 Subject: [PATCH 011/268] Prepare changelog for v1.7.3 --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 625eefa35f..2a5d9fe75f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +Changes in [1.7.3](https://github.com/vector-im/element-web/releases/tag/v1.7.3) (2020-08-05) +============================================================================================= +[Full Changelog](https://github.com/vector-im/element-web/compare/v1.7.3-rc.1...v1.7.3) + + * Upgrade to React SDK 3.1.0 and JS SDK 8.0.1 + Changes in [1.7.3-rc.1](https://github.com/vector-im/riot-web/releases/tag/v1.7.3-rc.1) (2020-07-31) ==================================================================================================== [Full Changelog](https://github.com/vector-im/riot-web/compare/v1.7.2...v1.7.3-rc.1) From f8102105a9b6313d2c49904a21228838391fad2d Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Wed, 5 Aug 2020 16:15:17 +0100 Subject: [PATCH 012/268] v1.7.3 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index cfa11b1fe8..73d4da7a82 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "riot-web", "productName": "Riot", - "version": "1.7.3-rc.1", + "version": "1.7.3", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "repository": { From 5935e3b145cd8a31a6d897101332a5246147acd3 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Wed, 5 Aug 2020 16:20:01 +0100 Subject: [PATCH 013/268] 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 73d4da7a82..1ab94a6f0a 100644 --- a/package.json +++ b/package.json @@ -59,7 +59,7 @@ "browser-request": "^0.3.3", "gfm.css": "^1.1.2", "highlight.js": "^9.13.1", - "matrix-js-sdk": "8.0.1", + "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop", "matrix-react-sdk": "3.1.0", "olm": "https://packages.matrix.org/npm/olm/olm-3.1.4.tgz", "prop-types": "^15.7.2", diff --git a/yarn.lock b/yarn.lock index 43a04f5029..dfdf59367d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7327,6 +7327,20 @@ matrix-js-sdk@8.0.1: request "^2.88.0" unhomoglyph "^1.0.2" +"matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop": + version "8.0.1" + resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/a6fe4cdf1cbf56baeb538f071c27326fe98630d0" + dependencies: + "@babel/runtime" "^7.8.3" + another-json "^0.2.0" + browser-request "^0.3.3" + bs58 "^4.0.1" + content-type "^1.0.2" + loglevel "^1.6.4" + qs "^6.5.2" + request "^2.88.0" + unhomoglyph "^1.0.2" + matrix-mock-request@^1.2.3: version "1.2.3" resolved "https://registry.yarnpkg.com/matrix-mock-request/-/matrix-mock-request-1.2.3.tgz#56b15d86e2601a9b48a854844396d18caab649c8" From 04afd0232b095ece04058e3832168d81b904de01 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Wed, 5 Aug 2020 16:20:15 +0100 Subject: [PATCH 014/268] 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 1ab94a6f0a..d82c3d147f 100644 --- a/package.json +++ b/package.json @@ -60,7 +60,7 @@ "gfm.css": "^1.1.2", "highlight.js": "^9.13.1", "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop", - "matrix-react-sdk": "3.1.0", + "matrix-react-sdk": "github:matrix-org/matrix-react-sdk#develop", "olm": "https://packages.matrix.org/npm/olm/olm-3.1.4.tgz", "prop-types": "^15.7.2", "react": "^16.9.0", diff --git a/yarn.lock b/yarn.lock index dfdf59367d..1879a8f9c5 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7312,21 +7312,6 @@ mathml-tag-names@^2.1.1: resolved "https://registry.yarnpkg.com/mathml-tag-names/-/mathml-tag-names-2.1.3.tgz#4ddadd67308e780cf16a47685878ee27b736a0a3" integrity sha512-APMBEanjybaPzUrfqU0IMU5I0AswKMH7k8OTLs0vvV4KZpExkTkY87nR/zpbuTPj+gARop7aGUbl11pnDfW6xg== -matrix-js-sdk@8.0.1: - version "8.0.1" - resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-8.0.1.tgz#dafd41023671249c01e4278e7103c93200b34e5e" - integrity sha512-DT2YjWi8l2eHyNTKZOhBkN/EakIMDDEglSCg+RWY4QzFaXYlSwfwfzzCujjtq1hxVSKim8NC7KqxgNetOiBegA== - dependencies: - "@babel/runtime" "^7.8.3" - another-json "^0.2.0" - browser-request "^0.3.3" - bs58 "^4.0.1" - content-type "^1.0.2" - loglevel "^1.6.4" - qs "^6.5.2" - request "^2.88.0" - unhomoglyph "^1.0.2" - "matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop": version "8.0.1" resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/a6fe4cdf1cbf56baeb538f071c27326fe98630d0" @@ -7349,10 +7334,9 @@ matrix-mock-request@^1.2.3: bluebird "^3.5.0" expect "^1.20.2" -matrix-react-sdk@3.1.0: +"matrix-react-sdk@github:matrix-org/matrix-react-sdk#develop": version "3.1.0" - resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.1.0.tgz#d8349942e6aa705195b30415c96d7576b783f011" - integrity sha512-LNSm4gX+c9Z2z39QyaQTSZmIAEI5nmIZ7uVq2X3ktn0NwmGwTcvC983t68ooHmIzAqVmh4JrscgzmdvPqk/YPw== + resolved "https://codeload.github.com/matrix-org/matrix-react-sdk/tar.gz/45b79a0b7c9237c6b4dbafd37c1a234ed2b7cf35" dependencies: "@babel/runtime" "^7.10.5" await-lock "^2.0.1" @@ -7380,7 +7364,7 @@ matrix-react-sdk@3.1.0: is-ip "^2.0.0" linkifyjs "^2.1.9" lodash "^4.17.19" - matrix-js-sdk "8.0.1" + matrix-js-sdk "github:matrix-org/matrix-js-sdk#develop" minimist "^1.2.5" pako "^1.0.11" parse5 "^5.1.1" From b199f55d1cfae42c68d86f09c84cba2868a78c1d Mon Sep 17 00:00:00 2001 From: "J. Ryan Stinnett" Date: Wed, 5 Aug 2020 16:52:16 +0100 Subject: [PATCH 015/268] Add security notice --- CHANGELOG.md | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2a5d9fe75f..90d58b4932 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,19 @@ Changes in [1.7.3](https://github.com/vector-im/element-web/releases/tag/v1.7.3) (2020-08-05) ============================================================================================= + +## Security notice + +Element Web 1.7.3 (as well as the earlier release 1.7.2) fixes an issue where +replying to a specially formatted message would make it seem like the replier +said something they did not. Thanks to Sorunome for responsibly disclosing this +via Matrix's Security Disclosure Policy. + +Element Web 1.7.3 (as well as the earlier release 1.7.2) fixes an issue where an +unexpected language ID in a code block could cause Element to crash. Thanks to +SakiiR for responsibly disclosing this via Matrix's Security Disclosure Policy. + +## All changes + [Full Changelog](https://github.com/vector-im/element-web/compare/v1.7.3-rc.1...v1.7.3) * Upgrade to React SDK 3.1.0 and JS SDK 8.0.1 From d93d2e94ed6c2de648b3cee92dab82bff6d20d9a Mon Sep 17 00:00:00 2001 From: "J. Ryan Stinnett" Date: Fri, 7 Aug 2020 10:59:45 +0100 Subject: [PATCH 016/268] Update bug report submission URL Part of https://github.com/vector-im/element-web/issues/14892 --- config.sample.json | 2 +- element.io/app/config.json | 2 +- element.io/develop/config.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/config.sample.json b/config.sample.json index 10710362da..662865c041 100644 --- a/config.sample.json +++ b/config.sample.json @@ -22,7 +22,7 @@ "https://scalar-staging.vector.im/api", "https://scalar-staging.riot.im/scalar/api" ], - "bug_report_endpoint_url": "https://riot.im/bugreports/submit", + "bug_report_endpoint_url": "https://element.io/bugreports/submit", "defaultCountryCode": "GB", "showLabsSettings": false, "features": { diff --git a/element.io/app/config.json b/element.io/app/config.json index 667acc9ccd..f0532623f0 100644 --- a/element.io/app/config.json +++ b/element.io/app/config.json @@ -11,7 +11,7 @@ "https://scalar-staging.riot.im/scalar/api" ], "hosting_signup_link": "https://element.io/matrix-services?utm_source=element-web&utm_medium=web", - "bug_report_endpoint_url": "https://riot.im/bugreports/submit", + "bug_report_endpoint_url": "https://element.io/bugreports/submit", "features": { }, "piwik": { diff --git a/element.io/develop/config.json b/element.io/develop/config.json index 5135fa796e..6655bf1f22 100644 --- a/element.io/develop/config.json +++ b/element.io/develop/config.json @@ -11,7 +11,7 @@ "https://scalar-staging.riot.im/scalar/api" ], "hosting_signup_link": "https://element.io/matrix-services?utm_source=element-web&utm_medium=web", - "bug_report_endpoint_url": "https://riot.im/bugreports/submit", + "bug_report_endpoint_url": "https://element.io/bugreports/submit", "features": { "feature_new_spinner": "labs", "feature_pinning": "labs", From 886f060f68d8789fbdd214ab80447fb9eb28d616 Mon Sep 17 00:00:00 2001 From: "J. Ryan Stinnett" Date: Fri, 7 Aug 2020 11:37:59 +0100 Subject: [PATCH 017/268] Update policy links to element.io Fixes https://github.com/vector-im/element-web/issues/14904 --- element.io/app/config.json | 6 +++--- element.io/develop/config.json | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/element.io/app/config.json b/element.io/app/config.json index 667acc9ccd..003cf9b29f 100644 --- a/element.io/app/config.json +++ b/element.io/app/config.json @@ -17,7 +17,7 @@ "piwik": { "url": "https://piwik.riot.im/", "siteId": 1, - "policyUrl": "https://matrix.org/legal/riot-im-cookie-policy" + "policyUrl": "https://element.io/cookie-policy" }, "roomDirectory": { "servers": [ @@ -30,11 +30,11 @@ }, "terms_and_conditions_links": [ { - "url": "https://riot.im/privacy", + "url": "https://element.io/privacy", "text": "Privacy Policy" }, { - "url": "https://matrix.org/legal/riot-im-cookie-policy", + "url": "https://element.io/cookie-policy", "text": "Cookie Policy" } ] diff --git a/element.io/develop/config.json b/element.io/develop/config.json index 5135fa796e..d7d6c944ea 100644 --- a/element.io/develop/config.json +++ b/element.io/develop/config.json @@ -28,7 +28,7 @@ "piwik": { "url": "https://piwik.riot.im/", "siteId": 1, - "policyUrl": "https://matrix.org/legal/riot-im-cookie-policy" + "policyUrl": "https://element.io/cookie-policy" }, "roomDirectory": { "servers": [ @@ -41,11 +41,11 @@ }, "terms_and_conditions_links": [ { - "url": "https://riot.im/privacy", + "url": "https://element.io/privacy", "text": "Privacy Policy" }, { - "url": "https://matrix.org/legal/riot-im-cookie-policy", + "url": "https://element.io/cookie-policy", "text": "Cookie Policy" } ] From c8c43403b488f22312b76464e7656b5a2e26b2a0 Mon Sep 17 00:00:00 2001 From: zurtel22 Date: Wed, 5 Aug 2020 17:57:46 +0000 Subject: [PATCH 018/268] Translated using Weblate (German) 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/de/ --- src/i18n/strings/de_DE.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json index 3dcb173110..9629e85441 100644 --- a/src/i18n/strings/de_DE.json +++ b/src/i18n/strings/de_DE.json @@ -1,6 +1,6 @@ { "powered by Matrix": "betrieben mit Matrix", - "Dismiss": "Ablehnen", + "Dismiss": "Ausblenden", "Unknown device": "Unbekanntes Gerät", "You need to be using HTTPS to place a screen-sharing call.": "Du musst HTTPS nutzen um einen Anruf mit Bildschirmfreigabe durchzuführen.", "Welcome to Element": "Willkommen bei Element", @@ -29,7 +29,7 @@ "Your Element is misconfigured": "Dein Element ist fehlkonfiguriert", "Your Element configuration contains invalid JSON. Please correct the problem and reload the page.": "Deine Element Konfiguration enthält ungültiges JSON. Bitte korrigiere das Problem und lade die Seite neu.", "Download Completed": "Download fertiggestellt", - "Open": "Offen", + "Open": "Öffnen", "%(brand)s uses advanced browser features which aren't supported by your current browser.": "%(brand)s verwendet erweiterte Browserfunktionen, die von Ihrem aktuellen Browser nicht unterstützt werden.", "Your browser can't run %(brand)s": "Dein Browser kann %(brand)s nicht ausführen", "Powered by Matrix": "Betrieben von Matrix" From 37318fc4850470337693c7b347592ed4c3e5ebd7 Mon Sep 17 00:00:00 2001 From: ziriSut Date: Thu, 6 Aug 2020 13:14:20 +0000 Subject: [PATCH 019/268] Translated using Weblate (Kabyle) 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/kab/ --- src/i18n/strings/kab.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/i18n/strings/kab.json b/src/i18n/strings/kab.json index 9f8a7220b3..9a3ccd2ad8 100644 --- a/src/i18n/strings/kab.json +++ b/src/i18n/strings/kab.json @@ -31,5 +31,6 @@ "Download Completed": "Asider yemmed", "Open": "Ldi", "Your browser can't run %(brand)s": "Iminig-inek·inem ur isselkan ara %(brand)s", - "%(brand)s uses advanced browser features which aren't supported by your current browser.": "%(brand)s isseqdac timahilin n yiminig leqqayen ur yessefrak ara yiminig-ik·im amiran." + "%(brand)s uses advanced browser features which aren't supported by your current browser.": "%(brand)s isseqdac timahilin n yiminig leqqayen ur yessefrak ara yiminig-ik·im amiran.", + "Powered by Matrix": "Iteddu s lmendad n Matrix" } From 4264aaed29c2a0112c270baa80f19e32cb5ca946 Mon Sep 17 00:00:00 2001 From: strix aluco Date: Wed, 5 Aug 2020 19:23:30 +0000 Subject: [PATCH 020/268] Translated using Weblate (Ukrainian) Currently translated at 100.0% (33 of 33 strings) Translation: Element Web/element-web Translate-URL: https://translate.riot.im/projects/element-web/element-web/uk/ --- src/i18n/strings/uk.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/i18n/strings/uk.json b/src/i18n/strings/uk.json index afeaab96d9..e0fce44ba1 100644 --- a/src/i18n/strings/uk.json +++ b/src/i18n/strings/uk.json @@ -28,7 +28,7 @@ "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", From 2d20ea359559e42acca524d9725eeb181749272d Mon Sep 17 00:00:00 2001 From: Marcelo Filho Date: Sat, 8 Aug 2020 06:12:51 +0000 Subject: [PATCH 021/268] 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 dd280da2a6..3d40d35b42 100644 --- a/src/i18n/strings/pt_BR.json +++ b/src/i18n/strings/pt_BR.json @@ -11,7 +11,7 @@ "The message from the parser is: %(message)s": "A mensagem do parser é: %(message)s", "Invalid JSON": "JSON inválido", "Unexpected error preparing the app. See console for details.": "Erro inesperado preparando o aplicativo. Veja o console para mais detalhes.", - "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Configuração inválida: somente se pode especificar um valor dentre default_server_config, default_server_name, ou default_hs_url.", + "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Configuração inválida: você só pode especificar um valor dentre default_server_config, default_server_name, ou default_hs_url.", "Invalid configuration: no default server specified.": "Configuração inválida: servidor padrão não especificado.", "Unable to load config file: please refresh the page to try again.": "Não foi possível carregar o arquivo de configuração: por favor, atualize a página para tentar novamente.", "Download Completed": "Download Concluído", From be9f0194c5daaaf4dac47fdfcdf82b3829a13092 Mon Sep 17 00:00:00 2001 From: strix aluco Date: Sun, 9 Aug 2020 01:32:14 +0000 Subject: [PATCH 022/268] Translated using Weblate (Ukrainian) Currently translated at 100.0% (33 of 33 strings) Translation: Element Web/element-web Translate-URL: https://translate.riot.im/projects/element-web/element-web/uk/ --- src/i18n/strings/uk.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/i18n/strings/uk.json b/src/i18n/strings/uk.json index e0fce44ba1..fe57f2f679 100644 --- a/src/i18n/strings/uk.json +++ b/src/i18n/strings/uk.json @@ -8,9 +8,9 @@ "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.": "Невірна конфігурація: не вказано сервер за замовчуванням.", + "Invalid configuration: no default server specified.": "Невірна конфігурація: не вказано усталений сервер.", "The message from the parser is: %(message)s": "Аналізатор повідомляє: %(message)s", "Invalid JSON": "Хибний JSON", "Unsupported browser": "Непідтримуваний переглядач", From e371f01bb560e581a87e924e490e3fc92081b5c2 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Wed, 12 Aug 2020 12:16:29 +0100 Subject: [PATCH 023/268] Try to close notification on all platforms which support it, not just electron --- src/vector/platform/ElectronPlatform.tsx | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/vector/platform/ElectronPlatform.tsx b/src/vector/platform/ElectronPlatform.tsx index f21f760131..7932c6433d 100644 --- a/src/vector/platform/ElectronPlatform.tsx +++ b/src/vector/platform/ElectronPlatform.tsx @@ -374,10 +374,6 @@ export default class ElectronPlatform extends VectorBasePlatform { ipcRenderer.send('loudNotification'); } - clearNotification(notif: Notification) { - notif.close(); - } - async getAppVersion(): Promise { return this._ipcCall('getAppVersion'); } From f1b1a27e8f13d8bbd8518a6dec85c36fb017ee62 Mon Sep 17 00:00:00 2001 From: Marcelo Filho Date: Tue, 11 Aug 2020 21:31:57 +0000 Subject: [PATCH 024/268] 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 3d40d35b42..18fad39868 100644 --- a/src/i18n/strings/pt_BR.json +++ b/src/i18n/strings/pt_BR.json @@ -14,7 +14,7 @@ "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Configuração inválida: você só pode especificar um valor dentre default_server_config, default_server_name, ou default_hs_url.", "Invalid configuration: no default server specified.": "Configuração inválida: servidor padrão não especificado.", "Unable to load config file: please refresh the page to try again.": "Não foi possível carregar o arquivo de configuração: por favor, atualize a página para tentar novamente.", - "Download Completed": "Download Concluído", + "Download Completed": "Download concluído", "Open user settings": "Abrir configurações do usuário", "%(appName)s (%(browserName)s, %(osName)s)": "%(appName)s (%(browserName)s, %(osName)s)", "Unsupported browser": "Navegador não suportado", From 5b8012d471a348afed58d2c187194a7dc0eea8ad Mon Sep 17 00:00:00 2001 From: Yes Date: Tue, 11 Aug 2020 18:00:59 +0000 Subject: [PATCH 025/268] Translated using Weblate (Swedish) 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/sv/ --- src/i18n/strings/sv.json | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/i18n/strings/sv.json b/src/i18n/strings/sv.json index ff26a254f9..175aca05a0 100644 --- a/src/i18n/strings/sv.json +++ b/src/i18n/strings/sv.json @@ -25,5 +25,12 @@ "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 fortsätta använda din nuvarande webbläsare, men vissa eller alla funktioner kanske inte fungerar och uteseendet samt känslan av applikationen kan var felaktig.", "I understand the risks and wish to continue": "Jag förstår riskerna och vill fortsätta", "Go to element.io": "Gå till element.io", - "Failed to start": "Misslyckade att starta" + "Failed to start": "Misslyckade att starta", + "Your Element is misconfigured": "Din Element är felkonfigurerad", + "Your Element configuration contains invalid JSON. Please correct the problem and reload the page.": "Din Element konfiguration innehåller ogiltig JSON. Vänligen rätta till problemet och ladda om sidan igen.", + "Download Completed": "Nedladdning Slutförd", + "Open": "Öppna", + "Powered by Matrix": "Drivs av Matrix", + "Your browser can't run %(brand)s": "Din webbläsare kan inte köra %(brand)s", + "%(brand)s uses advanced browser features which aren't supported by your current browser.": "%(brand)s använder avancerade webbläsarfunktioner som inte stöds av din aktuella webbläsare." } From 89ee32a32d5367de70c085571b1e446cfff93e80 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Thu, 13 Aug 2020 12:20:15 +0100 Subject: [PATCH 026/268] Upgrade matrix-js-sdk to 8.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 d82c3d147f..07eb07d19f 100644 --- a/package.json +++ b/package.json @@ -59,7 +59,7 @@ "browser-request": "^0.3.3", "gfm.css": "^1.1.2", "highlight.js": "^9.13.1", - "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop", + "matrix-js-sdk": "8.1.0-rc.1", "matrix-react-sdk": "github:matrix-org/matrix-react-sdk#develop", "olm": "https://packages.matrix.org/npm/olm/olm-3.1.4.tgz", "prop-types": "^15.7.2", diff --git a/yarn.lock b/yarn.lock index 1879a8f9c5..89ce1b5f9f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7312,6 +7312,21 @@ mathml-tag-names@^2.1.1: resolved "https://registry.yarnpkg.com/mathml-tag-names/-/mathml-tag-names-2.1.3.tgz#4ddadd67308e780cf16a47685878ee27b736a0a3" integrity sha512-APMBEanjybaPzUrfqU0IMU5I0AswKMH7k8OTLs0vvV4KZpExkTkY87nR/zpbuTPj+gARop7aGUbl11pnDfW6xg== +matrix-js-sdk@8.1.0-rc.1: + version "8.1.0-rc.1" + resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-8.1.0-rc.1.tgz#e42ca8dae7f513f956457eeb46f03c445a3712e8" + integrity sha512-/qOSe0FQsbC2ITXhUbpjCIRAT78f2VHxKGqGMC2M2s5e2Mvpxcpu7lj/ONz5irUPd34Sqhj9KdIUnAqBbh3stQ== + dependencies: + "@babel/runtime" "^7.8.3" + another-json "^0.2.0" + browser-request "^0.3.3" + bs58 "^4.0.1" + content-type "^1.0.2" + loglevel "^1.6.4" + qs "^6.5.2" + request "^2.88.0" + unhomoglyph "^1.0.2" + "matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop": version "8.0.1" resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/a6fe4cdf1cbf56baeb538f071c27326fe98630d0" From 871733388c1187dbbbb82d16c3c5dd2a42a65c19 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Thu, 13 Aug 2020 12:20:41 +0100 Subject: [PATCH 027/268] Upgrade matrix-react-sdk to 3.2.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 07eb07d19f..1fcbe305c6 100644 --- a/package.json +++ b/package.json @@ -60,7 +60,7 @@ "gfm.css": "^1.1.2", "highlight.js": "^9.13.1", "matrix-js-sdk": "8.1.0-rc.1", - "matrix-react-sdk": "github:matrix-org/matrix-react-sdk#develop", + "matrix-react-sdk": "3.2.0-rc.1", "olm": "https://packages.matrix.org/npm/olm/olm-3.1.4.tgz", "prop-types": "^15.7.2", "react": "^16.9.0", diff --git a/yarn.lock b/yarn.lock index 89ce1b5f9f..deebd4460b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7327,20 +7327,6 @@ matrix-js-sdk@8.1.0-rc.1: request "^2.88.0" unhomoglyph "^1.0.2" -"matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop": - version "8.0.1" - resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/a6fe4cdf1cbf56baeb538f071c27326fe98630d0" - dependencies: - "@babel/runtime" "^7.8.3" - another-json "^0.2.0" - browser-request "^0.3.3" - bs58 "^4.0.1" - content-type "^1.0.2" - loglevel "^1.6.4" - qs "^6.5.2" - request "^2.88.0" - unhomoglyph "^1.0.2" - matrix-mock-request@^1.2.3: version "1.2.3" resolved "https://registry.yarnpkg.com/matrix-mock-request/-/matrix-mock-request-1.2.3.tgz#56b15d86e2601a9b48a854844396d18caab649c8" @@ -7349,9 +7335,10 @@ matrix-mock-request@^1.2.3: bluebird "^3.5.0" expect "^1.20.2" -"matrix-react-sdk@github:matrix-org/matrix-react-sdk#develop": - version "3.1.0" - resolved "https://codeload.github.com/matrix-org/matrix-react-sdk/tar.gz/45b79a0b7c9237c6b4dbafd37c1a234ed2b7cf35" +matrix-react-sdk@3.2.0-rc.1: + version "3.2.0-rc.1" + resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.2.0-rc.1.tgz#2dc7ca5d5ca4187a0973c8e2dee7e45c98923755" + integrity sha512-1BZW6WQBDlx0FhKAKBhVP2Oex2uRWSjzjKM3ccc/tHzih56XYFY4DUWf9Bd2jiPn2EyHQcwncmcFcDOC4bV4qQ== dependencies: "@babel/runtime" "^7.10.5" await-lock "^2.0.1" @@ -7379,7 +7366,7 @@ matrix-mock-request@^1.2.3: is-ip "^2.0.0" linkifyjs "^2.1.9" lodash "^4.17.19" - matrix-js-sdk "github:matrix-org/matrix-js-sdk#develop" + matrix-js-sdk "8.1.0-rc.1" minimist "^1.2.5" pako "^1.0.11" parse5 "^5.1.1" From 4d95e7ec67b037697c6ae71d8604987ae424de79 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Thu, 13 Aug 2020 12:23:40 +0100 Subject: [PATCH 028/268] Prepare changelog for v1.7.4-rc.1 --- CHANGELOG.md | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 90d58b4932..a508ce4c48 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,20 @@ +Changes in [1.7.4-rc.1](https://github.com/vector-im/element-web/releases/tag/v1.7.4-rc.1) (2020-08-13) +======================================================================================================= +[Full Changelog](https://github.com/vector-im/element-web/compare/v1.7.3...v1.7.4-rc.1) + + * Upgrade to React SDK 3.2.0-rc.1 and JS SDK 8.1.0-rc.1 + * Update policy links to element.io + [\#14905](https://github.com/vector-im/element-web/pull/14905) + * Update from Weblate + [\#14949](https://github.com/vector-im/element-web/pull/14949) + * Try to close notification on all platforms which support it, not just + electron + [\#14939](https://github.com/vector-im/element-web/pull/14939) + * Update bug report submission URL + [\#14903](https://github.com/vector-im/element-web/pull/14903) + * Fix arm docker build + [\#14522](https://github.com/vector-im/element-web/pull/14522) + Changes in [1.7.3](https://github.com/vector-im/element-web/releases/tag/v1.7.3) (2020-08-05) ============================================================================================= From 05816fca36e7832242a6a45ac56ba4a6eef7b3b4 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Thu, 13 Aug 2020 12:23:41 +0100 Subject: [PATCH 029/268] v1.7.4-rc.1 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 1fcbe305c6..35b75cc63e 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "riot-web", "productName": "Riot", - "version": "1.7.3", + "version": "1.7.4-rc.1", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "repository": { From 993fd04353cc0a54fe1276a3bbc7b381a7ea1334 Mon Sep 17 00:00:00 2001 From: Valere Date: Thu, 13 Aug 2020 19:09:36 +0200 Subject: [PATCH 030/268] Update jitsi.md Updated Element Android section --- docs/jitsi.md | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/docs/jitsi.md b/docs/jitsi.md index 2ae8d9a785..76b49c9c73 100644 --- a/docs/jitsi.md +++ b/docs/jitsi.md @@ -50,7 +50,22 @@ default, and you are using riot-web 1.6 or newer, set the following on your home } ``` -## Mobile app support +## Element Android + +Element Android (1.0.5+) supports custom jitsi domain. + +1:1 calls, or calls between you and one other person, do not use Jitsi. Instead, those +calls work directly between clients or via TURN servers configured on the respective +homeservers. + +For rooms with more than 2 joined members, when creating a jitsi conference via call/video buttons of the toolbar (not via integration manager), Element Android will create a widget using app.element.io [wrapper](https://github.com/vector-im/element-web/blob/develop/docs/jitsi-dev.md) as url. +The domain used is the one specified by the `/.well-known/matrix/client` endpoint, and if not present it uses the fallback defined in `confix.xml` (jitsi.riot.im) + +For active jitsi widgets in the room, a native jitsi widget UI is created and points to the instance specified in the `domain` key of the widget content data. + +Element android manages allowed native widgets permissions a bit differently than web widgets (as the data shared are different, and never shared with the widget url). For jitsi widgets permissions is asked only once per domain (consent saved in account data). + +## Element IOS Currently the Element mobile apps do not support custom Jitsi servers and will instead use the default `jitsi.riot.im` server. When users on the mobile apps join the call, From 305570d8e3dea678d83f092927f1c57252167617 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Fri, 14 Aug 2020 10:56:30 +0100 Subject: [PATCH 031/268] Document new labs tweaks --- docs/labs.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/docs/labs.md b/docs/labs.md index f362c8bd72..ade4ace167 100644 --- a/docs/labs.md +++ b/docs/labs.md @@ -94,3 +94,8 @@ adds an ability for end users to add themes themselves by using a URL to the JSO theme definition. For some sample themes, check out [aaronraimist/element-themes](https://github.com/aaronraimist/element-themes). + +# Message preview tweaks + +To enable message previews for reactions in all rooms, enable `feature_roomlist_preview_reactions_all`. +To enable message previews for reactions in DMs, enable `feature_roomlist_preview_reactions_dms`, ignored when it is enabled for all rooms. From c58a11c537962cdd6e35aa86c70496f178dec8fd Mon Sep 17 00:00:00 2001 From: Weasy Date: Sun, 16 Aug 2020 10:59:05 +0200 Subject: [PATCH 032/268] Update links in README.md to point to Element --- README.md | 50 +++++++++++++++++++++++++------------------------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/README.md b/README.md index 0f097cd137..4ba01d83d7 100644 --- a/README.md +++ b/README.md @@ -24,8 +24,8 @@ Element has several tiers of support for different environments: * Everything else For accessing Element on an Android or iOS device, we currently recommend the -native apps [riot-android](https://github.com/vector-im/riot-android) -and [riot-ios](https://github.com/vector-im/riot-ios). +native apps [element-android](https://github.com/vector-im/element-android) +and [element-ios](https://github.com/vector-im/element-ios). Getting Started =============== @@ -37,9 +37,9 @@ for those who like living dangerously. To host your own copy of Element, the quickest bet is to use a pre-built released version of Element: -1. Download the latest version from https://github.com/vector-im/riot-web/releases +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. @@ -69,7 +69,7 @@ access to Element (or other apps) due to sharing the same domain. We have put some coarse mitigations into place to try to protect against this situation, but it's still not good practice to do it in the first place. See -https://github.com/vector-im/riot-web/issues/1977 for more details. +https://github.com/vector-im/element-web/issues/1977 for more details. Building From Source ==================== @@ -82,8 +82,8 @@ guide](https://classic.yarnpkg.com/en/docs/install) if you do not have it alread 1. Install or update `node.js` so that your `node` is at least v10.x. 1. Install `yarn` if not present already. -1. Clone the repo: `git clone https://github.com/vector-im/riot-web.git`. -1. Switch to the riot-web directory: `cd riot-web`. +1. Clone the repo: `git clone https://github.com/vector-im/element-web.git`. +1. Switch to the element-web directory: `cd element-web`. 1. Install the prerequisites: `yarn install`. * If you're using the `develop` branch, then it is recommended to set up a proper development environment (see [Setting up a dev @@ -105,10 +105,10 @@ Running as a Desktop app ======================== Element can also be run as a desktop app, wrapped in Electron. You can download a -pre-built version from https://riot.im/download/desktop/ or, if you prefer, +pre-built version from https://element.io/get-started or, if you prefer, build it yourself. -To build it yourself, follow the instructions at https://github.com/vector-im/riot-desktop. +To build it yourself, follow the instructions at https://github.com/vector-im/element-desktop. Many thanks to @aviraldg for the initial work on the Electron integration. @@ -126,31 +126,31 @@ override the desktop app's default settings if desired. Running from Docker =================== -The Docker image can be used to serve riot-web as a web server. The easiest way to use +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/riot-web/config.json` then your Docker command +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/riot-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: ```bash -git clone https://github.com/vector-im/riot-web.git riot-web -cd riot-web +git clone https://github.com/vector-im/element-web.git element-web +cd element-web git checkout master -docker build -t vectorim/riot-web . +docker build -t vectorim/element-web . ``` If you're building a custom branch, or want to use the develop branch, check out the appropriate -riot-web branch and then run: +element-web branch and then run: ```bash -docker build -t vectorim/riot-web:develop \ +docker build -t vectorim/element-web:develop \ --build-arg USE_CUSTOM_SDKS=true \ --build-arg REACT_SDK_REPO="https://github.com/matrix-org/matrix-react-sdk.git" \ --build-arg REACT_SDK_BRANCH="develop" \ @@ -169,7 +169,7 @@ Labs Features ============= Some features of Element may be enabled by flags in the `Labs` section of the settings. -Some of these features are described in [labs.md](https://github.com/vector-im/riot-web/blob/develop/docs/labs.md). +Some of these features are described in [labs.md](https://github.com/vector-im/element-web/blob/develop/docs/labs.md). Caching requirements ==================== @@ -186,12 +186,12 @@ Element requires the following URLs not to be cached, when/if you are serving El Development =========== -Before attempting to develop on Riot you **must** read the [developer guide +Before attempting to develop on Element you **must** read the [developer guide for `matrix-react-sdk`](https://github.com/matrix-org/matrix-react-sdk#developer-guide), which also defines the design, architecture and style for Element too. Before starting work on a feature, it's best to ensure your plan aligns well -with our vision for Riot. Please chat with the team in +with our vision for Element. Please chat with the team in [#riot-dev:matrix.org](https://matrix.to/#/#riot-dev:matrix.org) before you start so we can ensure it's something we'd be willing to merge. @@ -246,8 +246,8 @@ popd Finally, build and start Element itself: ```bash -git clone https://github.com/vector-im/riot-web.git -cd riot-web +git clone https://github.com/vector-im/element-web.git +cd element-web git checkout develop yarn link matrix-js-sdk yarn link matrix-react-sdk @@ -275,7 +275,7 @@ bundle.css.map 116 kB 0 [emitted] main Configure the app by copying `config.sample.json` to `config.json` and 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 Riot. +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. @@ -336,7 +336,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/riot-web/?utm_source=widget) +[translationsstatus](https://translate.riot.im/engage/element-web/?utm_source=widget) Triaging issues =============== From 76a6aad35444351d49d8effc114630bc5c4ea721 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Mon, 17 Aug 2020 11:10:31 +0100 Subject: [PATCH 033/268] Add reaction preview labs flags to develop --- element.io/develop/config.json | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/element.io/develop/config.json b/element.io/develop/config.json index 4affa16c30..be5b58909a 100644 --- a/element.io/develop/config.json +++ b/element.io/develop/config.json @@ -23,7 +23,9 @@ "feature_dm_verification": "labs", "feature_bridge_state": "labs", "feature_presence_in_room_list": "labs", - "feature_custom_themes": "labs" + "feature_custom_themes": "labs", + "feature_roomlist_preview_reactions_dms": "labs", + "feature_roomlist_preview_reactions_all": "labs" }, "piwik": { "url": "https://piwik.riot.im/", From 16be9e477458d43ae90abbd047b9ed191989e125 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Mon, 17 Aug 2020 13:09:04 +0100 Subject: [PATCH 034/268] Upgrade matrix-js-sdk to 8.1.0 --- package.json | 2 +- yarn.lock | 15 +++++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index 35b75cc63e..46a09dc558 100644 --- a/package.json +++ b/package.json @@ -59,7 +59,7 @@ "browser-request": "^0.3.3", "gfm.css": "^1.1.2", "highlight.js": "^9.13.1", - "matrix-js-sdk": "8.1.0-rc.1", + "matrix-js-sdk": "8.1.0", "matrix-react-sdk": "3.2.0-rc.1", "olm": "https://packages.matrix.org/npm/olm/olm-3.1.4.tgz", "prop-types": "^15.7.2", diff --git a/yarn.lock b/yarn.lock index deebd4460b..5339b9104c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7312,6 +7312,21 @@ mathml-tag-names@^2.1.1: resolved "https://registry.yarnpkg.com/mathml-tag-names/-/mathml-tag-names-2.1.3.tgz#4ddadd67308e780cf16a47685878ee27b736a0a3" integrity sha512-APMBEanjybaPzUrfqU0IMU5I0AswKMH7k8OTLs0vvV4KZpExkTkY87nR/zpbuTPj+gARop7aGUbl11pnDfW6xg== +matrix-js-sdk@8.1.0: + version "8.1.0" + resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-8.1.0.tgz#c4e48b03a54455dda3d3e1c539ce31dbb46790ac" + integrity sha512-id/J1rBmooQWebCNO4we5W4w816+6LR503H6N1A3jn2CZl2etg86HOScmtGmw+4qkzjKJI5QkL30tvDyAJ+lxA== + dependencies: + "@babel/runtime" "^7.8.3" + another-json "^0.2.0" + browser-request "^0.3.3" + bs58 "^4.0.1" + content-type "^1.0.2" + loglevel "^1.6.4" + qs "^6.5.2" + request "^2.88.0" + unhomoglyph "^1.0.2" + matrix-js-sdk@8.1.0-rc.1: version "8.1.0-rc.1" resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-8.1.0-rc.1.tgz#e42ca8dae7f513f956457eeb46f03c445a3712e8" From 5ac891d70e4edae950d421035ffaeb5399e20c8c Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Mon, 17 Aug 2020 13:09:23 +0100 Subject: [PATCH 035/268] Upgrade matrix-react-sdk to 3.2.0 --- package.json | 2 +- yarn.lock | 25 +++++-------------------- 2 files changed, 6 insertions(+), 21 deletions(-) diff --git a/package.json b/package.json index 46a09dc558..cedebc224f 100644 --- a/package.json +++ b/package.json @@ -60,7 +60,7 @@ "gfm.css": "^1.1.2", "highlight.js": "^9.13.1", "matrix-js-sdk": "8.1.0", - "matrix-react-sdk": "3.2.0-rc.1", + "matrix-react-sdk": "3.2.0", "olm": "https://packages.matrix.org/npm/olm/olm-3.1.4.tgz", "prop-types": "^15.7.2", "react": "^16.9.0", diff --git a/yarn.lock b/yarn.lock index 5339b9104c..e14b64c9b1 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7327,21 +7327,6 @@ matrix-js-sdk@8.1.0: request "^2.88.0" unhomoglyph "^1.0.2" -matrix-js-sdk@8.1.0-rc.1: - version "8.1.0-rc.1" - resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-8.1.0-rc.1.tgz#e42ca8dae7f513f956457eeb46f03c445a3712e8" - integrity sha512-/qOSe0FQsbC2ITXhUbpjCIRAT78f2VHxKGqGMC2M2s5e2Mvpxcpu7lj/ONz5irUPd34Sqhj9KdIUnAqBbh3stQ== - dependencies: - "@babel/runtime" "^7.8.3" - another-json "^0.2.0" - browser-request "^0.3.3" - bs58 "^4.0.1" - content-type "^1.0.2" - loglevel "^1.6.4" - qs "^6.5.2" - request "^2.88.0" - unhomoglyph "^1.0.2" - matrix-mock-request@^1.2.3: version "1.2.3" resolved "https://registry.yarnpkg.com/matrix-mock-request/-/matrix-mock-request-1.2.3.tgz#56b15d86e2601a9b48a854844396d18caab649c8" @@ -7350,10 +7335,10 @@ matrix-mock-request@^1.2.3: bluebird "^3.5.0" expect "^1.20.2" -matrix-react-sdk@3.2.0-rc.1: - version "3.2.0-rc.1" - resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.2.0-rc.1.tgz#2dc7ca5d5ca4187a0973c8e2dee7e45c98923755" - integrity sha512-1BZW6WQBDlx0FhKAKBhVP2Oex2uRWSjzjKM3ccc/tHzih56XYFY4DUWf9Bd2jiPn2EyHQcwncmcFcDOC4bV4qQ== +matrix-react-sdk@3.2.0: + version "3.2.0" + resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.2.0.tgz#4523003c8dd72f9d7c9b53d5bec3cd67fe41c52f" + integrity sha512-yywvU2lJR0s/P3Suf5SDf3Aa/vHDZjwDiR14DBsHKdP97TyugA3LKogVkjfi192+m2sMFtl8AB/raplhSz/lNg== dependencies: "@babel/runtime" "^7.10.5" await-lock "^2.0.1" @@ -7381,7 +7366,7 @@ matrix-react-sdk@3.2.0-rc.1: is-ip "^2.0.0" linkifyjs "^2.1.9" lodash "^4.17.19" - matrix-js-sdk "8.1.0-rc.1" + matrix-js-sdk "8.1.0" minimist "^1.2.5" pako "^1.0.11" parse5 "^5.1.1" From a7ac9408b8e4913bdbddf202aa1ce7e2bde08007 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Mon, 17 Aug 2020 13:12:41 +0100 Subject: [PATCH 036/268] Prepare changelog for v1.7.4 --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index a508ce4c48..c7ddf3956e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +Changes in [1.7.4](https://github.com/vector-im/element-web/releases/tag/v1.7.4) (2020-08-17) +============================================================================================= +[Full Changelog](https://github.com/vector-im/element-web/compare/v1.7.4-rc.1...v1.7.4) + + * Upgrade to React SDK 3.2.0 and JS SDK 8.1.0 + Changes in [1.7.4-rc.1](https://github.com/vector-im/element-web/releases/tag/v1.7.4-rc.1) (2020-08-13) ======================================================================================================= [Full Changelog](https://github.com/vector-im/element-web/compare/v1.7.3...v1.7.4-rc.1) From 8aa46ba700530d9d8e05ec67f4c6d7c7530ba36f Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Mon, 17 Aug 2020 13:12:41 +0100 Subject: [PATCH 037/268] v1.7.4 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index cedebc224f..67a4cf07d7 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "riot-web", "productName": "Riot", - "version": "1.7.4-rc.1", + "version": "1.7.4", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "repository": { From 4a7c2318dd8d2d37ce398d9a4f73b35b70d8b99b Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Mon, 17 Aug 2020 13:17:27 +0100 Subject: [PATCH 038/268] 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 67a4cf07d7..70b5f3bfc5 100644 --- a/package.json +++ b/package.json @@ -59,7 +59,7 @@ "browser-request": "^0.3.3", "gfm.css": "^1.1.2", "highlight.js": "^9.13.1", - "matrix-js-sdk": "8.1.0", + "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop", "matrix-react-sdk": "3.2.0", "olm": "https://packages.matrix.org/npm/olm/olm-3.1.4.tgz", "prop-types": "^15.7.2", diff --git a/yarn.lock b/yarn.lock index e14b64c9b1..51fba154be 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7327,6 +7327,20 @@ matrix-js-sdk@8.1.0: request "^2.88.0" unhomoglyph "^1.0.2" +"matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop": + version "8.1.0" + resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/64cdd73b93a475d10284977b69ef73138315b3be" + dependencies: + "@babel/runtime" "^7.8.3" + another-json "^0.2.0" + browser-request "^0.3.3" + bs58 "^4.0.1" + content-type "^1.0.2" + loglevel "^1.6.4" + qs "^6.5.2" + request "^2.88.0" + unhomoglyph "^1.0.2" + matrix-mock-request@^1.2.3: version "1.2.3" resolved "https://registry.yarnpkg.com/matrix-mock-request/-/matrix-mock-request-1.2.3.tgz#56b15d86e2601a9b48a854844396d18caab649c8" From d969a96cd27db7d64e82c211c6a3a08fd915c378 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Mon, 17 Aug 2020 13:17:44 +0100 Subject: [PATCH 039/268] 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 70b5f3bfc5..364bd9446d 100644 --- a/package.json +++ b/package.json @@ -60,7 +60,7 @@ "gfm.css": "^1.1.2", "highlight.js": "^9.13.1", "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop", - "matrix-react-sdk": "3.2.0", + "matrix-react-sdk": "github:matrix-org/matrix-react-sdk#develop", "olm": "https://packages.matrix.org/npm/olm/olm-3.1.4.tgz", "prop-types": "^15.7.2", "react": "^16.9.0", diff --git a/yarn.lock b/yarn.lock index 51fba154be..4ff565f388 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7312,21 +7312,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.1.0: - version "8.1.0" - resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-8.1.0.tgz#c4e48b03a54455dda3d3e1c539ce31dbb46790ac" - integrity sha512-id/J1rBmooQWebCNO4we5W4w816+6LR503H6N1A3jn2CZl2etg86HOScmtGmw+4qkzjKJI5QkL30tvDyAJ+lxA== - dependencies: - "@babel/runtime" "^7.8.3" - another-json "^0.2.0" - browser-request "^0.3.3" - bs58 "^4.0.1" - content-type "^1.0.2" - loglevel "^1.6.4" - qs "^6.5.2" - request "^2.88.0" - unhomoglyph "^1.0.2" - "matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop": version "8.1.0" resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/64cdd73b93a475d10284977b69ef73138315b3be" @@ -7349,10 +7334,9 @@ matrix-mock-request@^1.2.3: bluebird "^3.5.0" expect "^1.20.2" -matrix-react-sdk@3.2.0: +"matrix-react-sdk@github:matrix-org/matrix-react-sdk#develop": version "3.2.0" - resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.2.0.tgz#4523003c8dd72f9d7c9b53d5bec3cd67fe41c52f" - integrity sha512-yywvU2lJR0s/P3Suf5SDf3Aa/vHDZjwDiR14DBsHKdP97TyugA3LKogVkjfi192+m2sMFtl8AB/raplhSz/lNg== + resolved "https://codeload.github.com/matrix-org/matrix-react-sdk/tar.gz/c91fc99d4bfd76808c99327979c1b7dbcb9bf093" dependencies: "@babel/runtime" "^7.10.5" await-lock "^2.0.1" @@ -7380,7 +7364,7 @@ matrix-react-sdk@3.2.0: is-ip "^2.0.0" linkifyjs "^2.1.9" lodash "^4.17.19" - matrix-js-sdk "8.1.0" + matrix-js-sdk "github:matrix-org/matrix-js-sdk#develop" minimist "^1.2.5" pako "^1.0.11" parse5 "^5.1.1" From 02e23e48b38bd3b3f32ca1dc50c634d936451c24 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Mon, 17 Aug 2020 18:20:57 +0100 Subject: [PATCH 040/268] TypeScript: enable es2019 lib for newer definitions --- tsconfig.json | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tsconfig.json b/tsconfig.json index 8a01ca335e..e16688adb3 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -16,6 +16,11 @@ "node", "react", "flux" + ], + "lib": [ + "es2019", + "dom", + "dom.iterable" ] }, "include": [ From 2a25c6aaa4206edcfca179d8cab0201492b730b6 Mon Sep 17 00:00:00 2001 From: Travis Ralston Date: Mon, 17 Aug 2020 13:41:19 -0600 Subject: [PATCH 041/268] Update configs for new settings structure --- config.sample.json | 6 +----- element.io/app/config.json | 3 +-- element.io/develop/config.json | 16 +--------------- 3 files changed, 3 insertions(+), 22 deletions(-) diff --git a/config.sample.json b/config.sample.json index 662865c041..52e47f03f1 100644 --- a/config.sample.json +++ b/config.sample.json @@ -26,11 +26,7 @@ "defaultCountryCode": "GB", "showLabsSettings": false, "features": { - "feature_new_spinner": "labs", - "feature_pinning": "labs", - "feature_custom_status": "labs", - "feature_custom_tags": "labs", - "feature_state_counters": "labs" + "feature_new_spinner": false }, "default_federate": true, "default_theme": "light", diff --git a/element.io/app/config.json b/element.io/app/config.json index f0af8b82bb..c8867d3dd6 100644 --- a/element.io/app/config.json +++ b/element.io/app/config.json @@ -12,8 +12,7 @@ ], "hosting_signup_link": "https://element.io/matrix-services?utm_source=element-web&utm_medium=web", "bug_report_endpoint_url": "https://element.io/bugreports/submit", - "features": { - }, + "showLabsSettings": false, "piwik": { "url": "https://piwik.riot.im/", "siteId": 1, diff --git a/element.io/develop/config.json b/element.io/develop/config.json index be5b58909a..bcf6142d18 100644 --- a/element.io/develop/config.json +++ b/element.io/develop/config.json @@ -12,21 +12,7 @@ ], "hosting_signup_link": "https://element.io/matrix-services?utm_source=element-web&utm_medium=web", "bug_report_endpoint_url": "https://element.io/bugreports/submit", - "features": { - "feature_new_spinner": "labs", - "feature_pinning": "labs", - "feature_custom_status": "labs", - "feature_custom_tags": "labs", - "feature_state_counters": "labs", - "feature_many_integration_managers": "labs", - "feature_mjolnir": "labs", - "feature_dm_verification": "labs", - "feature_bridge_state": "labs", - "feature_presence_in_room_list": "labs", - "feature_custom_themes": "labs", - "feature_roomlist_preview_reactions_dms": "labs", - "feature_roomlist_preview_reactions_all": "labs" - }, + "showLabsSettings": true, "piwik": { "url": "https://piwik.riot.im/", "siteId": 1, From 3e924941c3c6b3f29e7b889c4f6f6b9b3d181b51 Mon Sep 17 00:00:00 2001 From: Travis Ralston Date: Mon, 17 Aug 2020 14:00:04 -0600 Subject: [PATCH 042/268] Update feature flags documentation for new feature behaviour --- docs/feature-flags.md | 68 +++++++++++++------------------------------ 1 file changed, 20 insertions(+), 48 deletions(-) diff --git a/docs/feature-flags.md b/docs/feature-flags.md index 115c3b25f2..5fb5545fdf 100644 --- a/docs/feature-flags.md +++ b/docs/feature-flags.md @@ -35,7 +35,7 @@ clients commit to doing the associated clean up work once a feature stabilises. When starting work on a feature, we should create a matching feature flag: 1. Add a new - [setting](https://github.com/matrix-org/matrix-react-sdk/blob/develop/src/settings/Settings.js) + [setting](https://github.com/matrix-org/matrix-react-sdk/blob/develop/src/settings/Settings.ts) of the form: ```js "feature_cats": { @@ -47,17 +47,9 @@ When starting work on a feature, we should create a matching feature flag: ``` 2. Check whether the feature is enabled as appropriate: ```js - SettingsStore.isFeatureEnabled("feature_cats") + SettingsStore.getValue("feature_cats") ``` -3. Add the feature to the set of labs on - [develop](https://github.com/vector-im/riot-web/blob/develop/riot.im/develop/config.json) - and [nightly](https://github.com/vector-im/riot-desktop/blob/develop/riot.im/nightly/config.json): -```json - "features": { - "feature_cats": "labs" - }, -``` -4. Document the feature in the [labs documentation](https://github.com/vector-im/riot-web/blob/develop/docs/labs.md) +3. Document the feature in the [labs documentation](https://github.com/vector-im/riot-web/blob/develop/docs/labs.md) With these steps completed, the feature is disabled by default, but can be enabled on develop and nightly by interested users for testing. @@ -67,7 +59,7 @@ The following lists a few common options. ## Enabling by default on develop and nightly -Set the feature to `enable` in the +Set the feature to `true` in the [develop](https://github.com/vector-im/riot-web/blob/develop/riot.im/develop/config.json) and [nightly](https://github.com/vector-im/riot-desktop/blob/develop/riot.im/nightly/config.json) @@ -75,34 +67,37 @@ configs: ```json "features": { - "feature_cats": "enable" + "feature_cats": true }, ``` ## Enabling by default on staging, app, and release -Set the feature to `enable` in the +Set the feature to `true` in the [staging / app](https://github.com/vector-im/riot-web/blob/develop/riot.im/app/config.json) and [release](https://github.com/vector-im/riot-desktop/blob/develop/riot.im/release/config.json) configs. -**Warning:** While this does mean the feature is enabled by default for -https://app.element.io and official Element Desktop builds, it will not be enabled by -default for self-hosted installs, custom desktop builds, etc. To cover those -cases as well, the best options at the moment are converting to a regular -setting defaulted on or to remove the flag. Simply enabling the existing flag by -default in `Settings.js` -[does not work currently](https://github.com/vector-im/riot-web/issues/10360). +**Note:** The above will only enable the feature for https://app.element.io and official Element +Desktop builds. It will not be enabled for self-hosted installed, custom desktop builds, etc. To +cover these cases, change the setting's `default` in `Settings.ts` to `true`. ## Feature deployed successfully -Once we're confident that a feature is working well, we should remove the flag: +Once we're confident that a feature is working well, we should remove or convert the flag. -1. Remove the [setting](https://github.com/matrix-org/matrix-react-sdk/blob/develop/src/settings/Settings.js) -2. Remove all `isFeatureEnabled` lines that test for the feature's setting +If the feature is meant to be turned off/on by the user: +1. Remove `isFeature` from the [setting](https://github.com/matrix-org/matrix-react-sdk/blob/develop/src/settings/Settings.ts) +2. Change the `default` to `true` (if desired). 3. Remove the feature from the [labs documentation](https://github.com/vector-im/riot-web/blob/develop/docs/labs.md) -4. Remove feature state from +4. Celebrate! 🥳 + +If the feature is meant to be forced on (non-configurable): +1. Remove the [setting](https://github.com/matrix-org/matrix-react-sdk/blob/develop/src/settings/Settings.ts) +2. Remove all `getValue` lines that test for the feature. +3. Remove the feature from the [labs documentation](https://github.com/vector-im/riot-web/blob/develop/docs/labs.md) +4. If applicable, remove the feature state from [develop](https://github.com/vector-im/riot-web/blob/develop/riot.im/develop/config.json), [nightly](https://github.com/vector-im/riot-desktop/blob/develop/riot.im/nightly/config.json), [staging / app](https://github.com/vector-im/riot-web/blob/develop/riot.im/app/config.json), @@ -110,26 +105,3 @@ Once we're confident that a feature is working well, we should remove the flag: [release](https://github.com/vector-im/riot-desktop/blob/develop/riot.im/release/config.json) configs 5. Celebrate! 🥳 - -## Convert to a regular setting (optional) - -Sometimes we decide a feature should always be user-controllable as a setting -even after it has been fully deployed. In that case, we would craft a new, -regular setting: - -1. Remove the feature flag from - [settings](https://github.com/matrix-org/matrix-react-sdk/blob/develop/src/settings/Settings.js) - and add a regular setting with the appropriate levels for your feature -2. Replace the `isFeatureEnabled` lines with `getValue` or similar calls - according to the [settings - docs](https://github.com/matrix-org/matrix-react-sdk/blob/develop/docs/settings.md) - (checking carefully, as we may want a different mix of code paths when the - feature is always present but gated by a setting) -3. Remove the feature from the [labs documentation](https://github.com/vector-im/riot-web/blob/develop/docs/labs.md) -4. Remove feature state from - [develop](https://github.com/vector-im/riot-web/blob/develop/riot.im/develop/config.json), - [nightly](https://github.com/vector-im/riot-desktop/blob/develop/riot.im/nightly/config.json), - [staging / app](https://github.com/vector-im/riot-web/blob/develop/riot.im/app/config.json), - and - [release](https://github.com/vector-im/riot-desktop/blob/develop/riot.im/release/config.json) - configs From 2c952b422befb635c586e58f1e8690e708a949e0 Mon Sep 17 00:00:00 2001 From: Travis Ralston Date: Mon, 17 Aug 2020 14:02:19 -0600 Subject: [PATCH 043/268] Update config.md for new feature behaviour --- docs/config.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/docs/config.md b/docs/config.md index d342aaf4f2..a9d05d8618 100644 --- a/docs/config.md +++ b/docs/config.md @@ -22,12 +22,12 @@ For a good example, see https://develop.element.io/config.json. `default_hs_url` is specified. When multiple sources are specified, it is unclear which should take priority and therefore the application cannot continue. * As of Element 1.4.0, identity servers are optional. See [Identity servers](#identity-servers) below. -1. `features`: Lookup of optional features that may be `enable`d, `disable`d, or - exposed to the user in the `labs` section of settings. The available - optional experimental features vary from release to release and are [documented](labs.md). The feature flag process is - [documented](feature-flags.md) as well. -1. `showLabsSettings`: Shows the "labs" tab of user settings even when no `features` are enabled - or present. Useful for getting at settings which may be otherwise hidden. +1. `features`: Lookup of optional features that may be force-enabled (`true`) or force-disabled (`false`). + When features are not listed here, their defaults will be used, and users can turn them on/off if `showLabsSettings` + allows them to. The available optional experimental features vary from release to release and are + [documented](labs.md). The feature flag process is [documented](feature-flags.md) as well. +1. `showLabsSettings`: Shows the "labs" tab of user settings. Useful to allow users to turn on experimental features + they might not otherwise have access to. 1. `brand`: String to pass to your homeserver when configuring email notifications, to let the homeserver know what email template to use when talking to you. 1. `branding`: Configures various branding and logo details, such as: From 46f2793563f97ed73f2d8a6b47902ae2695a199e Mon Sep 17 00:00:00 2001 From: Marcelo Filho Date: Sun, 16 Aug 2020 18:49:02 +0000 Subject: [PATCH 044/268] 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 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/i18n/strings/pt_BR.json b/src/i18n/strings/pt_BR.json index 18fad39868..dfdcd88d2f 100644 --- a/src/i18n/strings/pt_BR.json +++ b/src/i18n/strings/pt_BR.json @@ -7,7 +7,7 @@ "Decentralised, encrypted chat & collaboration powered by [matrix]": "Chat descentralizado, criptografado e colaborativo construído com [matrix]", "Sign In": "Entrar", "Create Account": "Criar Conta", - "Explore rooms": "Explore as salas", + "Explore rooms": "Explorar salas", "The message from the parser is: %(message)s": "A mensagem do parser é: %(message)s", "Invalid JSON": "JSON inválido", "Unexpected error preparing the app. See console for details.": "Erro inesperado preparando o aplicativo. Veja o console para mais detalhes.", @@ -26,11 +26,11 @@ "Missing indexeddb worker script!": "O script indexeddb não foi encontrado!", "Open": "Abrir", "Previous/next recently visited room or community": "Anterior/Próxima sala ou comunidade visitada recentemente", - "%(brand)s Desktop (%(platformName)s)": "%(brand)s Desktop (%(platformName)s)", + "%(brand)s Desktop (%(platformName)s)": "%(brand)s para Computador (%(platformName)s)", "Go to your browser to complete Sign In": "Vá para o seu navegador para concluir o login", "Your Element is misconfigured": "Seu Element está desconfigurado", "Your Element configuration contains invalid JSON. Please correct the problem and reload the page.": "Sua configuração do Element contém JSON inválido. Por favor, corrija o problema e recarregue a página.", - "Your browser can't run %(brand)s": "Seu navegador não consegue rodar %(brand)s", + "Your browser can't run %(brand)s": "Seu navegador não consegue rodar o %(brand)s", "%(brand)s uses advanced browser features which aren't supported by your current browser.": "%(brand)s usa funcionalidades avançadas de navegador que não são suportadas pelo seu navegador atual.", "Powered by Matrix": "Construído com tecnologia Matrix" } From c4fae201e9dd3828e4810b5b528b2357617f6b6e Mon Sep 17 00:00:00 2001 From: Weasy Date: Tue, 18 Aug 2020 23:18:03 +0200 Subject: [PATCH 045/268] Address review comments --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 4ba01d83d7..3414b7b1e5 100644 --- a/README.md +++ b/README.md @@ -39,7 +39,7 @@ 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 `element-x.x.x` directory to an appropriate name +1. Move (or symlink) the `riot-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. @@ -129,7 +129,7 @@ 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/element-web +docker run -p 80:80 vectorim/riot-web ``` To supply your own custom `config.json`, map a volume to `/app/config.json`. For example, @@ -192,7 +192,7 @@ also defines the design, architecture and style for Element too. Before starting work on a feature, it's best to ensure your plan aligns well with our vision for Element. Please chat with the team in -[#riot-dev:matrix.org](https://matrix.to/#/#riot-dev:matrix.org) before you +[#element-dev:matrix.org](https://matrix.to/#/#element-dev:matrix.org) before you start so we can ensure it's something we'd be willing to merge. You should also familiarise yourself with the ["Here be Dragons" guide From 5b5f2058927adb6f0381d0ab2957f6317e97018c Mon Sep 17 00:00:00 2001 From: Christoph Settgast Date: Wed, 19 Aug 2020 16:13:59 +0200 Subject: [PATCH 046/268] Link to Element in F-Droid as well The old app-id shows a big warning that it will no longer be maintained, so avoid linking to it (especially for self-hosted element-web installs). Signed-off-by: Christoph Settgast --- src/async-components/structures/CompatibilityView.tsx | 2 +- src/vector/mobile_guide/index.html | 2 +- src/vector/static/incompatible-browser.html | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/async-components/structures/CompatibilityView.tsx b/src/async-components/structures/CompatibilityView.tsx index 41d21b469c..974d8c1b80 100644 --- a/src/async-components/structures/CompatibilityView.tsx +++ b/src/async-components/structures/CompatibilityView.tsx @@ -87,7 +87,7 @@ const CompatibilityView: React.FC = ({ onAccept }) => { className="mx_ClearDecoration"> Google Play Store - F-Droid diff --git a/src/vector/mobile_guide/index.html b/src/vector/mobile_guide/index.html index acd0734797..da49907f9c 100644 --- a/src/vector/mobile_guide/index.html +++ b/src/vector/mobile_guide/index.html @@ -260,7 +260,7 @@ body { - + Get it on F-Droid. diff --git a/src/vector/static/incompatible-browser.html b/src/vector/static/incompatible-browser.html index 09e5238586..bc839d6b38 100644 --- a/src/vector/static/incompatible-browser.html +++ b/src/vector/static/incompatible-browser.html @@ -339,7 +339,7 @@ - From 8b0eafe50f96dc501e22efd828de3d56ff584ff1 Mon Sep 17 00:00:00 2001 From: "J. Ryan Stinnett" Date: Fri, 14 Aug 2020 13:03:04 +0100 Subject: [PATCH 047/268] Document new .well-known for E2EE settings This updates documentation about the new key in `.well-known` that we'll check for E2EE settings: `im.vector.e2ee`. Part of https://github.com/vector-im/element-web/issues/14954 --- docs/e2ee.md | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/docs/e2ee.md b/docs/e2ee.md index fe4931f56f..f7a32dfcc0 100644 --- a/docs/e2ee.md +++ b/docs/e2ee.md @@ -9,8 +9,14 @@ Set the following on your homeserver's `/.well-known/matrix/client` config: ```json { - "im.vector.riot.e2ee": { + "im.vector.e2ee": { "default": false } } ``` + +# Compatibility + +The settings above were first proposed under a `im.vector.riot.e2ee` key, which +is now deprecated. Element will check for either key, preferring +`im.vector.e2ee` if both exist. From fa265e498f1800f3c822e8f54f318fadfd4549b4 Mon Sep 17 00:00:00 2001 From: "J. Ryan Stinnett" Date: Fri, 14 Aug 2020 13:31:57 +0100 Subject: [PATCH 048/268] Document new setting to require secure backup This adds notes on configuring the new `.well-known` setting to require Element users to set up secure backup before continuing into the app. Part of https://github.com/vector-im/element-web/issues/14954 --- docs/e2ee.md | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/docs/e2ee.md b/docs/e2ee.md index f7a32dfcc0..d42fe9cc05 100644 --- a/docs/e2ee.md +++ b/docs/e2ee.md @@ -7,6 +7,7 @@ For private room creation, Element will default to encryption on but give you th Set the following on your homeserver's `/.well-known/matrix/client` config: + ```json { "im.vector.e2ee": { @@ -15,6 +16,25 @@ Set the following on your homeserver's } ``` +# Secure backup + +By default, Element strongly encourages (but does not require) users to set up +Secure Backup so that cross-signing identity key and message keys can be +recovered in case of a disaster where you lose access to all active devices. + +## Requiring secure backup + +To require Secure Backup to be configured before Element can be used, set the +following on your homeserver's `/.well-known/matrix/client` config: + +```json +{ + "im.vector.e2ee": { + "secureBackupRequired": true + } +} +``` + # Compatibility The settings above were first proposed under a `im.vector.riot.e2ee` key, which From 8cfb0a71a0df6fe071131f6db33ff1099e0b0a39 Mon Sep 17 00:00:00 2001 From: "J. Ryan Stinnett" Date: Wed, 19 Aug 2020 18:18:50 +0100 Subject: [PATCH 049/268] Apply suggestions from code review --- docs/jitsi.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/docs/jitsi.md b/docs/jitsi.md index 76b49c9c73..d289cc3818 100644 --- a/docs/jitsi.md +++ b/docs/jitsi.md @@ -52,20 +52,20 @@ default, and you are using riot-web 1.6 or newer, set the following on your home ## Element Android -Element Android (1.0.5+) supports custom jitsi domain. +Element Android (1.0.5+) supports custom Jitsi domains, similar to Element Web above. 1:1 calls, or calls between you and one other person, do not use Jitsi. Instead, those calls work directly between clients or via TURN servers configured on the respective homeservers. -For rooms with more than 2 joined members, when creating a jitsi conference via call/video buttons of the toolbar (not via integration manager), Element Android will create a widget using app.element.io [wrapper](https://github.com/vector-im/element-web/blob/develop/docs/jitsi-dev.md) as url. -The domain used is the one specified by the `/.well-known/matrix/client` endpoint, and if not present it uses the fallback defined in `confix.xml` (jitsi.riot.im) +For rooms with more than 2 joined members, when creating a Jitsi conference via call/video buttons of the toolbar (not via integration manager), Element Android will create a widget using the [wrapper](https://github.com/vector-im/element-web/blob/develop/docs/jitsi-dev.md) hosted on `app.element.io`. +The domain used is the one specified by the `/.well-known/matrix/client` endpoint, and if not present it uses the fallback defined in `config.xml` (jitsi.riot.im) -For active jitsi widgets in the room, a native jitsi widget UI is created and points to the instance specified in the `domain` key of the widget content data. +For active Jitsi widgets in the room, a native Jitsi widget UI is created and points to the instance specified in the `domain` key of the widget content data. -Element android manages allowed native widgets permissions a bit differently than web widgets (as the data shared are different, and never shared with the widget url). For jitsi widgets permissions is asked only once per domain (consent saved in account data). +Element Android manages allowed native widgets permissions a bit differently than web widgets (as the data shared are different and never shared with the widget URL). For Jitsi widgets, permissions are requested only once per domain (consent saved in account data). -## Element IOS +## Element iOS Currently the Element mobile apps do not support custom Jitsi servers and will instead use the default `jitsi.riot.im` server. When users on the mobile apps join the call, From 01e0d5ed70c47ff88bb81733aba2e54a7db78e63 Mon Sep 17 00:00:00 2001 From: Marcelo Filho Date: Tue, 18 Aug 2020 23:45:50 +0000 Subject: [PATCH 050/268] 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 dfdcd88d2f..9ad9220a7c 100644 --- a/src/i18n/strings/pt_BR.json +++ b/src/i18n/strings/pt_BR.json @@ -31,6 +31,6 @@ "Your Element is misconfigured": "Seu Element está desconfigurado", "Your Element configuration contains invalid JSON. Please correct the problem and reload the page.": "Sua configuração do Element contém JSON inválido. Por favor, corrija o problema e recarregue a página.", "Your browser can't run %(brand)s": "Seu navegador não consegue rodar o %(brand)s", - "%(brand)s uses advanced browser features which aren't supported by your current browser.": "%(brand)s usa funcionalidades avançadas de navegador que não são suportadas pelo seu navegador atual.", + "%(brand)s uses advanced browser features which aren't supported by your current browser.": "%(brand)s usa recursos avançados que não são suportados pelo seu navegador de internet atual.", "Powered by Matrix": "Construído com tecnologia Matrix" } From b4173f3e084366521564b893d0df9388069e6b32 Mon Sep 17 00:00:00 2001 From: Travis Ralston Date: Thu, 20 Aug 2020 19:46:19 -0600 Subject: [PATCH 051/268] Add docs for labs flag --- docs/labs.md | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/docs/labs.md b/docs/labs.md index ade4ace167..50f9e589ed 100644 --- a/docs/labs.md +++ b/docs/labs.md @@ -95,7 +95,14 @@ theme definition. For some sample themes, check out [aaronraimist/element-themes](https://github.com/aaronraimist/element-themes). -# Message preview tweaks +## Message preview tweaks To enable message previews for reactions in all rooms, enable `feature_roomlist_preview_reactions_all`. To enable message previews for reactions in DMs, enable `feature_roomlist_preview_reactions_dms`, ignored when it is enabled for all rooms. + +## Communities v2 prototyping (`feature_communities_v2_prototypes`) [In Development] + +**This is a highly experimental implementation for parts of the communities v2 experience.** It does not +represent what communities v2 will look/feel like and can/will change without notice. Due to the early +stages this feature is in and the requirement for a compatible homeserver, we will not be accepting issues +or feedback for this functionality at this time. From 8a8c684ef9f1ba7b2660e46ddf5c0b3a6dab86af Mon Sep 17 00:00:00 2001 From: Jonas Kress Date: Fri, 21 Aug 2020 10:06:56 +0200 Subject: [PATCH 052/268] Update links to element in the readme --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 0f097cd137..2ab1681995 100644 --- a/README.md +++ b/README.md @@ -105,10 +105,10 @@ Running as a Desktop app ======================== Element can also be run as a desktop app, wrapped in Electron. You can download a -pre-built version from https://riot.im/download/desktop/ or, if you prefer, +pre-built version from https://element.io/get-started or, if you prefer, build it yourself. -To build it yourself, follow the instructions at https://github.com/vector-im/riot-desktop. +To build it yourself, follow the instructions at https://github.com/vector-im/element-desktop. Many thanks to @aviraldg for the initial work on the Electron integration. From 85726c604e07370ce4eb2d708b74c7f94328cd6d Mon Sep 17 00:00:00 2001 From: Jonas Kress Date: Fri, 21 Aug 2020 11:34:35 +0200 Subject: [PATCH 053/268] Change riot to element --- README.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 2ab1681995..ed951ec1ee 100644 --- a/README.md +++ b/README.md @@ -24,8 +24,8 @@ Element has several tiers of support for different environments: * Everything else For accessing Element on an Android or iOS device, we currently recommend the -native apps [riot-android](https://github.com/vector-im/riot-android) -and [riot-ios](https://github.com/vector-im/riot-ios). +native apps [element-android](https://github.com/vector-im/element-android) +and [element-ios](https://github.com/vector-im/element-ios). Getting Started =============== @@ -37,7 +37,7 @@ for those who like living dangerously. To host your own copy of Element, the quickest bet is to use a pre-built released version of Element: -1. Download the latest version from https://github.com/vector-im/riot-web/releases +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. Configure the correct caching headers in your webserver (see below) @@ -69,7 +69,7 @@ access to Element (or other apps) due to sharing the same domain. We have put some coarse mitigations into place to try to protect against this situation, but it's still not good practice to do it in the first place. See -https://github.com/vector-im/riot-web/issues/1977 for more details. +https://github.com/vector-im/element-web/issues/1977 for more details. Building From Source ==================== @@ -82,7 +82,7 @@ guide](https://classic.yarnpkg.com/en/docs/install) if you do not have it alread 1. Install or update `node.js` so that your `node` is at least v10.x. 1. Install `yarn` if not present already. -1. Clone the repo: `git clone https://github.com/vector-im/riot-web.git`. +1. Clone the repo: `git clone https://github.com/vector-im/element-web.git`. 1. Switch to the riot-web directory: `cd riot-web`. 1. Install the prerequisites: `yarn install`. * If you're using the `develop` branch, then it is recommended to set up a From c032067a30513b334aaca5c39fc8e32ee63345c6 Mon Sep 17 00:00:00 2001 From: Weasy Date: Sat, 22 Aug 2020 09:52:05 +0200 Subject: [PATCH 054/268] Remove tag from `docker build` commands --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 3414b7b1e5..58bb12158d 100644 --- a/README.md +++ b/README.md @@ -136,7 +136,7 @@ To supply your own custom `config.json`, map a volume to `/app/config.json`. For 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/element-web +docker run -p 80:80 -v /etc/element-web/config.json:/app/config.json vectorim/riot-web ``` To build the image yourself: @@ -144,13 +144,13 @@ To build the image yourself: git clone https://github.com/vector-im/element-web.git element-web cd element-web git checkout master -docker build -t vectorim/element-web . +docker build . ``` If you're building a custom branch, or want to use the develop branch, check out the appropriate element-web branch and then run: ```bash -docker build -t vectorim/element-web:develop \ +docker build -t \ --build-arg USE_CUSTOM_SDKS=true \ --build-arg REACT_SDK_REPO="https://github.com/matrix-org/matrix-react-sdk.git" \ --build-arg REACT_SDK_BRANCH="develop" \ From c1faa541029c9830c2dac6c3f1a51e95fb24dc8a Mon Sep 17 00:00:00 2001 From: Selyan Slimane Amiri Date: Sat, 22 Aug 2020 21:16:55 +0100 Subject: [PATCH 055/268] Make kabyle translation available --- scripts/copy-res.js | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/copy-res.js b/scripts/copy-res.js index 71eb6b75ad..68d131c7c6 100755 --- a/scripts/copy-res.js +++ b/scripts/copy-res.js @@ -31,6 +31,7 @@ const INCLUDE_LANGS = [ {'value': 'it', 'label': 'Italiano'}, {'value': 'ja', 'label': '日本語'}, {'value': 'jbo', 'label': 'banjubu\'o'}, + {'value': 'kab', 'label': 'Taqbaylit'}, {'value': 'ko', 'label': '한국어'}, {'value': 'lt', 'label': 'Lietuvių'}, {'value': 'lv', 'label': 'Latviešu'}, From 3800fe0c9be7472d218aec216ed3e47cbd7ecfbd Mon Sep 17 00:00:00 2001 From: "J. Ryan Stinnett" Date: Mon, 24 Aug 2020 16:34:58 +0100 Subject: [PATCH 056/268] Use `io.element` instead of `im.vector` This also fixes casing as well to match the latest thinking. --- docs/e2ee.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/e2ee.md b/docs/e2ee.md index d42fe9cc05..eca5557fb2 100644 --- a/docs/e2ee.md +++ b/docs/e2ee.md @@ -10,7 +10,7 @@ Set the following on your homeserver's ```json { - "im.vector.e2ee": { + "io.element.e2ee": { "default": false } } @@ -29,8 +29,8 @@ following on your homeserver's `/.well-known/matrix/client` config: ```json { - "im.vector.e2ee": { - "secureBackupRequired": true + "io.element.e2ee": { + "secure_backup_required": true } } ``` @@ -39,4 +39,4 @@ following on your homeserver's `/.well-known/matrix/client` config: The settings above were first proposed under a `im.vector.riot.e2ee` key, which is now deprecated. Element will check for either key, preferring -`im.vector.e2ee` if both exist. +`io.element.e2ee` if both exist. From 46879e297642ae189c3c4b1eec8663806567cc68 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matija=20=C5=A0uklje?= Date: Mon, 24 Aug 2020 17:17:11 +0000 Subject: [PATCH 057/268] Translated using Weblate (Slovenian) 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/sl/ --- src/i18n/strings/sl.json | 27 ++++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/src/i18n/strings/sl.json b/src/i18n/strings/sl.json index 014f345993..8d130a3733 100644 --- a/src/i18n/strings/sl.json +++ b/src/i18n/strings/sl.json @@ -7,5 +7,30 @@ "Decentralised, encrypted chat & collaboration powered by [matrix]": "Decentralizirano šifrirano sporočanje & sodelovanje s pomočjo [matrix]", "Sign In": "Prijava", "Create Account": "Registracija", - "Explore rooms": "Raziščite sobe" + "Explore rooms": "Raziščite sobe", + "Missing indexeddb worker script!": "Manjka skript za IndexDB!", + "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Neveljavna konfiguracija: lahko izberete samo eno izmed default_server_config, default_server_name ali default_hs_url.", + "Invalid configuration: no default server specified.": "Neveljavna konfiguracija: privzeti strežnik ni nastavljen.", + "Your Element is misconfigured": "Vaš Element je napačno nastavljen", + "Your Element configuration contains invalid JSON. Please correct the problem and reload the page.": "Konfiguracije vašega Elementa vsebujejo neveljaven JSON. Prosim, popravite napako in znova naložite stran.", + "The message from the parser is: %(message)s": "Sporočilo parserja je: %(message)s", + "Invalid JSON": "Neveljaven JSON", + "Unable to load config file: please refresh the page to try again.": "Ni uspelo naložiti konfiguracijske datoteke: prosim, ponovno naložite stran.", + "Unexpected error preparing the app. See console for details.": "Nepričakovana napaka pri pripravi aplikacije: Za več poglejte konzolo.", + "Download Completed": "Prenos zaključen", + "Open": "Odpri", + "Open user settings": "Odpri uporabniške nastavitve", + "Previous/next recently visited room or community": "Prejšnja/naslednja soba ali skupnost, ki je bila pred kratkim odprta", + "%(brand)s Desktop (%(platformName)s)": "%(brand)s namizje za (%(platformName)s)", + "Go to your browser to complete Sign In": "Nadaljujte s prijavo v spletnem brskalniku", + "%(appName)s (%(browserName)s, %(osName)s)": "%(appName)s (%(browserName)s, %(osName)s)", + "Powered by Matrix": "Poganja Matrix", + "Unsupported browser": "Nepodprt brskalnik", + "Your browser can't run %(brand)s": "Vaš brskalnik ne more poganjati %(brand)s", + "%(brand)s uses advanced browser features which aren't supported by your current browser.": "%(brand)s uporablja napredne lastnosti brskalnika, ki jih vaš trenutni brskalnik ne podpira.", + "Please install Chrome, Firefox, or Safari for the best experience.": "Za najboljšo izkušnjo, prosim namestite Chrome, Firefox ali 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.": "Lahko nadaljujete z uporabo vašega trenutnega brskalnika, vendar lahko to privede do manjkajočih funkcionalnosti ali napačnega izgleda aplikacije.", + "I understand the risks and wish to continue": "Razumem riziko in želim vseeno nadaljevati", + "Go to element.io": "Pojdi na element.io", + "Failed to start": "Neuspel zagon" } From 71d32d1f7da88e9f4be16eb84132e7ae6c6f7213 Mon Sep 17 00:00:00 2001 From: LinAGKar Date: Tue, 25 Aug 2020 07:13:12 +0000 Subject: [PATCH 058/268] Translated using Weblate (Swedish) 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/sv/ --- src/i18n/strings/sv.json | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/src/i18n/strings/sv.json b/src/i18n/strings/sv.json index 175aca05a0..6f88bb93b6 100644 --- a/src/i18n/strings/sv.json +++ b/src/i18n/strings/sv.json @@ -4,31 +4,31 @@ "Unknown device": "Okänd enhet", "You need to be using HTTPS to place a screen-sharing call.": "Du måste använda HTTPS för att ringa med skärmdelning.", "Welcome to Element": "Välkommen till Element", - "Decentralised, encrypted chat & collaboration powered by [matrix]": "Decentraliserad, krypterad chatt & samarbetsplattform möjliggjort med [matrix]", + "Decentralised, encrypted chat & collaboration powered by [matrix]": "Decentraliserad, krypterad chatt & samarbetsplattform baserad på [matrix]", "Sign In": "Logga in", "Create Account": "Skapa konto", "Explore rooms": "Utforska rum", - "The message from the parser is: %(message)s": "Medelandet från parsern är: %(message)s", + "The message from the parser is: %(message)s": "Meddelandet från parsern är: %(message)s", "Invalid JSON": "Ogiltig JSON", - "Unexpected error preparing the app. See console for details.": "Oväntat fel vid appstart. Se konsollen för mer information.", - "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Ogilitiga inställningar: enbart möjligt att specificera en default_config, default_server, eller default_hs_url.", - "Invalid configuration: no default server specified.": "Ogilitiga inställningar: ingen standardserver specificerad.", + "Unexpected error preparing the app. See console for details.": "Oväntat fel vid appstart. Se konsolen för mer information.", + "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Ogiltiga inställningar: det är enbart möjligt att specificera en default_config, default_server, eller default_hs_url.", + "Invalid configuration: no default server specified.": "Ogiltiga inställningar: ingen standardserver specificerad.", "Open user settings": "Öppna användarinställningar", "Go to your browser to complete Sign In": "Gå till din webbläsare för att slutföra inloggningen", - "Missing indexeddb worker script!": "Saknar indexeddb worker skript!", - "Unable to load config file: please refresh the page to try again.": "Kan inte ladda konfigurationsfilen: var god ladda om sidan för att försöka igen.", - "Previous/next recently visited room or community": "Föregående/nästa nyligen besökt rum eller community", - "%(brand)s Desktop (%(platformName)s)": "%(brand)s Desktop (%(platformName)s)", + "Missing indexeddb worker script!": "Saknar IndexedDB-workerscript!", + "Unable to load config file: please refresh the page to try again.": "Kan inte ladda konfigurationsfilen: ladda om sidan för att försöka igen.", + "Previous/next recently visited room or community": "Föregående/nästa nyligen besökt rum eller gemenskap", + "%(brand)s Desktop (%(platformName)s)": "%(brand)s skrivbord (%(platformName)s)", "%(appName)s (%(browserName)s, %(osName)s)": "%(appName)s (%(browserName)s, %(osName)s)", "Unsupported browser": "Webbläsaren stöds ej", "Please install Chrome, Firefox, or Safari for the best experience.": "Installera Chrome, Firefox, eller Safari för den bästa upplevelsen.", - "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 fortsätta använda din nuvarande webbläsare, men vissa eller alla funktioner kanske inte fungerar och uteseendet samt känslan av applikationen kan var felaktig.", + "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 fortsätta använda din nuvarande webbläsare, men vissa eller alla funktioner kanske inte fungerar och utseendet och känslan av applikationen kan var felaktig.", "I understand the risks and wish to continue": "Jag förstår riskerna och vill fortsätta", "Go to element.io": "Gå till element.io", "Failed to start": "Misslyckade att starta", "Your Element is misconfigured": "Din Element är felkonfigurerad", - "Your Element configuration contains invalid JSON. Please correct the problem and reload the page.": "Din Element konfiguration innehåller ogiltig JSON. Vänligen rätta till problemet och ladda om sidan igen.", - "Download Completed": "Nedladdning Slutförd", + "Your Element configuration contains invalid JSON. Please correct the problem and reload the page.": "Din Elementkonfiguration innehåller ogiltig JSON. Vänligen rätta till problemet och ladda om sidan.", + "Download Completed": "Nedladdning slutförd", "Open": "Öppna", "Powered by Matrix": "Drivs av Matrix", "Your browser can't run %(brand)s": "Din webbläsare kan inte köra %(brand)s", From de4550099e7768e95882da940ef33c8a5e1ee64f Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Wed, 26 Aug 2020 12:08:33 +0100 Subject: [PATCH 059/268] Upgrade matrix-js-sdk to 8.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 364bd9446d..f5cc71b3bc 100644 --- a/package.json +++ b/package.json @@ -59,7 +59,7 @@ "browser-request": "^0.3.3", "gfm.css": "^1.1.2", "highlight.js": "^9.13.1", - "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop", + "matrix-js-sdk": "8.2.0-rc.1", "matrix-react-sdk": "github:matrix-org/matrix-react-sdk#develop", "olm": "https://packages.matrix.org/npm/olm/olm-3.1.4.tgz", "prop-types": "^15.7.2", diff --git a/yarn.lock b/yarn.lock index 4ff565f388..995edbd2c3 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7312,6 +7312,21 @@ mathml-tag-names@^2.1.1: resolved "https://registry.yarnpkg.com/mathml-tag-names/-/mathml-tag-names-2.1.3.tgz#4ddadd67308e780cf16a47685878ee27b736a0a3" integrity sha512-APMBEanjybaPzUrfqU0IMU5I0AswKMH7k8OTLs0vvV4KZpExkTkY87nR/zpbuTPj+gARop7aGUbl11pnDfW6xg== +matrix-js-sdk@8.2.0-rc.1: + version "8.2.0-rc.1" + resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-8.2.0-rc.1.tgz#1870ab25af7062def4b757ca5da04199df269241" + integrity sha512-vZTZOIoYXTFTO+NgBnP+mJMdwNwlIF8GQPeqra+esyoKcas7jVumAwektu3SXhFJPy9vnmufs7zXx4geiNNkpA== + dependencies: + "@babel/runtime" "^7.8.3" + another-json "^0.2.0" + browser-request "^0.3.3" + bs58 "^4.0.1" + content-type "^1.0.2" + loglevel "^1.6.4" + qs "^6.5.2" + request "^2.88.0" + unhomoglyph "^1.0.2" + "matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop": version "8.1.0" resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/64cdd73b93a475d10284977b69ef73138315b3be" From 9163aee0fc8c87048d171e63d96add1cfefa8282 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Wed, 26 Aug 2020 12:10:33 +0100 Subject: [PATCH 060/268] Upgrade matrix-react-sdk to 3.3.0-rc.1 --- package.json | 2 +- yarn.lock | 29 +++++++++++------------------ 2 files changed, 12 insertions(+), 19 deletions(-) diff --git a/package.json b/package.json index f5cc71b3bc..0e1f2d9722 100644 --- a/package.json +++ b/package.json @@ -60,7 +60,7 @@ "gfm.css": "^1.1.2", "highlight.js": "^9.13.1", "matrix-js-sdk": "8.2.0-rc.1", - "matrix-react-sdk": "github:matrix-org/matrix-react-sdk#develop", + "matrix-react-sdk": "3.3.0-rc.1", "olm": "https://packages.matrix.org/npm/olm/olm-3.1.4.tgz", "prop-types": "^15.7.2", "react": "^16.9.0", diff --git a/yarn.lock b/yarn.lock index 995edbd2c3..5cdeb76850 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7327,20 +7327,6 @@ matrix-js-sdk@8.2.0-rc.1: request "^2.88.0" unhomoglyph "^1.0.2" -"matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop": - version "8.1.0" - resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/64cdd73b93a475d10284977b69ef73138315b3be" - dependencies: - "@babel/runtime" "^7.8.3" - another-json "^0.2.0" - browser-request "^0.3.3" - bs58 "^4.0.1" - content-type "^1.0.2" - loglevel "^1.6.4" - qs "^6.5.2" - request "^2.88.0" - unhomoglyph "^1.0.2" - matrix-mock-request@^1.2.3: version "1.2.3" resolved "https://registry.yarnpkg.com/matrix-mock-request/-/matrix-mock-request-1.2.3.tgz#56b15d86e2601a9b48a854844396d18caab649c8" @@ -7349,9 +7335,10 @@ matrix-mock-request@^1.2.3: bluebird "^3.5.0" expect "^1.20.2" -"matrix-react-sdk@github:matrix-org/matrix-react-sdk#develop": - version "3.2.0" - resolved "https://codeload.github.com/matrix-org/matrix-react-sdk/tar.gz/c91fc99d4bfd76808c99327979c1b7dbcb9bf093" +matrix-react-sdk@3.3.0-rc.1: + version "3.3.0-rc.1" + resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.3.0-rc.1.tgz#05211b733cb8a4d66db5aea3dde0caca231bb8ff" + integrity sha512-Lk8R5uWNxLAarc7T4WvKyaH/3G579inJxr742df803F84mUcvUTzho5rsoK6W51WBOGKtTx3Qat3B2Iz0X47YQ== dependencies: "@babel/runtime" "^7.10.5" await-lock "^2.0.1" @@ -7379,7 +7366,7 @@ matrix-mock-request@^1.2.3: is-ip "^2.0.0" linkifyjs "^2.1.9" lodash "^4.17.19" - matrix-js-sdk "github:matrix-org/matrix-js-sdk#develop" + matrix-js-sdk "8.2.0-rc.1" minimist "^1.2.5" pako "^1.0.11" parse5 "^5.1.1" @@ -7396,6 +7383,7 @@ matrix-mock-request@^1.2.3: react-transition-group "^4.4.1" resize-observer-polyfill "^1.5.1" sanitize-html "^1.27.1" + tar-js "^0.3.0" text-encoding-utf-8 "^1.0.2" url "^0.11.0" velocity-animate "^1.5.2" @@ -11365,6 +11353,11 @@ tapable@^1.0.0, tapable@^1.1.3: resolved "https://registry.yarnpkg.com/tapable/-/tapable-1.1.3.tgz#a1fccc06b58db61fd7a45da2da44f5f3a3e67ba2" integrity sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA== +tar-js@^0.3.0: + version "0.3.0" + resolved "https://registry.yarnpkg.com/tar-js/-/tar-js-0.3.0.tgz#6949aabfb0ba18bb1562ae51a439fd0f30183a17" + integrity sha1-aUmqv7C6GLsVYq5RpDn9DzAYOhc= + tar@^4: version "4.4.13" resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.13.tgz#43b364bc52888d555298637b10d60790254ab525" From 172514f278fd60424d35704fcbaa928bb137bd15 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Wed, 26 Aug 2020 12:14:53 +0100 Subject: [PATCH 061/268] Prepare changelog for v1.7.5-rc.1 --- CHANGELOG.md | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index c7ddf3956e..3a507a95b5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,35 @@ +Changes in [1.7.5-rc.1](https://github.com/vector-im/element-web/releases/tag/v1.7.5-rc.1) (2020-08-26) +======================================================================================================= +[Full Changelog](https://github.com/vector-im/element-web/compare/v1.7.4...v1.7.5-rc.1) + + * Upgrade to React SDK 3.3.0-rc.1 and JS SDK 8.2.0-rc.1 + * Update from Weblate + [\#15045](https://github.com/vector-im/element-web/pull/15045) + * Document .well-known E2EE secure backup setting + [\#15003](https://github.com/vector-im/element-web/pull/15003) + * Add docs for communities v2 prototyping feature flag + [\#15013](https://github.com/vector-im/element-web/pull/15013) + * Update links in README.md to point to Element + [\#14973](https://github.com/vector-im/element-web/pull/14973) + * Make kabyle translation available + [\#15027](https://github.com/vector-im/element-web/pull/15027) + * Change Riot to Element in readme + [\#15016](https://github.com/vector-im/element-web/pull/15016) + * Update links to element in the readme + [\#15014](https://github.com/vector-im/element-web/pull/15014) + * Link to Element in F-Droid as well + [\#15002](https://github.com/vector-im/element-web/pull/15002) + * Settings v3: Update documentation and configs for new feature flag behaviour + [\#14986](https://github.com/vector-im/element-web/pull/14986) + * Update jitsi.md with Element Android details + [\#14952](https://github.com/vector-im/element-web/pull/14952) + * TypeScript: enable es2019 lib for newer definitions + [\#14983](https://github.com/vector-im/element-web/pull/14983) + * Add reaction preview labs flags to develop + [\#14979](https://github.com/vector-im/element-web/pull/14979) + * Document new labs tweaks + [\#14958](https://github.com/vector-im/element-web/pull/14958) + Changes in [1.7.4](https://github.com/vector-im/element-web/releases/tag/v1.7.4) (2020-08-17) ============================================================================================= [Full Changelog](https://github.com/vector-im/element-web/compare/v1.7.4-rc.1...v1.7.4) From 669a5e6d01443d4017ecf4dcddf58792392babc5 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Wed, 26 Aug 2020 12:14:54 +0100 Subject: [PATCH 062/268] v1.7.5-rc.1 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 0e1f2d9722..6a86767b16 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "riot-web", "productName": "Riot", - "version": "1.7.4", + "version": "1.7.5-rc.1", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "repository": { From bc1cad01c40f1567bd1af33d21a1c26d782ca423 Mon Sep 17 00:00:00 2001 From: "J. Ryan Stinnett" Date: Wed, 26 Aug 2020 15:57:31 +0100 Subject: [PATCH 063/268] Add testing to review guidelines This adds a initial statement on testing to the review guidelines. No requirements are made at this time, but reviewers are encouraged to request tests where they believe it is reasonable to provide them. Fixes https://github.com/vector-im/element-web/issues/14945 --- docs/review.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/review.md b/docs/review.md index 7899f3a5f1..cf3af42b53 100644 --- a/docs/review.md +++ b/docs/review.md @@ -14,6 +14,7 @@ When reviewing code, here are some things we look for and also things we avoid: * Performance * Accessibility * Security +* Quality via automated and manual testing * Comments and documentation where needed * Sharing knowledge of different areas among the team * Ensuring it's something we're comfortable maintaining for the long term @@ -34,6 +35,7 @@ When reviewing code, here are some things we look for and also things we avoid: * Reviewers should be explicit about required versus optional changes * Reviews are conversations and the PR author should feel comfortable discussing and pushing back on changes before making them +* Reviewers are encouraged to ask for tests where they believe it is reasonable * Core team should lead by example through their tone and language * Take the time to thank and point out good code changes * Using softer language like "please" and "what do you think?" goes a long way From e6d4f090996e4ed0d80cd5c3c30c216850251d86 Mon Sep 17 00:00:00 2001 From: Lizzy Date: Wed, 26 Aug 2020 13:59:20 +0000 Subject: [PATCH 064/268] Translated using Weblate (Spanish) 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/es/ --- src/i18n/strings/es.json | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/i18n/strings/es.json b/src/i18n/strings/es.json index 0569c90275..17c91a8ae8 100644 --- a/src/i18n/strings/es.json +++ b/src/i18n/strings/es.json @@ -30,6 +30,7 @@ "Your Element configuration contains invalid JSON. Please correct the problem and reload the page.": "Su configuración de Element contiene JSON inválido. Por favor corríjalo e inténtelo de nuevo.", "Download Completed": "Descarga completada", "Open": "Abrir", - "Your browser can't run %(brand)s": "Su navegador es compatible con %(brand)s", - "%(brand)s uses advanced browser features which aren't supported by your current browser.": "%(brand)s utiliza funciones avanzadas no soportadas por su navegador." + "Your browser can't run %(brand)s": "Su navegador es incompatible con %(brand)s", + "%(brand)s uses advanced browser features which aren't supported by your current browser.": "%(brand)s utiliza funciones avanzadas no soportadas por su navegador.", + "Powered by Matrix": "Powered by Matrix" } From 5be2df1fb238d40c34462ee912a160f25fc1db22 Mon Sep 17 00:00:00 2001 From: Jarshvor Date: Wed, 26 Aug 2020 14:55:42 +0000 Subject: [PATCH 065/268] Translated using Weblate (Spanish) 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/es/ --- src/i18n/strings/es.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/i18n/strings/es.json b/src/i18n/strings/es.json index 17c91a8ae8..37f3c6031c 100644 --- a/src/i18n/strings/es.json +++ b/src/i18n/strings/es.json @@ -31,6 +31,6 @@ "Download Completed": "Descarga completada", "Open": "Abrir", "Your browser can't run %(brand)s": "Su navegador es incompatible con %(brand)s", - "%(brand)s uses advanced browser features which aren't supported by your current browser.": "%(brand)s utiliza funciones avanzadas no soportadas por su navegador.", + "%(brand)s uses advanced browser features which aren't supported by your current browser.": "%(brand)s usa funciones avanzadas que su navegador actual no soporta.", "Powered by Matrix": "Powered by Matrix" } From 4ad02dc202e833e310f58dc2b28d8c658401bf6b Mon Sep 17 00:00:00 2001 From: pebles Date: Wed, 26 Aug 2020 14:55:59 +0000 Subject: [PATCH 066/268] Translated using Weblate (Spanish) 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/es/ --- src/i18n/strings/es.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/i18n/strings/es.json b/src/i18n/strings/es.json index 37f3c6031c..bf1fdf0cff 100644 --- a/src/i18n/strings/es.json +++ b/src/i18n/strings/es.json @@ -4,7 +4,7 @@ "powered by Matrix": "con el poder de Matrix", "You need to be using HTTPS to place a screen-sharing call.": "Debes usar HTTPS para hacer una llamada con pantalla compartida.", "Welcome to Element": "Bienvenido a Element", - "Decentralised, encrypted chat & collaboration powered by [matrix]": "Conversaciones cifradas y descentralizadas y colaboración con el poder de [matrix]", + "Decentralised, encrypted chat & collaboration powered by [matrix]": "Conversaciones cifradas y descentralizadas & colaboración impulsada por [matrix]", "Sign In": "Iniciar sesión", "Create Account": "Crear cuenta", "Explore rooms": "Explorar salas", From cbe0cd12afff30ee0853a0240cba325469f8b44d Mon Sep 17 00:00:00 2001 From: Lizzy Date: Wed, 26 Aug 2020 15:03:09 +0000 Subject: [PATCH 067/268] Translated using Weblate (Spanish) 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/es/ --- src/i18n/strings/es.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/i18n/strings/es.json b/src/i18n/strings/es.json index bf1fdf0cff..b06013affd 100644 --- a/src/i18n/strings/es.json +++ b/src/i18n/strings/es.json @@ -4,7 +4,7 @@ "powered by Matrix": "con el poder de Matrix", "You need to be using HTTPS to place a screen-sharing call.": "Debes usar HTTPS para hacer una llamada con pantalla compartida.", "Welcome to Element": "Bienvenido a Element", - "Decentralised, encrypted chat & collaboration powered by [matrix]": "Conversaciones cifradas y descentralizadas & colaboración impulsada por [matrix]", + "Decentralised, encrypted chat & collaboration powered by [matrix]": "Conversaciones cifradas y descentralizadas & colaboración impulsada por [matrix]", "Sign In": "Iniciar sesión", "Create Account": "Crear cuenta", "Explore rooms": "Explorar salas", From 23622db74b3b13a99905ade513cfffe1d8adf7b8 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Fri, 28 Aug 2020 19:41:19 +0100 Subject: [PATCH 068/268] Fix eslint ts override tsx matching --- .eslintrc.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.eslintrc.js b/.eslintrc.js index 5391fa179c..4009da4a18 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -8,7 +8,7 @@ module.exports = { "quotes": "off", }, "overrides": [{ - "files": ["src/**/*.{ts, tsx}"], + "files": ["src/**/*.{ts,tsx}"], "extends": ["matrix-org/ts", "matrix-org/react"], "env": { "browser": true, From ae8595690d7c46c1e72ff66859d8009ed8aec2cd Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Sat, 29 Aug 2020 01:14:51 +0100 Subject: [PATCH 069/268] delint --- .../structures/CompatibilityView.tsx | 21 +++++++++++++------ src/vector/init.tsx | 2 ++ src/vector/platform/ElectronPlatform.tsx | 6 +++--- 3 files changed, 20 insertions(+), 9 deletions(-) diff --git a/src/async-components/structures/CompatibilityView.tsx b/src/async-components/structures/CompatibilityView.tsx index 974d8c1b80..05a09c6b89 100644 --- a/src/async-components/structures/CompatibilityView.tsx +++ b/src/async-components/structures/CompatibilityView.tsx @@ -78,17 +78,26 @@ const CompatibilityView: React.FC = ({ onAccept }) => { diff --git a/src/vector/init.tsx b/src/vector/init.tsx index 043ae0ba32..139e67a3bf 100644 --- a/src/vector/init.tsx +++ b/src/vector/init.tsx @@ -17,6 +17,7 @@ See the License for the specific language governing permissions and limitations under the License. */ +// eslint-disable-next-line @typescript-eslint/ban-ts-comment // @ts-ignore import olmWasmPath from "olm/olm.wasm"; import Olm from 'olm'; @@ -127,6 +128,7 @@ export async function loadSkin() { import( /* webpackChunkName: "riot-web-component-index" */ /* webpackPreload: true */ + // eslint-disable-next-line @typescript-eslint/ban-ts-comment // @ts-ignore - this module is generated so may fail lint "../component-index"), ]); diff --git a/src/vector/platform/ElectronPlatform.tsx b/src/vector/platform/ElectronPlatform.tsx index 7932c6433d..1ce7eefde3 100644 --- a/src/vector/platform/ElectronPlatform.tsx +++ b/src/vector/platform/ElectronPlatform.tsx @@ -27,7 +27,7 @@ import BaseEventIndexManager, { MatrixEvent, MatrixProfile, SearchArgs, - SearchResult + SearchResult, } from 'matrix-react-sdk/src/indexing/BaseEventIndexManager'; import dis from 'matrix-react-sdk/src/dispatcher/dispatcher'; import {_t, _td} from 'matrix-react-sdk/src/languageHandler'; @@ -99,7 +99,7 @@ interface IPCPayload { class SeshatIndexManager extends BaseEventIndexManager { private pendingIpcCalls: Record = {}; - private nextIpcCallId: number = 0; + private nextIpcCallId = 0; constructor() { super(); @@ -216,7 +216,7 @@ class SeshatIndexManager extends BaseEventIndexManager { export default class ElectronPlatform extends VectorBasePlatform { private eventIndexManager: BaseEventIndexManager = new SeshatIndexManager(); private pendingIpcCalls: Record = {}; - private nextIpcCallId: number = 0; + private nextIpcCallId = 0; // this is the opaque token we pass to the HS which when we get it in our callback we can resolve to a profile private ssoID: string = randomString(32); From c71b8d61c40f5dcf7f3b2843151fa3d21bad9c70 Mon Sep 17 00:00:00 2001 From: Boo Teille Date: Mon, 31 Aug 2020 12:39:27 +0000 Subject: [PATCH 070/268] Translated using Weblate (French) 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/fr/ --- src/i18n/strings/fr.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json index 2d7e0fb52c..dd7784b685 100644 --- a/src/i18n/strings/fr.json +++ b/src/i18n/strings/fr.json @@ -31,5 +31,6 @@ "Your Element is misconfigured": "Votre Element est mal configuré", "Your Element configuration contains invalid JSON. Please correct the problem and reload the page.": "La configuration de votre Element contient du JSON invalide. Veuillez corriger le problème et recharger la page.", "Your browser can't run %(brand)s": "Votre navigateur ne peut pas exécuter %(brand)s", - "%(brand)s uses advanced browser features which aren't supported by your current browser.": "%(brand)s nécessite des fonctionnalités avancées que votre navigateur actuel ne supporte pas." + "%(brand)s uses advanced browser features which aren't supported by your current browser.": "%(brand)s nécessite des fonctionnalités avancées que votre navigateur actuel ne supporte pas.", + "Powered by Matrix": "Propulsé par Matrix" } From a09ab52be3b2cf08b6026b9e17cb1fd02ead7b0a Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Tue, 1 Sep 2020 17:40:19 +0100 Subject: [PATCH 071/268] Upgrade matrix-js-sdk to 8.2.0 --- package.json | 2 +- yarn.lock | 15 +++++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index 6a86767b16..5f24641a77 100644 --- a/package.json +++ b/package.json @@ -59,7 +59,7 @@ "browser-request": "^0.3.3", "gfm.css": "^1.1.2", "highlight.js": "^9.13.1", - "matrix-js-sdk": "8.2.0-rc.1", + "matrix-js-sdk": "8.2.0", "matrix-react-sdk": "3.3.0-rc.1", "olm": "https://packages.matrix.org/npm/olm/olm-3.1.4.tgz", "prop-types": "^15.7.2", diff --git a/yarn.lock b/yarn.lock index 5cdeb76850..64fefec1f6 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7312,6 +7312,21 @@ mathml-tag-names@^2.1.1: resolved "https://registry.yarnpkg.com/mathml-tag-names/-/mathml-tag-names-2.1.3.tgz#4ddadd67308e780cf16a47685878ee27b736a0a3" integrity sha512-APMBEanjybaPzUrfqU0IMU5I0AswKMH7k8OTLs0vvV4KZpExkTkY87nR/zpbuTPj+gARop7aGUbl11pnDfW6xg== +matrix-js-sdk@8.2.0: + version "8.2.0" + resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-8.2.0.tgz#6fbdadcdc563e41671d407d772a4d52ec8adc480" + integrity sha512-yKF/H1Matgf4b7bfa/gOPNcgMEujogC1r89Au8ZYKfv3dmNdJupE9ktdGJ28QVeKIyF5Ew1stLI4MdGWT1gYPw== + dependencies: + "@babel/runtime" "^7.8.3" + another-json "^0.2.0" + browser-request "^0.3.3" + bs58 "^4.0.1" + content-type "^1.0.2" + loglevel "^1.6.4" + qs "^6.5.2" + request "^2.88.0" + unhomoglyph "^1.0.2" + matrix-js-sdk@8.2.0-rc.1: version "8.2.0-rc.1" resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-8.2.0-rc.1.tgz#1870ab25af7062def4b757ca5da04199df269241" From a20b9c4c24611b3877e93bb91200a0241e0078db Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Tue, 1 Sep 2020 17:41:33 +0100 Subject: [PATCH 072/268] Upgrade matrix-react-sdk to 3.3.0 --- package.json | 2 +- yarn.lock | 25 +++++-------------------- 2 files changed, 6 insertions(+), 21 deletions(-) diff --git a/package.json b/package.json index 5f24641a77..74db6ed64c 100644 --- a/package.json +++ b/package.json @@ -60,7 +60,7 @@ "gfm.css": "^1.1.2", "highlight.js": "^9.13.1", "matrix-js-sdk": "8.2.0", - "matrix-react-sdk": "3.3.0-rc.1", + "matrix-react-sdk": "3.3.0", "olm": "https://packages.matrix.org/npm/olm/olm-3.1.4.tgz", "prop-types": "^15.7.2", "react": "^16.9.0", diff --git a/yarn.lock b/yarn.lock index 64fefec1f6..95fc188681 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7327,21 +7327,6 @@ matrix-js-sdk@8.2.0: request "^2.88.0" unhomoglyph "^1.0.2" -matrix-js-sdk@8.2.0-rc.1: - version "8.2.0-rc.1" - resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-8.2.0-rc.1.tgz#1870ab25af7062def4b757ca5da04199df269241" - integrity sha512-vZTZOIoYXTFTO+NgBnP+mJMdwNwlIF8GQPeqra+esyoKcas7jVumAwektu3SXhFJPy9vnmufs7zXx4geiNNkpA== - dependencies: - "@babel/runtime" "^7.8.3" - another-json "^0.2.0" - browser-request "^0.3.3" - bs58 "^4.0.1" - content-type "^1.0.2" - loglevel "^1.6.4" - qs "^6.5.2" - request "^2.88.0" - unhomoglyph "^1.0.2" - matrix-mock-request@^1.2.3: version "1.2.3" resolved "https://registry.yarnpkg.com/matrix-mock-request/-/matrix-mock-request-1.2.3.tgz#56b15d86e2601a9b48a854844396d18caab649c8" @@ -7350,10 +7335,10 @@ matrix-mock-request@^1.2.3: bluebird "^3.5.0" expect "^1.20.2" -matrix-react-sdk@3.3.0-rc.1: - version "3.3.0-rc.1" - resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.3.0-rc.1.tgz#05211b733cb8a4d66db5aea3dde0caca231bb8ff" - integrity sha512-Lk8R5uWNxLAarc7T4WvKyaH/3G579inJxr742df803F84mUcvUTzho5rsoK6W51WBOGKtTx3Qat3B2Iz0X47YQ== +matrix-react-sdk@3.3.0: + version "3.3.0" + resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.3.0.tgz#42749f59151a1fbd8be81d917b7f2dfc406a4ad5" + integrity sha512-042QFASwbYYX69TQTzzSnRyaD4NXiME/Unn+GmUfWJBnGieuNaYb7ZFxVdUuPpks2UfHJF6xswsr1LpKWi92IQ== dependencies: "@babel/runtime" "^7.10.5" await-lock "^2.0.1" @@ -7381,7 +7366,7 @@ matrix-react-sdk@3.3.0-rc.1: is-ip "^2.0.0" linkifyjs "^2.1.9" lodash "^4.17.19" - matrix-js-sdk "8.2.0-rc.1" + matrix-js-sdk "8.2.0" minimist "^1.2.5" pako "^1.0.11" parse5 "^5.1.1" From 9104a07324d6d359540827ccc1c0454e07d8c612 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Tue, 1 Sep 2020 17:46:12 +0100 Subject: [PATCH 073/268] Prepare changelog for v1.7.5 --- CHANGELOG.md | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3a507a95b5..d21f06095b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,17 @@ +Changes in [1.7.5](https://github.com/vector-im/element-web/releases/tag/v1.7.5) (2020-09-01) +============================================================================================= +[Full Changelog](https://github.com/vector-im/element-web/compare/v1.7.5-rc.1...v1.7.5) + +## Security notice + +Element Web 1.7.5 fixes an issue where encrypted state events could break incoming call handling. +Thanks to @awesome-michael from Awesome Technologies for responsibly disclosing this via Matrix's +Security Disclosure Policy. + +## All changes + + * Upgrade to React SDK 3.3.0 and JS SDK 8.2.0 + Changes in [1.7.5-rc.1](https://github.com/vector-im/element-web/releases/tag/v1.7.5-rc.1) (2020-08-26) ======================================================================================================= [Full Changelog](https://github.com/vector-im/element-web/compare/v1.7.4...v1.7.5-rc.1) From a89661de44096fb78f9385a1147d64026fb783af Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Tue, 1 Sep 2020 17:46:13 +0100 Subject: [PATCH 074/268] v1.7.5 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 74db6ed64c..02e86be012 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "riot-web", "productName": "Riot", - "version": "1.7.5-rc.1", + "version": "1.7.5", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "repository": { From 3ed750a9ab1c5d542c95db72795faf352f3e9bf4 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Tue, 1 Sep 2020 17:50:49 +0100 Subject: [PATCH 075/268] 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 02e86be012..610d94c137 100644 --- a/package.json +++ b/package.json @@ -59,7 +59,7 @@ "browser-request": "^0.3.3", "gfm.css": "^1.1.2", "highlight.js": "^9.13.1", - "matrix-js-sdk": "8.2.0", + "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop", "matrix-react-sdk": "3.3.0", "olm": "https://packages.matrix.org/npm/olm/olm-3.1.4.tgz", "prop-types": "^15.7.2", diff --git a/yarn.lock b/yarn.lock index 95fc188681..57e020a215 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7327,6 +7327,20 @@ matrix-js-sdk@8.2.0: request "^2.88.0" unhomoglyph "^1.0.2" +"matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop": + version "8.2.0" + resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/c6992e2056901502af19e40ba0d1103c4c1f61ed" + dependencies: + "@babel/runtime" "^7.8.3" + another-json "^0.2.0" + browser-request "^0.3.3" + bs58 "^4.0.1" + content-type "^1.0.2" + loglevel "^1.6.4" + qs "^6.5.2" + request "^2.88.0" + unhomoglyph "^1.0.2" + matrix-mock-request@^1.2.3: version "1.2.3" resolved "https://registry.yarnpkg.com/matrix-mock-request/-/matrix-mock-request-1.2.3.tgz#56b15d86e2601a9b48a854844396d18caab649c8" From e5a4092adc211b27b3f9e801ff32b1bfe70e9108 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Tue, 1 Sep 2020 17:51:03 +0100 Subject: [PATCH 076/268] 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 610d94c137..d6d7140a09 100644 --- a/package.json +++ b/package.json @@ -60,7 +60,7 @@ "gfm.css": "^1.1.2", "highlight.js": "^9.13.1", "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop", - "matrix-react-sdk": "3.3.0", + "matrix-react-sdk": "github:matrix-org/matrix-react-sdk#develop", "olm": "https://packages.matrix.org/npm/olm/olm-3.1.4.tgz", "prop-types": "^15.7.2", "react": "^16.9.0", diff --git a/yarn.lock b/yarn.lock index 57e020a215..9b1342e5e6 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7312,21 +7312,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.2.0: - version "8.2.0" - resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-8.2.0.tgz#6fbdadcdc563e41671d407d772a4d52ec8adc480" - integrity sha512-yKF/H1Matgf4b7bfa/gOPNcgMEujogC1r89Au8ZYKfv3dmNdJupE9ktdGJ28QVeKIyF5Ew1stLI4MdGWT1gYPw== - dependencies: - "@babel/runtime" "^7.8.3" - another-json "^0.2.0" - browser-request "^0.3.3" - bs58 "^4.0.1" - content-type "^1.0.2" - loglevel "^1.6.4" - qs "^6.5.2" - request "^2.88.0" - unhomoglyph "^1.0.2" - "matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop": version "8.2.0" resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/c6992e2056901502af19e40ba0d1103c4c1f61ed" @@ -7349,10 +7334,9 @@ matrix-mock-request@^1.2.3: bluebird "^3.5.0" expect "^1.20.2" -matrix-react-sdk@3.3.0: +"matrix-react-sdk@github:matrix-org/matrix-react-sdk#develop": version "3.3.0" - resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.3.0.tgz#42749f59151a1fbd8be81d917b7f2dfc406a4ad5" - integrity sha512-042QFASwbYYX69TQTzzSnRyaD4NXiME/Unn+GmUfWJBnGieuNaYb7ZFxVdUuPpks2UfHJF6xswsr1LpKWi92IQ== + resolved "https://codeload.github.com/matrix-org/matrix-react-sdk/tar.gz/0d290c9bd2604343610e1fc3b17bbdb941ad2ad6" dependencies: "@babel/runtime" "^7.10.5" await-lock "^2.0.1" @@ -7380,7 +7364,7 @@ matrix-react-sdk@3.3.0: is-ip "^2.0.0" linkifyjs "^2.1.9" lodash "^4.17.19" - matrix-js-sdk "8.2.0" + matrix-js-sdk "github:matrix-org/matrix-js-sdk#develop" minimist "^1.2.5" pako "^1.0.11" parse5 "^5.1.1" From e608c9250696456346a4dc4baa71395211b892d3 Mon Sep 17 00:00:00 2001 From: "@a2sc:matrix.org" Date: Tue, 1 Sep 2020 12:52:21 +0000 Subject: [PATCH 077/268] Translated using Weblate (German) 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/de/ --- src/i18n/strings/de_DE.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json index 9629e85441..0688ac1d37 100644 --- a/src/i18n/strings/de_DE.json +++ b/src/i18n/strings/de_DE.json @@ -15,7 +15,7 @@ "Invalid JSON": "Ungültiges JSON", "Go to your browser to complete Sign In": "Gehe zu deinem Browser, um die Anmeldung abzuschließen", "Open user settings": "Öffne Nutzer-Einstellungen", - "Unable to load config file: please refresh the page to try again.": "Konfigurationsdatei kann nicht geladen werden: Bitte aktualisieren Sie die Seite, um es erneut zu versuchen.", + "Unable to load config file: please refresh the page to try again.": "Konfigurationsdatei kann nicht geladen werden: Bitte aktualisiere die Seite, um es erneut zu versuchen.", "Missing indexeddb worker script!": "Fehlendes indexeddb Worker-Skript!", "Previous/next recently visited room or community": "Vorheriger/nächster kürzlich besuchter Raum oder Community", "Unsupported browser": "Nicht unterstützter Browser", From 5108697ac88c0819519e34d9895c3f6343fb3671 Mon Sep 17 00:00:00 2001 From: Jason Robinson Date: Fri, 4 Sep 2020 13:14:52 +0300 Subject: [PATCH 078/268] Add support for Jitsi openidtoken-jwt auth If the widget URL specifies this auth, generate a JWT token containing the info needed by the Jitsi backend. --- package.json | 1 + src/vector/jitsi/index.ts | 53 +++++++++++++++++++++++++++++++++++++-- yarn.lock | 5 ++++ 3 files changed, 57 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index d6d7140a09..0a151e0e28 100644 --- a/package.json +++ b/package.json @@ -59,6 +59,7 @@ "browser-request": "^0.3.3", "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-react-sdk": "github:matrix-org/matrix-react-sdk#develop", "olm": "https://packages.matrix.org/npm/olm/olm-3.1.4.tgz", diff --git a/src/vector/jitsi/index.ts b/src/vector/jitsi/index.ts index 081246c0a9..47d6e24f73 100644 --- a/src/vector/jitsi/index.ts +++ b/src/vector/jitsi/index.ts @@ -19,6 +19,7 @@ require("./index.scss"); import * as qs from 'querystring'; import { Capability, WidgetApi } from "matrix-react-sdk/src/widgets/WidgetApi"; +import { KJUR } from "jsrsasign"; // Dev note: we use raw JS without many dependencies to reduce bundle size. // We do not need all of React to render a Jitsi conference. @@ -33,6 +34,8 @@ let conferenceId: string; let displayName: string; let avatarUrl: string; let userId: string; +let jitsiAuth: string; +let roomId: string; let widgetApi: WidgetApi; @@ -69,6 +72,8 @@ let widgetApi: WidgetApi; displayName = qsParam('displayName', true); avatarUrl = qsParam('avatarUrl', true); // http not mxc userId = qsParam('userId'); + jitsiAuth = qsParam('auth', true); + roomId = qsParam('roomId', true); if (widgetApi) { await widgetApi.waitReady(); @@ -91,6 +96,45 @@ function switchVisibleContainers() { document.getElementById("joinButtonContainer").style.visibility = inConference ? 'hidden' : 'unset'; } +/** + * Create a JWT token fot jitsi openidtoken-jwt auth + * + * See TODO add link + */ +function createJWTToken() { + // Header + const header = {alg: 'HS256', typ: 'JWT'}; + // Payload + const payload = { + // TODO change this to refer to spec? + iss: "app_id", + sub: jitsiDomain, + aud: `https://${jitsiDomain}`, + room: "*", + context: { + matrix: { + // TODO openid token retrieved as per MSC1960 + token: "foobar", + room_id: roomId, + }, + user: { + avatar: avatarUrl, + name: displayName, + }, + }, + }; + // Sign JWT + // The secret string here is irrelevant, we're only using the JWT + // to transport data to Prosody in the Jitsi stack. + // See TODO add link + return KJUR.jws.JWS.sign( + "HS256", + JSON.stringify(header), + JSON.stringify(payload), + "notused", + ); +} + function joinConference() { // event handler bound in HTML switchVisibleContainers(); @@ -102,7 +146,7 @@ function joinConference() { // event handler bound in HTML "they mention 'external_api' or 'jitsi' in the stack. They're just Jitsi Meet trying to parse " + "our fragment values and not recognizing the options.", ); - const meetApi = new JitsiMeetExternalAPI(jitsiDomain, { + const options = { width: "100%", height: "100%", parentNode: document.querySelector("#jitsiContainer"), @@ -113,7 +157,12 @@ function joinConference() { // event handler bound in HTML MAIN_TOOLBAR_BUTTONS: [], VIDEO_LAYOUT_FIT: "height", }, - }); + jwt: undefined, + }; + if (jitsiAuth === "openidtoken-jwt") { + options.jwt = createJWTToken(); + } + const meetApi = new JitsiMeetExternalAPI(jitsiDomain, options); if (displayName) meetApi.executeCommand("displayName", displayName); if (avatarUrl) meetApi.executeCommand("avatarUrl", avatarUrl); if (userId) meetApi.executeCommand("email", userId); diff --git a/yarn.lock b/yarn.lock index 9b1342e5e6..441250b72c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6914,6 +6914,11 @@ jsprim@^1.2.2: json-schema "0.2.3" verror "1.10.0" +jsrsasign@^9.1.5: + version "9.1.5" + resolved "https://registry.yarnpkg.com/jsrsasign/-/jsrsasign-9.1.5.tgz#fe286425d2c05b2d0865d24ded53e34b12abd2ca" + integrity sha512-iJLF8FvZHlwyQudrRtQomHj1HdPAcM8QSRTt0FJo8a6iFgaGCpKUrE7lWyELpAjrFs8jUC/Azc0vfhlj3yqHPQ== + jsx-ast-utils@^2.2.3: version "2.3.0" resolved "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-2.3.0.tgz#edd727794ea284d7fda575015ed1b0cde0289ab6" From 69745bbd40069439b6765aff0e2219ac6566e455 Mon Sep 17 00:00:00 2001 From: Travis Ralston Date: Fri, 4 Sep 2020 21:55:50 -0600 Subject: [PATCH 079/268] Switch to using the Widget API SDK for Jitsi widgets --- src/vector/jitsi/index.ts | 27 +++++++++++++++++++-------- 1 file changed, 19 insertions(+), 8 deletions(-) diff --git a/src/vector/jitsi/index.ts b/src/vector/jitsi/index.ts index 081246c0a9..3ebbc7d3b4 100644 --- a/src/vector/jitsi/index.ts +++ b/src/vector/jitsi/index.ts @@ -18,7 +18,12 @@ limitations under the License. require("./index.scss"); import * as qs from 'querystring'; -import { Capability, WidgetApi } from "matrix-react-sdk/src/widgets/WidgetApi"; +import { + IWidgetApiRequest, + IWidgetApiRequestEmptyData, + VideoConferenceCapabilities, + WidgetApi +} from "matrix-widget-api"; // Dev note: we use raw JS without many dependencies to reduce bundle size. // We do not need all of React to render a Jitsi conference. @@ -56,11 +61,19 @@ let widgetApi: WidgetApi; const widgetId = qsParam('widgetId', true); // Set this up as early as possible because Element will be hitting it almost immediately. + let readyPromise: Promise<[void, void]>; if (parentUrl && widgetId) { - widgetApi = new WidgetApi(qsParam('parentUrl'), qsParam('widgetId'), [ - Capability.AlwaysOnScreen, + const parentOrigin = new URL(qsParam('parentUrl')).origin; + widgetApi = new WidgetApi(qsParam("widgetId"), parentOrigin); + widgetApi.requestCapabilities(VideoConferenceCapabilities); + readyPromise = Promise.all([ + widgetApi.waitFor>("im.vector.ready") + .then(ev => widgetApi.transport.reply(ev.detail, {})), + widgetApi.waitFor("ready"), ]); - widgetApi.expectingExplicitReady = true; + widgetApi.start(); + } else { + throw new Error("No parent URL or no widget ID"); } // Populate the Jitsi params now @@ -70,10 +83,8 @@ let widgetApi: WidgetApi; avatarUrl = qsParam('avatarUrl', true); // http not mxc userId = qsParam('userId'); - if (widgetApi) { - await widgetApi.waitReady(); - await widgetApi.setAlwaysOnScreen(false); // start off as detachable from the screen - } + await readyPromise; + await widgetApi.setAlwaysOnScreen(false); // start off as detachable from the screen // TODO: register widgetApi listeners for PTT controls (https://github.com/vector-im/riot-web/issues/12795) From 2fa8b0f8b2bfe616f6348ef88166a5e3c08e169a Mon Sep 17 00:00:00 2001 From: Travis Ralston Date: Fri, 4 Sep 2020 22:02:18 -0600 Subject: [PATCH 080/268] Make the types happy --- 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 3ebbc7d3b4..f31bf46baa 100644 --- a/src/vector/jitsi/index.ts +++ b/src/vector/jitsi/index.ts @@ -69,7 +69,7 @@ let widgetApi: WidgetApi; readyPromise = Promise.all([ widgetApi.waitFor>("im.vector.ready") .then(ev => widgetApi.transport.reply(ev.detail, {})), - widgetApi.waitFor("ready"), + widgetApi.waitFor("ready").then(), ]); widgetApi.start(); } else { From 8534328921f7e1d0324587b7e825adfe48b33d69 Mon Sep 17 00:00:00 2001 From: Jason Robinson Date: Mon, 7 Sep 2020 18:10:19 +0300 Subject: [PATCH 081/268] Implement OpenID token fetch from Jitsi widget Using MSC1960 to fetch an OpenID token via postmessage API. This is needed for Jitsi openidtoken-jwt auth. --- src/vector/jitsi/index.ts | 85 +++++++++++++++++++++++++++++++++------ 1 file changed, 73 insertions(+), 12 deletions(-) diff --git a/src/vector/jitsi/index.ts b/src/vector/jitsi/index.ts index 47d6e24f73..48a0cd020c 100644 --- a/src/vector/jitsi/index.ts +++ b/src/vector/jitsi/index.ts @@ -18,8 +18,9 @@ limitations under the License. require("./index.scss"); import * as qs from 'querystring'; -import { Capability, WidgetApi } from "matrix-react-sdk/src/widgets/WidgetApi"; -import { KJUR } from "jsrsasign"; +import {Capability, KnownWidgetActions, WidgetApi} from 'matrix-react-sdk/src/widgets/WidgetApi'; +import {KJUR} from 'jsrsasign'; +import {objectClone} from 'matrix-react-sdk/lib/utils/objects'; // Dev note: we use raw JS without many dependencies to reduce bundle size. // We do not need all of React to render a Jitsi conference. @@ -36,9 +37,54 @@ let avatarUrl: string; let userId: string; let jitsiAuth: string; let roomId: string; +let openIDToken: string; let widgetApi: WidgetApi; +function processOpenIDMessage(msg) { + const data = (msg.action === 'get_openid') ? msg.response : msg.data; + // TODO: just use data.state once https://github.com/matrix-org/matrix-react-sdk/pull/5172 is out + const result = (data.state !== undefined) ? data.state : + (data.success === true) ? 'allowed' : 'blocked'; + + switch (result) { + case 'allowed': + console.info('Successfully got OpenID credentials.'); + openIDToken = data.access_token; + // Send a response if this was not a response + if (msg.action === 'openid_credentials') { + const request = objectClone(msg); + request.response = {}; + window.parent.postMessage(request, '*'); + } + enableJoinButton(); + break; + case 'blocked': + console.warn('OpenID credentials request was blocked by user.'); + break; + default: + // nothing to do + } +} + +/** + * Implements processing OpenID token requests as per MSC1960 + */ +function onWidgetMessage(msg) { + const data = msg.data; + if (!data) { + return; + } + switch (data.action) { + case 'get_openid': + case 'openid_credentials': + processOpenIDMessage(data); + break; + default: + // Nothing to do + } +} + (async function() { try { // The widget's options are encoded into the fragment to avoid leaking info to the server. The widget @@ -78,11 +124,21 @@ let widgetApi: WidgetApi; if (widgetApi) { await widgetApi.waitReady(); await widgetApi.setAlwaysOnScreen(false); // start off as detachable from the screen + + if (jitsiAuth === 'openidtoken-jwt') { + window.addEventListener('message', onWidgetMessage); + widgetApi.callAction( + KnownWidgetActions.GetOpenIDCredentials, + {}, + (response) => {console.log(response);}, + ); + } else { + enableJoinButton(); + } + // TODO: register widgetApi listeners for PTT controls (https://github.com/vector-im/riot-web/issues/12795) + } else { + enableJoinButton(); } - - // TODO: register widgetApi listeners for PTT controls (https://github.com/vector-im/riot-web/issues/12795) - - document.getElementById("joinButton").onclick = () => joinConference(); } catch (e) { console.error("Error setting up Jitsi widget", e); document.getElementById("jitsiContainer").innerText = "Failed to load Jitsi widget"; @@ -90,6 +146,11 @@ let widgetApi: WidgetApi; } })(); + +function enableJoinButton() { + document.getElementById("joinButton").onclick = () => joinConference(); +} + function switchVisibleContainers() { inConference = !inConference; document.getElementById("jitsiContainer").style.visibility = inConference ? 'unset' : 'hidden'; @@ -107,14 +168,13 @@ function createJWTToken() { // Payload const payload = { // TODO change this to refer to spec? - iss: "app_id", + iss: 'app_id', sub: jitsiDomain, aud: `https://${jitsiDomain}`, room: "*", context: { matrix: { - // TODO openid token retrieved as per MSC1960 - token: "foobar", + token: openIDToken, room_id: roomId, }, user: { @@ -128,10 +188,10 @@ function createJWTToken() { // to transport data to Prosody in the Jitsi stack. // See TODO add link return KJUR.jws.JWS.sign( - "HS256", + 'HS256', JSON.stringify(header), JSON.stringify(payload), - "notused", + 'notused', ); } @@ -159,7 +219,7 @@ function joinConference() { // event handler bound in HTML }, jwt: undefined, }; - if (jitsiAuth === "openidtoken-jwt") { + if (jitsiAuth === 'penidtoken-jwt') { options.jwt = createJWTToken(); } const meetApi = new JitsiMeetExternalAPI(jitsiDomain, options); @@ -168,6 +228,7 @@ function joinConference() { // event handler bound in HTML if (userId) meetApi.executeCommand("email", userId); meetApi.on("readyToClose", () => { + window.removeEventListener('message', onWidgetMessage); switchVisibleContainers(); // noinspection JSIgnoredPromiseFromCall From 0410a6b3be82a41457275e4d1ce879dea146e092 Mon Sep 17 00:00:00 2001 From: Jason Robinson Date: Mon, 7 Sep 2020 19:23:36 +0300 Subject: [PATCH 082/268] Use Jitsi domain in the JWT issuer --- src/vector/jitsi/index.ts | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/vector/jitsi/index.ts b/src/vector/jitsi/index.ts index 48a0cd020c..73c561bccf 100644 --- a/src/vector/jitsi/index.ts +++ b/src/vector/jitsi/index.ts @@ -167,8 +167,10 @@ function createJWTToken() { const header = {alg: 'HS256', typ: 'JWT'}; // Payload const payload = { - // TODO change this to refer to spec? - iss: 'app_id', + // As per Jitsi token auth, `iss` needs to be set to something agreed between + // JWT generating side and Prosody config. Since we have no configuration for + // the widgets, we can't set one anywhere. Using the Jitsi domain here probably makes sense. + iss: jitsiDomain, sub: jitsiDomain, aud: `https://${jitsiDomain}`, room: "*", From 2205f0611eb539cd46016898b5fec4e5438d6067 Mon Sep 17 00:00:00 2001 From: Jason Robinson Date: Mon, 7 Sep 2020 19:25:44 +0300 Subject: [PATCH 083/268] Add some links to the openidtoken-jwt spec --- src/vector/jitsi/index.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/vector/jitsi/index.ts b/src/vector/jitsi/index.ts index 73c561bccf..3fe0aa3011 100644 --- a/src/vector/jitsi/index.ts +++ b/src/vector/jitsi/index.ts @@ -125,6 +125,7 @@ function onWidgetMessage(msg) { await widgetApi.waitReady(); await widgetApi.setAlwaysOnScreen(false); // start off as detachable from the screen + // See https://github.com/matrix-org/prosody-mod-auth-matrix-user-verification if (jitsiAuth === 'openidtoken-jwt') { window.addEventListener('message', onWidgetMessage); widgetApi.callAction( @@ -160,7 +161,7 @@ function switchVisibleContainers() { /** * Create a JWT token fot jitsi openidtoken-jwt auth * - * See TODO add link + * See https://github.com/matrix-org/prosody-mod-auth-matrix-user-verification */ function createJWTToken() { // Header From 4164df647ca99bd57cb74f8268d5f49cb7f4babe Mon Sep 17 00:00:00 2001 From: Jason Robinson Date: Mon, 7 Sep 2020 19:51:16 +0300 Subject: [PATCH 084/268] Improve error messsage of Jitsi widget If openidtoken request fails, show an error. Also render error a bit nicer in generic widget load errors. --- src/vector/jitsi/index.html | 4 +++- src/vector/jitsi/index.ts | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/vector/jitsi/index.html b/src/vector/jitsi/index.html index b9fc950e15..1259eb1c4a 100644 --- a/src/vector/jitsi/index.html +++ b/src/vector/jitsi/index.html @@ -11,7 +11,9 @@

Jitsi Video Conference

- +
+ +
diff --git a/src/vector/jitsi/index.ts b/src/vector/jitsi/index.ts index 3fe0aa3011..ba24451feb 100644 --- a/src/vector/jitsi/index.ts +++ b/src/vector/jitsi/index.ts @@ -61,6 +61,7 @@ function processOpenIDMessage(msg) { break; case 'blocked': console.warn('OpenID credentials request was blocked by user.'); + document.getElementById("widgetActionContainer").innerText = "Failed to load Jitsi widget"; break; default: // nothing to do @@ -142,8 +143,7 @@ function onWidgetMessage(msg) { } } catch (e) { console.error("Error setting up Jitsi widget", e); - document.getElementById("jitsiContainer").innerText = "Failed to load Jitsi widget"; - switchVisibleContainers(); + document.getElementById("widgetActionContainer").innerText = "Failed to load Jitsi widget"; } })(); From acfd7252bdeb1f5083679fcac269ed2af4be5bb4 Mon Sep 17 00:00:00 2001 From: Jason Robinson Date: Mon, 7 Sep 2020 20:26:05 +0300 Subject: [PATCH 085/268] Remove todo --- src/vector/jitsi/index.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/src/vector/jitsi/index.ts b/src/vector/jitsi/index.ts index ba24451feb..785d4c3c61 100644 --- a/src/vector/jitsi/index.ts +++ b/src/vector/jitsi/index.ts @@ -189,7 +189,6 @@ function createJWTToken() { // Sign JWT // The secret string here is irrelevant, we're only using the JWT // to transport data to Prosody in the Jitsi stack. - // See TODO add link return KJUR.jws.JWS.sign( 'HS256', JSON.stringify(header), From 3b434a70d21daa59bf41ef446d304a7248a0ecb9 Mon Sep 17 00:00:00 2001 From: Jason Robinson Date: Mon, 7 Sep 2020 20:36:26 +0300 Subject: [PATCH 086/268] Fix typo --- 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 785d4c3c61..e3cafa8221 100644 --- a/src/vector/jitsi/index.ts +++ b/src/vector/jitsi/index.ts @@ -221,7 +221,7 @@ function joinConference() { // event handler bound in HTML }, jwt: undefined, }; - if (jitsiAuth === 'penidtoken-jwt') { + if (jitsiAuth === 'openidtoken-jwt') { options.jwt = createJWTToken(); } const meetApi = new JitsiMeetExternalAPI(jitsiDomain, options); From 21c862fe2b5e9ccbf5cacd51e59a0b7b66e4d197 Mon Sep 17 00:00:00 2001 From: Jason Robinson Date: Mon, 7 Sep 2020 20:47:07 +0300 Subject: [PATCH 087/268] Remove console.log --- 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 e3cafa8221..84a858c094 100644 --- a/src/vector/jitsi/index.ts +++ b/src/vector/jitsi/index.ts @@ -132,7 +132,7 @@ function onWidgetMessage(msg) { widgetApi.callAction( KnownWidgetActions.GetOpenIDCredentials, {}, - (response) => {console.log(response);}, + () => {}, ); } else { enableJoinButton(); From 151dd5709cff0cba373e8f31e702a03bac56ee67 Mon Sep 17 00:00:00 2001 From: Jason Robinson Date: Tue, 8 Sep 2020 11:32:09 +0300 Subject: [PATCH 088/268] Fix import Co-authored-by: Travis Ralston --- 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 84a858c094..fa9e7759fb 100644 --- a/src/vector/jitsi/index.ts +++ b/src/vector/jitsi/index.ts @@ -20,7 +20,7 @@ require("./index.scss"); import * as qs from 'querystring'; import {Capability, KnownWidgetActions, WidgetApi} from 'matrix-react-sdk/src/widgets/WidgetApi'; import {KJUR} from 'jsrsasign'; -import {objectClone} from 'matrix-react-sdk/lib/utils/objects'; +import {objectClone} from 'matrix-react-sdk/src/utils/objects'; // Dev note: we use raw JS without many dependencies to reduce bundle size. // We do not need all of React to render a Jitsi conference. From 3309b2ec552bc463e7a7197ce7c44bc8b6aec0b9 Mon Sep 17 00:00:00 2001 From: Jason Robinson Date: Tue, 8 Sep 2020 11:37:50 +0300 Subject: [PATCH 089/268] Block on matrix-org/matrix-react-sdk#5172 And shuffle code around a bit. --- src/vector/jitsi/index.ts | 86 +++++++++++++++++++-------------------- 1 file changed, 41 insertions(+), 45 deletions(-) diff --git a/src/vector/jitsi/index.ts b/src/vector/jitsi/index.ts index fa9e7759fb..8392e1e530 100644 --- a/src/vector/jitsi/index.ts +++ b/src/vector/jitsi/index.ts @@ -41,51 +41,6 @@ let openIDToken: string; let widgetApi: WidgetApi; -function processOpenIDMessage(msg) { - const data = (msg.action === 'get_openid') ? msg.response : msg.data; - // TODO: just use data.state once https://github.com/matrix-org/matrix-react-sdk/pull/5172 is out - const result = (data.state !== undefined) ? data.state : - (data.success === true) ? 'allowed' : 'blocked'; - - switch (result) { - case 'allowed': - console.info('Successfully got OpenID credentials.'); - openIDToken = data.access_token; - // Send a response if this was not a response - if (msg.action === 'openid_credentials') { - const request = objectClone(msg); - request.response = {}; - window.parent.postMessage(request, '*'); - } - enableJoinButton(); - break; - case 'blocked': - console.warn('OpenID credentials request was blocked by user.'); - document.getElementById("widgetActionContainer").innerText = "Failed to load Jitsi widget"; - break; - default: - // nothing to do - } -} - -/** - * Implements processing OpenID token requests as per MSC1960 - */ -function onWidgetMessage(msg) { - const data = msg.data; - if (!data) { - return; - } - switch (data.action) { - case 'get_openid': - case 'openid_credentials': - processOpenIDMessage(data); - break; - default: - // Nothing to do - } -} - (async function() { try { // The widget's options are encoded into the fragment to avoid leaking info to the server. The widget @@ -147,6 +102,47 @@ function onWidgetMessage(msg) { } })(); +function processOpenIDMessage(msg) { + const data = (msg.action === 'get_openid') ? msg.response : msg.data; + + switch (data.state) { + case 'allowed': + console.info('Successfully got OpenID credentials.'); + openIDToken = data.access_token; + // Send a response if this was not a response + if (msg.action === 'openid_credentials') { + const request = objectClone(msg); + request.response = {}; + window.parent.postMessage(request, '*'); + } + enableJoinButton(); + break; + case 'blocked': + console.warn('OpenID credentials request was blocked by user.'); + document.getElementById("widgetActionContainer").innerText = "Failed to load Jitsi widget"; + break; + default: + // nothing to do + } +} + +/** + * Implements processing OpenID token requests as per MSC1960 + */ +function onWidgetMessage(msg) { + const data = msg.data; + if (!data) { + return; + } + switch (data.action) { + case 'get_openid': + case 'openid_credentials': + processOpenIDMessage(data); + break; + default: + // Nothing to do + } +} function enableJoinButton() { document.getElementById("joinButton").onclick = () => joinConference(); From a7abd8599e56eb63c1bbec0bae1721115eb05a1c Mon Sep 17 00:00:00 2001 From: Jason Robinson Date: Tue, 8 Sep 2020 11:44:11 +0300 Subject: [PATCH 090/268] More usage of constants --- src/vector/jitsi/index.ts | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/src/vector/jitsi/index.ts b/src/vector/jitsi/index.ts index 8392e1e530..a80a07c471 100644 --- a/src/vector/jitsi/index.ts +++ b/src/vector/jitsi/index.ts @@ -22,6 +22,8 @@ import {Capability, KnownWidgetActions, WidgetApi} from 'matrix-react-sdk/src/wi import {KJUR} from 'jsrsasign'; import {objectClone} from 'matrix-react-sdk/src/utils/objects'; +const JITSI_OPENIDTOKEN_JWT_AUTH = 'openidtoken-jwt'; + // Dev note: we use raw JS without many dependencies to reduce bundle size. // We do not need all of React to render a Jitsi conference. @@ -82,7 +84,7 @@ let widgetApi: WidgetApi; await widgetApi.setAlwaysOnScreen(false); // start off as detachable from the screen // See https://github.com/matrix-org/prosody-mod-auth-matrix-user-verification - if (jitsiAuth === 'openidtoken-jwt') { + if (jitsiAuth === JITSI_OPENIDTOKEN_JWT_AUTH) { window.addEventListener('message', onWidgetMessage); widgetApi.callAction( KnownWidgetActions.GetOpenIDCredentials, @@ -103,14 +105,14 @@ let widgetApi: WidgetApi; })(); function processOpenIDMessage(msg) { - const data = (msg.action === 'get_openid') ? msg.response : msg.data; + const data = (msg.action === KnownWidgetActions.GetOpenIDCredentials) ? msg.response : msg.data; switch (data.state) { case 'allowed': console.info('Successfully got OpenID credentials.'); openIDToken = data.access_token; - // Send a response if this was not a response - if (msg.action === 'openid_credentials') { + // Send a response if this was not a response to GetOpenIDCredentials + if (msg.action === KnownWidgetActions.ReceiveOpenIDCredentials) { const request = objectClone(msg); request.response = {}; window.parent.postMessage(request, '*'); @@ -135,8 +137,8 @@ function onWidgetMessage(msg) { return; } switch (data.action) { - case 'get_openid': - case 'openid_credentials': + case KnownWidgetActions.GetOpenIDCredentials: + case KnownWidgetActions.ReceiveOpenIDCredentials: processOpenIDMessage(data); break; default: @@ -217,7 +219,7 @@ function joinConference() { // event handler bound in HTML }, jwt: undefined, }; - if (jitsiAuth === 'openidtoken-jwt') { + if (jitsiAuth === JITSI_OPENIDTOKEN_JWT_AUTH) { options.jwt = createJWTToken(); } const meetApi = new JitsiMeetExternalAPI(jitsiDomain, options); From 579650a1dd61d466d0125cc621ccf00724823c29 Mon Sep 17 00:00:00 2001 From: Jason Robinson Date: Tue, 8 Sep 2020 12:50:53 +0300 Subject: [PATCH 091/268] Move most of the OpenID token flow to WidgetAPI --- src/vector/jitsi/index.ts | 77 +++++++++++++-------------------------- 1 file changed, 25 insertions(+), 52 deletions(-) diff --git a/src/vector/jitsi/index.ts b/src/vector/jitsi/index.ts index a80a07c471..0f94f04db0 100644 --- a/src/vector/jitsi/index.ts +++ b/src/vector/jitsi/index.ts @@ -18,9 +18,8 @@ limitations under the License. require("./index.scss"); import * as qs from 'querystring'; -import {Capability, KnownWidgetActions, WidgetApi} from 'matrix-react-sdk/src/widgets/WidgetApi'; +import {Capability, WidgetApi} from 'matrix-react-sdk/src/widgets/WidgetApi'; import {KJUR} from 'jsrsasign'; -import {objectClone} from 'matrix-react-sdk/src/utils/objects'; const JITSI_OPENIDTOKEN_JWT_AUTH = 'openidtoken-jwt'; @@ -39,7 +38,6 @@ let avatarUrl: string; let userId: string; let jitsiAuth: string; let roomId: string; -let openIDToken: string; let widgetApi: WidgetApi; @@ -85,12 +83,8 @@ let widgetApi: WidgetApi; // See https://github.com/matrix-org/prosody-mod-auth-matrix-user-verification if (jitsiAuth === JITSI_OPENIDTOKEN_JWT_AUTH) { - window.addEventListener('message', onWidgetMessage); - widgetApi.callAction( - KnownWidgetActions.GetOpenIDCredentials, - {}, - () => {}, - ); + // Request credentials, give callback to continue when received + widgetApi.requestOpenIDCredentials(credentialsResponseCallback); } else { enableJoinButton(); } @@ -104,45 +98,16 @@ let widgetApi: WidgetApi; } })(); -function processOpenIDMessage(msg) { - const data = (msg.action === KnownWidgetActions.GetOpenIDCredentials) ? msg.response : msg.data; - - switch (data.state) { - case 'allowed': - console.info('Successfully got OpenID credentials.'); - openIDToken = data.access_token; - // Send a response if this was not a response to GetOpenIDCredentials - if (msg.action === KnownWidgetActions.ReceiveOpenIDCredentials) { - const request = objectClone(msg); - request.response = {}; - window.parent.postMessage(request, '*'); - } - enableJoinButton(); - break; - case 'blocked': - console.warn('OpenID credentials request was blocked by user.'); - document.getElementById("widgetActionContainer").innerText = "Failed to load Jitsi widget"; - break; - default: - // nothing to do - } -} - /** - * Implements processing OpenID token requests as per MSC1960 + * Enable or show error depending on what the credentials response is. */ -function onWidgetMessage(msg) { - const data = msg.data; - if (!data) { - return; - } - switch (data.action) { - case KnownWidgetActions.GetOpenIDCredentials: - case KnownWidgetActions.ReceiveOpenIDCredentials: - processOpenIDMessage(data); - break; - default: - // Nothing to do +function credentialsResponseCallback() { + if (widgetApi.openIDCredentials) { + console.info('Successfully got OpenID credentials.'); + enableJoinButton(); + } else { + console.warn('OpenID credentials request was blocked by user.'); + document.getElementById("widgetActionContainer").innerText = "Failed to load Jitsi widget"; } } @@ -175,7 +140,7 @@ function createJWTToken() { room: "*", context: { matrix: { - token: openIDToken, + token: widgetApi.openIDCredentials.accessToken, room_id: roomId, }, user: { @@ -196,6 +161,17 @@ function createJWTToken() { } function joinConference() { // event handler bound in HTML + let jwt; + if (jitsiAuth === JITSI_OPENIDTOKEN_JWT_AUTH) { + if (!widgetApi.openIDCredentials || !widgetApi.openIDCredentials.accessToken) { + // We've failing to get a token, don't try to init conference + console.warn('Expected to have an OpenID credential, cannot initialize widget.'); + document.getElementById("widgetActionContainer").innerText = "Failed to load Jitsi widget"; + return; + } + jwt = createJWTToken(); + } + switchVisibleContainers(); // noinspection JSIgnoredPromiseFromCall @@ -217,18 +193,15 @@ function joinConference() { // event handler bound in HTML MAIN_TOOLBAR_BUTTONS: [], VIDEO_LAYOUT_FIT: "height", }, - jwt: undefined, + jwt: jwt, }; - if (jitsiAuth === JITSI_OPENIDTOKEN_JWT_AUTH) { - options.jwt = createJWTToken(); - } + const meetApi = new JitsiMeetExternalAPI(jitsiDomain, options); if (displayName) meetApi.executeCommand("displayName", displayName); if (avatarUrl) meetApi.executeCommand("avatarUrl", avatarUrl); if (userId) meetApi.executeCommand("email", userId); meetApi.on("readyToClose", () => { - window.removeEventListener('message', onWidgetMessage); switchVisibleContainers(); // noinspection JSIgnoredPromiseFromCall From 7018a498a70931fc01e5835fc63d08640f264f72 Mon Sep 17 00:00:00 2001 From: Jason Robinson Date: Tue, 8 Sep 2020 12:52:17 +0300 Subject: [PATCH 092/268] Quieten some IDE warnings --- src/vector/jitsi/index.ts | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/src/vector/jitsi/index.ts b/src/vector/jitsi/index.ts index 0f94f04db0..6e697fee2f 100644 --- a/src/vector/jitsi/index.ts +++ b/src/vector/jitsi/index.ts @@ -174,8 +174,11 @@ function joinConference() { // event handler bound in HTML switchVisibleContainers(); - // noinspection JSIgnoredPromiseFromCall - if (widgetApi) widgetApi.setAlwaysOnScreen(true); // ignored promise because we don't care if it works + if (widgetApi) { + // ignored promise because we don't care if it works + // noinspection JSIgnoredPromiseFromCall + widgetApi.setAlwaysOnScreen(true); + } console.warn( "[Jitsi Widget] The next few errors about failing to parse URL parameters are fine if " + @@ -204,8 +207,11 @@ function joinConference() { // event handler bound in HTML meetApi.on("readyToClose", () => { switchVisibleContainers(); - // noinspection JSIgnoredPromiseFromCall - if (widgetApi) widgetApi.setAlwaysOnScreen(false); // ignored promise because we don't care if it works + if (widgetApi) { + // ignored promise because we don't care if it works + // noinspection JSIgnoredPromiseFromCall + widgetApi.setAlwaysOnScreen(false); + } document.getElementById("jitsiContainer").innerHTML = ""; }); From bbfbef7f24de70f34b329973792fddb2d7741a37 Mon Sep 17 00:00:00 2001 From: riverside6 Date: Tue, 8 Sep 2020 19:00:56 +0000 Subject: [PATCH 093/268] Translated using Weblate (German) 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/de/ --- src/i18n/strings/de_DE.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json index 0688ac1d37..1007742d6b 100644 --- a/src/i18n/strings/de_DE.json +++ b/src/i18n/strings/de_DE.json @@ -32,5 +32,5 @@ "Open": "Öffnen", "%(brand)s uses advanced browser features which aren't supported by your current browser.": "%(brand)s verwendet erweiterte Browserfunktionen, die von Ihrem aktuellen Browser nicht unterstützt werden.", "Your browser can't run %(brand)s": "Dein Browser kann %(brand)s nicht ausführen", - "Powered by Matrix": "Betrieben von Matrix" + "Powered by Matrix": "Betrieben mit Matrix" } From 5a5be814b620f2da8d540a4ed3dbf1cde5001a6c Mon Sep 17 00:00:00 2001 From: TERMICO Date: Tue, 8 Sep 2020 14:29:25 +0000 Subject: [PATCH 094/268] Translated using Weblate (Spanish) 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/es/ --- src/i18n/strings/es.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/i18n/strings/es.json b/src/i18n/strings/es.json index b06013affd..f48ad2c15f 100644 --- a/src/i18n/strings/es.json +++ b/src/i18n/strings/es.json @@ -15,10 +15,10 @@ "Invalid JSON": "JSON inválido", "Open user settings": "Abrir opciones de usuario", "Go to your browser to complete Sign In": "Abre tu navegador web para completar el registro", - "Missing indexeddb worker script!": "¡Worker script “indexeddb” faltante!", + "Missing indexeddb worker script!": "Falta el script de trabajo indexeddb!", "Unable to load config file: please refresh the page to try again.": "No se ha podido cargar el archivo de configuración. Recarga la página para intentar nuevamente.", "Previous/next recently visited room or community": "Anterior/siguiente sala o comunidad visitada recientemente", - "%(brand)s Desktop (%(platformName)s)": "%(brand)s Desktop (%(platformName)s)", + "%(brand)s Desktop (%(platformName)s)": "%(brand)s Escritorio (%(platformName)s)", "%(appName)s (%(browserName)s, %(osName)s)": "%(appName)s (%(browserName)s, %(osName)s)", "Unsupported browser": "Navegador no soportado", "Please install Chrome, Firefox, or Safari for the best experience.": "Por favor, instale Chrome, Firefox, o Safari para la mejor experiencia.", @@ -26,11 +26,11 @@ "I understand the risks and wish to continue": "Entiendo los riesgos y deseo continuar", "Go to element.io": "Ir a element.io", "Failed to start": "Fallo al iniciar", - "Your Element is misconfigured": "Su Element está mal configurado", + "Your Element is misconfigured": "Tu elemento está mal configurado", "Your Element configuration contains invalid JSON. Please correct the problem and reload the page.": "Su configuración de Element contiene JSON inválido. Por favor corríjalo e inténtelo de nuevo.", "Download Completed": "Descarga completada", "Open": "Abrir", "Your browser can't run %(brand)s": "Su navegador es incompatible con %(brand)s", "%(brand)s uses advanced browser features which aren't supported by your current browser.": "%(brand)s usa funciones avanzadas que su navegador actual no soporta.", - "Powered by Matrix": "Powered by Matrix" + "Powered by Matrix": "Desarrollado por Matrix" } From fcdda7a95670f5f7565f34949ecf0729fa246235 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Wed, 9 Sep 2020 15:56:42 +0100 Subject: [PATCH 095/268] Upgrade matrix-js-sdk to 8.3.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 0a151e0e28..126ffa95bd 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": "8.3.0-rc.1", "matrix-react-sdk": "github:matrix-org/matrix-react-sdk#develop", "olm": "https://packages.matrix.org/npm/olm/olm-3.1.4.tgz", "prop-types": "^15.7.2", diff --git a/yarn.lock b/yarn.lock index 441250b72c..fea0fb02b4 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7317,6 +7317,21 @@ mathml-tag-names@^2.1.1: resolved "https://registry.yarnpkg.com/mathml-tag-names/-/mathml-tag-names-2.1.3.tgz#4ddadd67308e780cf16a47685878ee27b736a0a3" integrity sha512-APMBEanjybaPzUrfqU0IMU5I0AswKMH7k8OTLs0vvV4KZpExkTkY87nR/zpbuTPj+gARop7aGUbl11pnDfW6xg== +matrix-js-sdk@8.3.0-rc.1: + version "8.3.0-rc.1" + resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-8.3.0-rc.1.tgz#19546de4bb9476e52e1e2761db54a9f138510f49" + integrity sha512-TnnaM2qsCNzZpNbzuduCDbIWchO9rrKhOjVHcbbbNBlpPUukEeoQo0FYw6MUjy7MSjyH1GIstAmRFlg0vbu0Qw== + dependencies: + "@babel/runtime" "^7.8.3" + another-json "^0.2.0" + browser-request "^0.3.3" + bs58 "^4.0.1" + content-type "^1.0.2" + loglevel "^1.6.4" + qs "^6.5.2" + request "^2.88.0" + unhomoglyph "^1.0.2" + "matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop": version "8.2.0" resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/c6992e2056901502af19e40ba0d1103c4c1f61ed" From 2ad02e4feb2b12940e191982e60d28f5a3429b33 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Wed, 9 Sep 2020 15:56:58 +0100 Subject: [PATCH 096/268] Upgrade matrix-react-sdk to 3.4.0-rc.1 --- package.json | 2 +- yarn.lock | 43 +++++++++++++------------------------------ 2 files changed, 14 insertions(+), 31 deletions(-) diff --git a/package.json b/package.json index 126ffa95bd..7639de1e79 100644 --- a/package.json +++ b/package.json @@ -61,7 +61,7 @@ "highlight.js": "^9.13.1", "jsrsasign": "^9.1.5", "matrix-js-sdk": "8.3.0-rc.1", - "matrix-react-sdk": "github:matrix-org/matrix-react-sdk#develop", + "matrix-react-sdk": "3.4.0-rc.1", "olm": "https://packages.matrix.org/npm/olm/olm-3.1.4.tgz", "prop-types": "^15.7.2", "react": "^16.9.0", diff --git a/yarn.lock b/yarn.lock index fea0fb02b4..598090e696 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3160,15 +3160,6 @@ create-hmac@^1.1.0, create-hmac@^1.1.4, create-hmac@^1.1.7: safe-buffer "^5.0.1" sha.js "^2.4.8" -create-react-class@^15.6.3: - version "15.6.3" - resolved "https://registry.yarnpkg.com/create-react-class/-/create-react-class-15.6.3.tgz#2d73237fb3f970ae6ebe011a9e66f46dbca80036" - integrity sha512-M+/3Q6E6DLO6Yx3OwrWjwHBnvfXXYA7W+dFjt/ZDBemHO1DDZhsalX/NUtnTYclN6GfnBDRh4qRHjcDHmlJBJg== - dependencies: - fbjs "^0.8.9" - loose-envify "^1.3.1" - object-assign "^4.1.1" - cross-spawn@6.0.5, cross-spawn@^6.0.0, cross-spawn@^6.0.5: version "6.0.5" resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz#4a5ec7c64dfae22c3a14124dbacdee846d80cbc4" @@ -4688,7 +4679,7 @@ fbjs@0.1.0-alpha.7: promise "^7.0.3" whatwg-fetch "^0.9.0" -fbjs@^0.8.4, fbjs@^0.8.9: +fbjs@^0.8.4: version "0.8.17" resolved "https://registry.yarnpkg.com/fbjs/-/fbjs-0.8.17.tgz#c4d598ead6949112653d6588b01a5cdcd9f90fdd" integrity sha1-xNWY6taUkRJlPWWIsBpc3Nn5D90= @@ -7191,7 +7182,7 @@ longest-streak@^2.0.1: resolved "https://registry.yarnpkg.com/longest-streak/-/longest-streak-2.0.4.tgz#b8599957da5b5dab64dee3fe316fa774597d90e4" integrity sha512-vM6rUVCVUJJt33bnmHiZEvr7wPT78ztX7rojL+LW51bHtLh6HTjx84LA5W4+oa6aKEJA7jJu5LR6vQRBpA5DVg== -loose-envify@^1.0.0, loose-envify@^1.1.0, loose-envify@^1.3.1, loose-envify@^1.4.0: +loose-envify@^1.0.0, loose-envify@^1.1.0, loose-envify@^1.4.0: version "1.4.0" resolved "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.4.0.tgz#71ee51fa7be4caec1a63839f7e682d8132d30caf" integrity sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q== @@ -7332,20 +7323,6 @@ matrix-js-sdk@8.3.0-rc.1: request "^2.88.0" unhomoglyph "^1.0.2" -"matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop": - version "8.2.0" - resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/c6992e2056901502af19e40ba0d1103c4c1f61ed" - dependencies: - "@babel/runtime" "^7.8.3" - another-json "^0.2.0" - browser-request "^0.3.3" - bs58 "^4.0.1" - content-type "^1.0.2" - loglevel "^1.6.4" - qs "^6.5.2" - request "^2.88.0" - unhomoglyph "^1.0.2" - matrix-mock-request@^1.2.3: version "1.2.3" resolved "https://registry.yarnpkg.com/matrix-mock-request/-/matrix-mock-request-1.2.3.tgz#56b15d86e2601a9b48a854844396d18caab649c8" @@ -7354,9 +7331,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.3.0" - resolved "https://codeload.github.com/matrix-org/matrix-react-sdk/tar.gz/0d290c9bd2604343610e1fc3b17bbdb941ad2ad6" +matrix-react-sdk@3.4.0-rc.1: + version "3.4.0-rc.1" + resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.4.0-rc.1.tgz#e3588eecd97de976d97add7e466892d8ea03fb6c" + integrity sha512-mJsBaQpDmMG61jv2oTzNXX+/35QKhAMRvnehlWH2zwcu/yAZbFFeV72ZdWCGYb8RcN+u8Aw856YebWAFMsdbyw== dependencies: "@babel/runtime" "^7.10.5" await-lock "^2.0.1" @@ -7366,7 +7344,6 @@ matrix-mock-request@^1.2.3: classnames "^2.2.6" commonmark "^0.29.1" counterpart "^0.18.6" - create-react-class "^15.6.3" diff-dom "^4.1.6" diff-match-patch "^1.0.5" emojibase-data "^5.0.1" @@ -7384,7 +7361,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.3.0-rc.1" minimist "^1.2.5" pako "^1.0.11" parse5 "^5.1.1" @@ -7400,6 +7377,7 @@ matrix-mock-request@^1.2.3: react-focus-lock "^2.4.1" react-transition-group "^4.4.1" resize-observer-polyfill "^1.5.1" + rfc4648 "^1.4.0" sanitize-html "^1.27.1" tar-js "^0.3.0" text-encoding-utf-8 "^1.0.2" @@ -10309,6 +10287,11 @@ retry@^0.12.0: resolved "https://registry.yarnpkg.com/retry/-/retry-0.12.0.tgz#1b42a6266a21f07421d1b0b54b7dc167b01c013b" integrity sha1-G0KmJmoh8HQh0bC1S33BZ7AcATs= +rfc4648@^1.4.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/rfc4648/-/rfc4648-1.4.0.tgz#c75b2856ad2e2d588b6ddb985d556f1f7f2a2abd" + integrity sha512-3qIzGhHlMHA6PoT6+cdPKZ+ZqtxkIvg8DZGKA5z6PQ33/uuhoJ+Ws/D/J9rXW6gXodgH8QYlz2UCl+sdUDmNIg== + rgb-regex@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/rgb-regex/-/rgb-regex-1.0.1.tgz#c0e0d6882df0e23be254a475e8edd41915feaeb1" From ff2fe8053761f4fb9156ed357fa82348a175133a Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Wed, 9 Sep 2020 16:00:06 +0100 Subject: [PATCH 097/268] Prepare changelog for v1.7.6-rc.1 --- CHANGELOG.md | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index d21f06095b..0a0c387074 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,17 @@ +Changes in [1.7.6-rc.1](https://github.com/vector-im/element-web/releases/tag/v1.7.6-rc.1) (2020-09-09) +======================================================================================================= +[Full Changelog](https://github.com/vector-im/element-web/compare/v1.7.5...v1.7.6-rc.1) + + * Upgrade to React SDK 3.4.0-rc.1 and JS SDK 8.3.0-rc.1 + * Update from Weblate + [\#15125](https://github.com/vector-im/element-web/pull/15125) + * Support usage of Jitsi widgets with "openidtoken-jwt" auth + [\#15114](https://github.com/vector-im/element-web/pull/15114) + * Fix eslint ts override tsx matching and delint + [\#15064](https://github.com/vector-im/element-web/pull/15064) + * Add testing to review guidelines + [\#15050](https://github.com/vector-im/element-web/pull/15050) + Changes in [1.7.5](https://github.com/vector-im/element-web/releases/tag/v1.7.5) (2020-09-01) ============================================================================================= [Full Changelog](https://github.com/vector-im/element-web/compare/v1.7.5-rc.1...v1.7.5) From cf448f1f0ae6d0f965b2c0bccb0ae193e705490b Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Wed, 9 Sep 2020 16:00:06 +0100 Subject: [PATCH 098/268] v1.7.6-rc.1 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 7639de1e79..071f693bc9 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "riot-web", "productName": "Riot", - "version": "1.7.5", + "version": "1.7.6-rc.1", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "repository": { From ac447fd318d676425ef76130bc297e2d0bbe749b Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Wed, 9 Sep 2020 16:52:48 +0100 Subject: [PATCH 099/268] Fix onNewScreen to use replace when going from roomId->roomAlias to prevent locking the user in place --- src/vector/app.tsx | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/vector/app.tsx b/src/vector/app.tsx index 445a37ba55..bc9a4fdb11 100644 --- a/src/vector/app.tsx +++ b/src/vector/app.tsx @@ -71,11 +71,16 @@ function onHashChange(ev: HashChangeEvent) { // This will be called whenever the SDK changes screens, // so a web page can update the URL bar appropriately. -function onNewScreen(screen: string) { +function onNewScreen(screen: string, replaceLast = false) { console.log("newscreen " + screen); const hash = '#/' + screen; lastLocationHashSet = hash; - window.location.hash = hash; + + if (replaceLast) { + window.location.replace(hash); + } else { + window.location.assign(hash); + } } // We use this to work out what URL the SDK should From 6853cabca2f030960da93d52cbf966d2fa80aad3 Mon Sep 17 00:00:00 2001 From: "J. Ryan Stinnett" Date: Thu, 10 Sep 2020 10:03:13 +0100 Subject: [PATCH 100/268] Enable Estonian in language menu Fixes https://github.com/vector-im/element-web/issues/15135 --- scripts/copy-res.js | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/copy-res.js b/scripts/copy-res.js index 68d131c7c6..ebe1c625ea 100755 --- a/scripts/copy-res.js +++ b/scripts/copy-res.js @@ -21,6 +21,7 @@ const INCLUDE_LANGS = [ {'value': 'en_US', 'label': 'English (US)'}, {'value': 'eo', 'label': 'Esperanto'}, {'value': 'es', 'label': 'Español'}, + {'value': 'et', 'label': 'Eesti'}, {'value': 'eu', 'label': 'Euskara'}, {'value': 'fi', 'label': 'Suomi'}, {'value': 'fr', 'label': 'Français'}, From 7262b372b36687698ae7d6d4dee8034119a71570 Mon Sep 17 00:00:00 2001 From: "J. Ryan Stinnett" Date: Thu, 10 Sep 2020 10:14:43 +0100 Subject: [PATCH 101/268] Remove references to Travis CI Also cleans up a Riot reference as well Part of https://github.com/vector-im/element-web/issues/15098 --- CONTRIBUTING.rst | 6 +++--- scripts/fetch-develop.deps.sh | 6 ------ 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst index f084b474bd..3af9d3945b 100644 --- a/CONTRIBUTING.rst +++ b/CONTRIBUTING.rst @@ -1,4 +1,4 @@ -Contributing code to Riot -========================= +Contributing code to Element +============================ -Riot follows the same pattern as https://github.com/matrix-org/matrix-js-sdk/blob/master/CONTRIBUTING.rst. +Element follows the same pattern as https://github.com/matrix-org/matrix-js-sdk/blob/master/CONTRIBUTING.rst. diff --git a/scripts/fetch-develop.deps.sh b/scripts/fetch-develop.deps.sh index a45159c256..c4001f7dc8 100755 --- a/scripts/fetch-develop.deps.sh +++ b/scripts/fetch-develop.deps.sh @@ -70,7 +70,6 @@ function dodep() { ############################## -echo -en 'travis_fold:start:matrix-js-sdk\r' echo 'Setting up matrix-js-sdk' dodep matrix-org matrix-js-sdk @@ -83,11 +82,8 @@ popd yarn link matrix-js-sdk -echo -en 'travis_fold:end:matrix-js-sdk\r' - ############################## -echo -en 'travis_fold:start:matrix-react-sdk\r' echo 'Setting up matrix-react-sdk' dodep matrix-org matrix-react-sdk @@ -101,8 +97,6 @@ popd yarn link matrix-react-sdk -echo -en 'travis_fold:end:matrix-react-sdk\r' - ############################## # Link the reskindex binary in place: if we used `yarn link`, From d1aed258157eb9d173426c5d54620b90796e6c4e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 11 Sep 2020 11:02:13 +0000 Subject: [PATCH 102/268] Bump node-fetch from 2.6.0 to 2.6.1 Bumps [node-fetch](https://github.com/bitinn/node-fetch) from 2.6.0 to 2.6.1. - [Release notes](https://github.com/bitinn/node-fetch/releases) - [Changelog](https://github.com/node-fetch/node-fetch/blob/master/docs/CHANGELOG.md) - [Commits](https://github.com/bitinn/node-fetch/compare/v2.6.0...v2.6.1) Signed-off-by: dependabot[bot] --- yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yarn.lock b/yarn.lock index 441250b72c..7793b2c5e7 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7838,9 +7838,9 @@ node-fetch@^1.0.1: is-stream "^1.0.1" node-fetch@^2.6.0: - version "2.6.0" - resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.0.tgz#e633456386d4aa55863f676a7ab0daa8fdecb0fd" - integrity sha512-8dG4H5ujfvFiqDmVu9fQ5bOHUC15JMjMY/Zumv26oOvvVJjM67KF8koCWIabKQ1GJIa9r2mMZscBq/TbdOcmNA== + version "2.6.1" + resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.1.tgz#045bd323631f76ed2e2b55573394416b639a0052" + integrity sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw== node-forge@0.9.0: version "0.9.0" From c88ba8e2126662abdf93c3b0fd559fa59ce48d70 Mon Sep 17 00:00:00 2001 From: Salih Emin Date: Wed, 9 Sep 2020 15:21:26 +0000 Subject: [PATCH 103/268] Translated using Weblate (Greek) Currently translated at 51.5% (17 of 33 strings) Translation: Element Web/element-web Translate-URL: https://translate.riot.im/projects/element-web/element-web/el/ --- src/i18n/strings/el.json | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/i18n/strings/el.json b/src/i18n/strings/el.json index b4c9b28192..fd08e4705a 100644 --- a/src/i18n/strings/el.json +++ b/src/i18n/strings/el.json @@ -10,7 +10,11 @@ "The message from the parser is: %(message)s": "Το μήνυμα από τον αναλυτή είναι: %(message)s", "Invalid JSON": "Μη έγκυρο JSON", "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: 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.": "Μη έγκυρη ρύθμιση παραμέτρων: δεν έχει οριστεί προκαθορισμένος διακομιστής.", - "Explore rooms": "Εξερευνήστε δωμάτια" + "Explore rooms": "Εξερευνήστε δωμάτια", + "Open": "Άνοιγμα", + "Go to your browser to complete Sign In": "Επισκεφτείτε τον browser σας για να ολοκληρωθεί η είσοδος", + "Powered by Matrix": "Παρέχεται από το Matrix", + "Please install Chrome, Firefox, or Safari for the best experience.": "Παρακαλούμε εγκαταστήστε Chrome, Firefox, ή Safari για καλύτερη εμπειρία χρήσης." } From 4cd9560d21bc200ead5149769e5b3379c7765d2c Mon Sep 17 00:00:00 2001 From: yuuki-san Date: Thu, 10 Sep 2020 11:39:52 +0000 Subject: [PATCH 104/268] Translated using Weblate (Slovak) 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/sk/ --- src/i18n/strings/sk.json | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/i18n/strings/sk.json b/src/i18n/strings/sk.json index a70dac93af..c6128e6596 100644 --- a/src/i18n/strings/sk.json +++ b/src/i18n/strings/sk.json @@ -29,7 +29,8 @@ "Download Completed": "Preberanie dokončené", "Open": "Otvoriť", "Your Element is misconfigured": "Váš Element je nesprávne nastavený", - "Your Element configuration contains invalid JSON. Please correct the problem and reload the page.": "Vaša konfigurácia Elementu obsahuje nesprávne JSON. Prosím, opravte chybu a obnovte stránku.", + "Your Element configuration contains invalid JSON. Please correct the problem and reload the page.": "Vaša konfigurácia Elementu obsahuje nesprávny údaj JSON. Prosím, opravte chybu a obnovte stránku.", "Your browser can't run %(brand)s": "Váš prehliadač nerozbehne %(brand)s", - "%(brand)s uses advanced browser features which aren't supported by your current browser.": "%(brand)s používa pokročilé funkcie prehliadača, ktoré nie sú podporované vaším aktuálnym prehliadačom." + "%(brand)s uses advanced browser features which aren't supported by your current browser.": "%(brand)s používa pokročilé funkcie prehliadača, ktoré nie sú podporované vaším aktuálnym prehliadačom.", + "Powered by Matrix": "používa protokol Matrix" } From 9f15bc2bbf33452fa3804bf337bf297064b7e665 Mon Sep 17 00:00:00 2001 From: Safa Alfulaij Date: Sat, 12 Sep 2020 10:26:08 +0000 Subject: [PATCH 105/268] Translated using Weblate (Arabic) 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/ar/ --- src/i18n/strings/ar.json | 63 ++++++++++++++++++++-------------------- 1 file changed, 32 insertions(+), 31 deletions(-) diff --git a/src/i18n/strings/ar.json b/src/i18n/strings/ar.json index 09dbc0f425..44758f656e 100644 --- a/src/i18n/strings/ar.json +++ b/src/i18n/strings/ar.json @@ -1,35 +1,36 @@ { - "Dismiss": "تجاهل", + "Dismiss": "أهمِل", "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 للاتصال بمشاركة الشاشة.", "powered by Matrix": "مشغل بواسطة Matrix", - "Welcome to Element": "مرحبا بك في Element", - "Decentralised, encrypted chat & collaboration powered by [matrix]": "دردشة مشفرة غير مركزية &تطبيق تعاوني مدعوم بواسطة [matrix]", - "Create Account": "انشاء حساب", - "Explore rooms": "استكشف غرف المحادثات", - "Sign In": "الدخول", - "Missing indexeddb worker script!": "منفذ السكريبت الخاص ب Indexeddb غير موجود!", - "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.": "اعدادات خاطئة: لم يتم تحديد السيرفر الافتراضي.", - "Your Element is misconfigured": "تطبيقك معد بطريقة خاطئة", - "Your Element configuration contains invalid JSON. Please correct the problem and reload the page.": "اعداداتك تحتوى على بنية JSON غير صحيحة. يرجى تصحيح المشكلة واعادة تحديث الصفحة.", - "The message from the parser is: %(message)s": "الرسالة من المدقق هي:%(message)s", - "Invalid JSON": "JSON خاطئ", - "Unable to load config file: please refresh the page to try again.": "لم نستطع تحميل ملف الاعداد: يرجى تحديث الصفحة للمحاولة مرة اخرى.", - "Unexpected error preparing the app. See console for details.": "حدث خطأ غير متوقع عند تجهيز التطبيق. انظر الى منصة التحكم للمزيد من التفاصيل.", - "Download Completed": "تم اكتمال التحميل", - "Open": "فتح", - "Open user settings": "فتح اعدادات المستخدم", - "Previous/next recently visited room or community": "السابقة/اللاحقة الغرفة او المجتمع الذي تمت زيارته مؤخرا", - "%(brand)s Desktop (%(platformName)s)": "%(brand)s سطح المكتب (%(platformName)s)", - "Go to your browser to complete Sign In": "اذهب الى المتصفح لاكمال تسجيل الدخول", - "%(appName)s (%(browserName)s, %(osName)s)": "%(appName)s (%(browserName)s, %(osName)s)", - "Unsupported browser": "متصفح غير متوافق", - "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 يستخدم مزايا المتصفح المتقدمة والتي لا يدعمها متصفحك الحالي.", - "Please install Chrome, Firefox, or Safari for the best experience.": "يرجى تثبيت Chrome, Firefox, or Safari for the best experience.", - "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": "فشل الاقلاع" + "Welcome to Element": "مرحبًا بك في Element", + "Decentralised, encrypted chat & collaboration powered by [matrix]": "دردشة وتعاون غير مركزي معمّى، تدعمه [matrix]", + "Create Account": "أنشِئ حسابًا", + "Explore rooms": "استكشِف الغرف", + "Sign In": "لِج", + "Missing indexeddb worker script!": "سكربت عامل indexeddb ناقص!", + "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.": "الضبط غير صالح: لم تحدّد خادومًا مبدئيًا.", + "Your Element is misconfigured": "لم يُضبط تطبيق Element كما ينبغي", + "Your Element configuration contains invalid JSON. Please correct the problem and reload the page.": "يحتوي ضبط تطبيق Element على تنسيق JSON غير صالح. من فضلك صحّح المشكلة وأعِد تحميل الصفحة.", + "The message from the parser is: %(message)s": "الرسالة القادمة من المحلّل: %(message)s", + "Invalid JSON": "تنسيق JSON غير صالح", + "Unable to load config file: please refresh the page to try again.": "تعذّر تحميل ملف الضبط: من فضلك أنعِش الصفحة لمعاودة المحاولة.", + "Unexpected error preparing the app. See console for details.": "حدث عُطل غير متوقع أثناء تجهيز التطبيق. طالِع المِعراض للتفاصيل.", + "Download Completed": "اكتمل التنزيل", + "Open": "افتح", + "Open user settings": "افتح إعدادات المستخدم", + "Previous/next recently visited room or community": "الغرفة أو المجتمع التالي/السابق الذي زرته حديثًا", + "%(brand)s Desktop (%(platformName)s)": "‏‏%(brand)s لسطح المكتب (%(platformName)s)", + "Go to your browser to complete Sign In": "افتح المتصفح لإكمال الولوج", + "%(appName)s (%(browserName)s, %(osName)s)": "‏‏%(appName)s (‏‏%(browserName)s، ‏‏%(osName)s)", + "Unsupported browser": "متصفح غير مدعوم", + "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 ميزات متقدمة في المتصفحات لا يدعمها متصفحك الحالي.", + "Please install Chrome, Firefox, or Safari for the best experience.": "من فضلك ثبّت كروم أو فَيَرفُكس أو سفاري لأفضل تجربة.", + "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": "فشل البدء", + "Powered by Matrix": "تدعمه «ماترِكس»" } From c8a0d94b610a79934d7bb668438745f21f0ee8e4 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Mon, 14 Sep 2020 13:42:53 +0100 Subject: [PATCH 106/268] Upgrade matrix-js-sdk to 8.3.0 --- package.json | 2 +- yarn.lock | 15 +++++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index 071f693bc9..24451a7e54 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.3.0-rc.1", + "matrix-js-sdk": "8.3.0", "matrix-react-sdk": "3.4.0-rc.1", "olm": "https://packages.matrix.org/npm/olm/olm-3.1.4.tgz", "prop-types": "^15.7.2", diff --git a/yarn.lock b/yarn.lock index 598090e696..3d9beeb7f7 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7308,6 +7308,21 @@ mathml-tag-names@^2.1.1: resolved "https://registry.yarnpkg.com/mathml-tag-names/-/mathml-tag-names-2.1.3.tgz#4ddadd67308e780cf16a47685878ee27b736a0a3" integrity sha512-APMBEanjybaPzUrfqU0IMU5I0AswKMH7k8OTLs0vvV4KZpExkTkY87nR/zpbuTPj+gARop7aGUbl11pnDfW6xg== +matrix-js-sdk@8.3.0: + version "8.3.0" + resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-8.3.0.tgz#a57a6d071619c24b6e8501ae21fa4d21f6bbd052" + integrity sha512-ndKedUtZt72/4KWjlMevNwNDGfhPTOn/i4U6Iv1ZEfm7uZfbp5u3hVIyr8tyOiVuvMIxmcTajRdwSlRsNtYFkA== + dependencies: + "@babel/runtime" "^7.8.3" + another-json "^0.2.0" + browser-request "^0.3.3" + bs58 "^4.0.1" + content-type "^1.0.2" + loglevel "^1.6.4" + qs "^6.5.2" + request "^2.88.0" + unhomoglyph "^1.0.2" + matrix-js-sdk@8.3.0-rc.1: version "8.3.0-rc.1" resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-8.3.0-rc.1.tgz#19546de4bb9476e52e1e2761db54a9f138510f49" From 6d124e6c28b6167598877984e9d9452bcd694c88 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Mon, 14 Sep 2020 13:44:41 +0100 Subject: [PATCH 107/268] Upgrade matrix-react-sdk to 3.4.0 --- package.json | 2 +- yarn.lock | 25 +++++-------------------- 2 files changed, 6 insertions(+), 21 deletions(-) diff --git a/package.json b/package.json index 24451a7e54..9d9cc40a00 100644 --- a/package.json +++ b/package.json @@ -61,7 +61,7 @@ "highlight.js": "^9.13.1", "jsrsasign": "^9.1.5", "matrix-js-sdk": "8.3.0", - "matrix-react-sdk": "3.4.0-rc.1", + "matrix-react-sdk": "3.4.0", "olm": "https://packages.matrix.org/npm/olm/olm-3.1.4.tgz", "prop-types": "^15.7.2", "react": "^16.9.0", diff --git a/yarn.lock b/yarn.lock index 3d9beeb7f7..40f5475cab 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7323,21 +7323,6 @@ matrix-js-sdk@8.3.0: request "^2.88.0" unhomoglyph "^1.0.2" -matrix-js-sdk@8.3.0-rc.1: - version "8.3.0-rc.1" - resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-8.3.0-rc.1.tgz#19546de4bb9476e52e1e2761db54a9f138510f49" - integrity sha512-TnnaM2qsCNzZpNbzuduCDbIWchO9rrKhOjVHcbbbNBlpPUukEeoQo0FYw6MUjy7MSjyH1GIstAmRFlg0vbu0Qw== - dependencies: - "@babel/runtime" "^7.8.3" - another-json "^0.2.0" - browser-request "^0.3.3" - bs58 "^4.0.1" - content-type "^1.0.2" - loglevel "^1.6.4" - qs "^6.5.2" - request "^2.88.0" - unhomoglyph "^1.0.2" - matrix-mock-request@^1.2.3: version "1.2.3" resolved "https://registry.yarnpkg.com/matrix-mock-request/-/matrix-mock-request-1.2.3.tgz#56b15d86e2601a9b48a854844396d18caab649c8" @@ -7346,10 +7331,10 @@ matrix-mock-request@^1.2.3: bluebird "^3.5.0" expect "^1.20.2" -matrix-react-sdk@3.4.0-rc.1: - version "3.4.0-rc.1" - resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.4.0-rc.1.tgz#e3588eecd97de976d97add7e466892d8ea03fb6c" - integrity sha512-mJsBaQpDmMG61jv2oTzNXX+/35QKhAMRvnehlWH2zwcu/yAZbFFeV72ZdWCGYb8RcN+u8Aw856YebWAFMsdbyw== +matrix-react-sdk@3.4.0: + version "3.4.0" + resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.4.0.tgz#418cd8f0f6c2e884189272e5813136a2ab90ce4c" + integrity sha512-rSKRxo1NmgXKEsGUfU2vmAqQvvKbRHd8hcY6WVh/5YydiGuXdKf7w8cdpzv8LMU+Le9QUf+3hWOdZ8p++gOymA== dependencies: "@babel/runtime" "^7.10.5" await-lock "^2.0.1" @@ -7376,7 +7361,7 @@ matrix-react-sdk@3.4.0-rc.1: is-ip "^2.0.0" linkifyjs "^2.1.9" lodash "^4.17.19" - matrix-js-sdk "8.3.0-rc.1" + matrix-js-sdk "8.3.0" minimist "^1.2.5" pako "^1.0.11" parse5 "^5.1.1" From 9ed26c66a69d0301859c929424eceb47dc3e6479 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Mon, 14 Sep 2020 13:46:13 +0100 Subject: [PATCH 108/268] Prepare changelog for v1.7.6 --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0a0c387074..5fd0f36657 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +Changes in [1.7.6](https://github.com/vector-im/element-web/releases/tag/v1.7.6) (2020-09-14) +============================================================================================= +[Full Changelog](https://github.com/vector-im/element-web/compare/v1.7.6-rc.1...v1.7.6) + + * Upgrade to React SDK 3.4.0 and JS SDK 8.3.0 + Changes in [1.7.6-rc.1](https://github.com/vector-im/element-web/releases/tag/v1.7.6-rc.1) (2020-09-09) ======================================================================================================= [Full Changelog](https://github.com/vector-im/element-web/compare/v1.7.5...v1.7.6-rc.1) From 70febe3109023c4088ce3ad42ec28bd84bea7318 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Mon, 14 Sep 2020 13:46:13 +0100 Subject: [PATCH 109/268] v1.7.6 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 9d9cc40a00..84b6b530d6 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "riot-web", "productName": "Riot", - "version": "1.7.6-rc.1", + "version": "1.7.6", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "repository": { From 451842f2bf6bbdb6f6b6ea8f0e27c02c4c50c6cb Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Mon, 14 Sep 2020 13:51:31 +0100 Subject: [PATCH 110/268] 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 84b6b530d6..3d9c727ed3 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.3.0", + "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop", "matrix-react-sdk": "3.4.0", "olm": "https://packages.matrix.org/npm/olm/olm-3.1.4.tgz", "prop-types": "^15.7.2", diff --git a/yarn.lock b/yarn.lock index bf6af8c8a7..4eab5677de 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7323,6 +7323,20 @@ matrix-js-sdk@8.3.0: request "^2.88.0" unhomoglyph "^1.0.2" +"matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop": + version "8.3.0" + resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/b9886d4f3479c041fc6d91ebc88c4a998e9d2e7c" + dependencies: + "@babel/runtime" "^7.8.3" + another-json "^0.2.0" + browser-request "^0.3.3" + bs58 "^4.0.1" + content-type "^1.0.2" + loglevel "^1.6.4" + qs "^6.5.2" + request "^2.88.0" + unhomoglyph "^1.0.2" + matrix-mock-request@^1.2.3: version "1.2.3" resolved "https://registry.yarnpkg.com/matrix-mock-request/-/matrix-mock-request-1.2.3.tgz#56b15d86e2601a9b48a854844396d18caab649c8" From 8b2560dbef9223c38c9b2289276ed31d6c5ef2fd Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Mon, 14 Sep 2020 13:51:40 +0100 Subject: [PATCH 111/268] 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 3d9c727ed3..149e6aae86 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.4.0", + "matrix-react-sdk": "github:matrix-org/matrix-react-sdk#develop", "olm": "https://packages.matrix.org/npm/olm/olm-3.1.4.tgz", "prop-types": "^15.7.2", "react": "^16.9.0", diff --git a/yarn.lock b/yarn.lock index 4eab5677de..844df889d1 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7308,21 +7308,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.3.0: - version "8.3.0" - resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-8.3.0.tgz#a57a6d071619c24b6e8501ae21fa4d21f6bbd052" - integrity sha512-ndKedUtZt72/4KWjlMevNwNDGfhPTOn/i4U6Iv1ZEfm7uZfbp5u3hVIyr8tyOiVuvMIxmcTajRdwSlRsNtYFkA== - dependencies: - "@babel/runtime" "^7.8.3" - another-json "^0.2.0" - browser-request "^0.3.3" - bs58 "^4.0.1" - content-type "^1.0.2" - loglevel "^1.6.4" - qs "^6.5.2" - request "^2.88.0" - unhomoglyph "^1.0.2" - "matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop": version "8.3.0" resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/b9886d4f3479c041fc6d91ebc88c4a998e9d2e7c" @@ -7345,10 +7330,9 @@ matrix-mock-request@^1.2.3: bluebird "^3.5.0" expect "^1.20.2" -matrix-react-sdk@3.4.0: +"matrix-react-sdk@github:matrix-org/matrix-react-sdk#develop": version "3.4.0" - resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.4.0.tgz#418cd8f0f6c2e884189272e5813136a2ab90ce4c" - integrity sha512-rSKRxo1NmgXKEsGUfU2vmAqQvvKbRHd8hcY6WVh/5YydiGuXdKf7w8cdpzv8LMU+Le9QUf+3hWOdZ8p++gOymA== + resolved "https://codeload.github.com/matrix-org/matrix-react-sdk/tar.gz/148cad6ea2daecee3dc799616dc102698b0751f8" dependencies: "@babel/runtime" "^7.10.5" await-lock "^2.0.1" @@ -7375,7 +7359,7 @@ matrix-react-sdk@3.4.0: is-ip "^2.0.0" linkifyjs "^2.1.9" lodash "^4.17.19" - matrix-js-sdk "8.3.0" + matrix-js-sdk "github:matrix-org/matrix-js-sdk#develop" minimist "^1.2.5" pako "^1.0.11" parse5 "^5.1.1" From 0eccd03a787814fa472de686a9c32835e28f1c4e Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Mon, 14 Sep 2020 15:57:32 +0100 Subject: [PATCH 112/268] Upgrade matrix-react-sdk to 3.4.1 --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 84b6b530d6..686758286d 100644 --- a/package.json +++ b/package.json @@ -61,7 +61,7 @@ "highlight.js": "^9.13.1", "jsrsasign": "^9.1.5", "matrix-js-sdk": "8.3.0", - "matrix-react-sdk": "3.4.0", + "matrix-react-sdk": "3.4.1", "olm": "https://packages.matrix.org/npm/olm/olm-3.1.4.tgz", "prop-types": "^15.7.2", "react": "^16.9.0", diff --git a/yarn.lock b/yarn.lock index 40f5475cab..07a294c768 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7331,10 +7331,10 @@ matrix-mock-request@^1.2.3: bluebird "^3.5.0" expect "^1.20.2" -matrix-react-sdk@3.4.0: - version "3.4.0" - resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.4.0.tgz#418cd8f0f6c2e884189272e5813136a2ab90ce4c" - integrity sha512-rSKRxo1NmgXKEsGUfU2vmAqQvvKbRHd8hcY6WVh/5YydiGuXdKf7w8cdpzv8LMU+Le9QUf+3hWOdZ8p++gOymA== +matrix-react-sdk@3.4.1: + version "3.4.1" + resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.4.1.tgz#820fe83081c475f98158c4e9e71a3c8e1afa7c14" + integrity sha512-aAfMgJuutQas3rF+Z7iOOkOuhwYNG+ugq7bmF8CEs00IYY6UEfreqiqGBwnvTm+1b1Sdl6p2kjgil8941veCZg== dependencies: "@babel/runtime" "^7.10.5" await-lock "^2.0.1" From 3d53908686b82a74bcefcb3ab86440bdcfbf4a5b Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Mon, 14 Sep 2020 16:00:49 +0100 Subject: [PATCH 113/268] Prepare changelog for v1.7.7 --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5fd0f36657..73aeb997f3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +Changes in [1.7.7](https://github.com/vector-im/element-web/releases/tag/v1.7.7) (2020-09-14) +============================================================================================= +[Full Changelog](https://github.com/vector-im/element-web/compare/v1.7.6...v1.7.7) + + * Upgrade to React SDK 3.4.1 + Changes in [1.7.6](https://github.com/vector-im/element-web/releases/tag/v1.7.6) (2020-09-14) ============================================================================================= [Full Changelog](https://github.com/vector-im/element-web/compare/v1.7.6-rc.1...v1.7.6) From 2f4299e836b53e360807528bebba37353631ab09 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Mon, 14 Sep 2020 16:00:49 +0100 Subject: [PATCH 114/268] v1.7.7 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 686758286d..309b3d5659 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "riot-web", "productName": "Riot", - "version": "1.7.6", + "version": "1.7.7", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "repository": { From 82cfc751afe1dbf601083fa377e7ab7738c67c62 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Mon, 14 Sep 2020 16:10:08 +0100 Subject: [PATCH 115/268] Reset matrix-js-sdk back to develop branch --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 309b3d5659..de7863dbaa 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.3.0", + "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop", "matrix-react-sdk": "3.4.1", "olm": "https://packages.matrix.org/npm/olm/olm-3.1.4.tgz", "prop-types": "^15.7.2", From df5cb15cf9c5bd043c1724cc21e58b0b513f5aab Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Mon, 14 Sep 2020 16:10:18 +0100 Subject: [PATCH 116/268] Reset matrix-react-sdk back to develop branch --- package.json | 2 +- yarn.lock | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index de7863dbaa..ce25adc792 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.4.1", + "matrix-react-sdk": "github:matrix-org/matrix-react-sdk#develop", "olm": "https://packages.matrix.org/npm/olm/olm-3.1.4.tgz", "prop-types": "^15.7.2", "react": "^16.9.0", diff --git a/yarn.lock b/yarn.lock index 289813f53e..ec950eb494 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7330,10 +7330,9 @@ matrix-mock-request@^1.2.3: bluebird "^3.5.0" expect "^1.20.2" -matrix-react-sdk@3.4.1: +"matrix-react-sdk@github:matrix-org/matrix-react-sdk#develop": version "3.4.1" - resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.4.1.tgz#820fe83081c475f98158c4e9e71a3c8e1afa7c14" - integrity sha512-aAfMgJuutQas3rF+Z7iOOkOuhwYNG+ugq7bmF8CEs00IYY6UEfreqiqGBwnvTm+1b1Sdl6p2kjgil8941veCZg== + resolved "https://codeload.github.com/matrix-org/matrix-react-sdk/tar.gz/747126950b14ded4e09b3c0c8cc6beb04b64b052" dependencies: "@babel/runtime" "^7.10.5" await-lock "^2.0.1" From 85979079f12e2af4d699f493dba328faf722a0c3 Mon Sep 17 00:00:00 2001 From: Travis Ralston Date: Mon, 14 Sep 2020 22:28:57 -0600 Subject: [PATCH 117/268] Add end-user documentation for UI features --- docs/config.md | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/docs/config.md b/docs/config.md index a9d05d8618..25af77f77e 100644 --- a/docs/config.md +++ b/docs/config.md @@ -144,3 +144,15 @@ Desktop app configuration ========================= See https://github.com/vector-im/riot-desktop#user-specified-configjson + +UI Features +=========== + +Parts of the UI can be disabled using UI features. These are settings which appear +under `settingDefaults` and can only be `true` (default) or `false`. When `false`, +parts of the UI relating to that feature will be disabled regardless of the user's +preferences. + +Currently, the following UI feature flags are supported: + +* `UIFeature.URLPreviews` - Disables URL previews across the entire application. From c76a5f2c52fa1e94faf867d8884c47ca251b1060 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Tue, 15 Sep 2020 13:19:47 +0100 Subject: [PATCH 118/268] Attempt to fix tests some more --- package.json | 3 +- res/sw.js | 1 - scripts/copy-res.js | 1 - src/vector/index.html | 10 - src/vector/index.ts | 2 +- webpack.config.js | 20 +- yarn.lock | 1207 ++++++++++++++++++++++++++++++++++++++++- 7 files changed, 1220 insertions(+), 24 deletions(-) delete mode 100644 res/sw.js diff --git a/package.json b/package.json index 0a151e0e28..5835edba39 100644 --- a/package.json +++ b/package.json @@ -142,7 +142,8 @@ "typescript": "^3.7.3", "webpack": "^4.41.2", "webpack-cli": "^3.3.10", - "webpack-dev-server": "^3.9.0" + "webpack-dev-server": "^3.9.0", + "workbox-webpack-plugin": "^5.1.4" }, "jest": { "testEnvironment": "jest-environment-jsdom-fourteen", diff --git a/res/sw.js b/res/sw.js deleted file mode 100644 index 038b82c9b4..0000000000 --- a/res/sw.js +++ /dev/null @@ -1 +0,0 @@ -self.addEventListener('fetch',() => {}); diff --git a/scripts/copy-res.js b/scripts/copy-res.js index ebe1c625ea..6c55f3d5dd 100755 --- a/scripts/copy-res.js +++ b/scripts/copy-res.js @@ -61,7 +61,6 @@ const INCLUDE_LANGS = [ // "dest/b/...". const COPY_LIST = [ ["res/manifest.json", "webapp"], - ["res/sw.js", "webapp"], ["res/welcome.html", "webapp"], ["res/welcome/**", "webapp/welcome"], ["res/themes/**", "webapp/themes"], diff --git a/src/vector/index.html b/src/vector/index.html index 4cda4b37a5..3ddc8482fb 100644 --- a/src/vector/index.html +++ b/src/vector/index.html @@ -55,16 +55,6 @@
- - - - - - - - - -