From 97925a6ad90f3844b5694b2e446e690c8b7fe31a Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Fri, 29 Jan 2021 09:16:55 +0000 Subject: [PATCH 01/30] Iterate SpacePanel, fix tooltips and give consistent expanded states --- package.json | 1 + webpack.config.js | 1 + yarn.lock | 9 +++++++++ 3 files changed, 11 insertions(+) diff --git a/package.json b/package.json index 18cf39f37..5a9617182 100644 --- a/package.json +++ b/package.json @@ -126,6 +126,7 @@ "modernizr": "^3.6.0", "node-fetch": "^2.6.0", "optimize-css-assets-webpack-plugin": "^5.0.3", + "postcss-calc": "^7.0.5", "postcss-easings": "^2.0.0", "postcss-extend": "^1.0.5", "postcss-hexrgba": "^2.0.0", diff --git a/webpack.config.js b/webpack.config.js index 25613a379..cc79048bb 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -227,6 +227,7 @@ module.exports = (env, argv) => { require("postcss-easings")(), require("postcss-strip-inline-comments")(), require("postcss-hexrgba")(), + require("postcss-calc")({warnWhenCannotResolve: true}), // It's important that this plugin is last otherwise we end // up with broken CSS. diff --git a/yarn.lock b/yarn.lock index e976fac47..f1ecf7c2f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -9286,6 +9286,15 @@ postcss-calc@^7.0.1: postcss-selector-parser "^6.0.2" postcss-value-parser "^4.0.2" +postcss-calc@^7.0.5: + version "7.0.5" + resolved "https://registry.yarnpkg.com/postcss-calc/-/postcss-calc-7.0.5.tgz#f8a6e99f12e619c2ebc23cf6c486fdc15860933e" + integrity sha512-1tKHutbGtLtEZF6PT4JSihCHfIVldU72mZ8SdZHIYriIZ9fh9k9aWSppaT8rHsyI3dX+KSR+W+Ix9BMY3AODrg== + dependencies: + postcss "^7.0.27" + postcss-selector-parser "^6.0.2" + postcss-value-parser "^4.0.2" + postcss-color-functional-notation@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/postcss-color-functional-notation/-/postcss-color-functional-notation-2.0.1.tgz#5efd37a88fbabeb00a2966d1e53d98ced93f74e0" From 49d3d5dffea441821efd1b2225f2b71e4bd3e97e Mon Sep 17 00:00:00 2001 From: Ricardo Date: Sat, 30 Jan 2021 02:20:33 +0000 Subject: [PATCH 02/30] Translated using Weblate (Spanish) Currently translated at 100.0% (33 of 33 strings) Translation: Element Web/element-web Translate-URL: https://translate.element.io/projects/element-web/element-web/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 f48ad2c15..133943fcc 100644 --- a/src/i18n/strings/es.json +++ b/src/i18n/strings/es.json @@ -15,7 +15,7 @@ "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!": "Falta el script de trabajo indexeddb!", + "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 Escritorio (%(platformName)s)", From d4627576c81c2da570773ec6a4ffcf0b78110608 Mon Sep 17 00:00:00 2001 From: "Auri B. P" Date: Sat, 30 Jan 2021 16:51:47 +0000 Subject: [PATCH 03/30] Translated using Weblate (Catalan) Currently translated at 100.0% (33 of 33 strings) Translation: Element Web/element-web Translate-URL: https://translate.element.io/projects/element-web/element-web/ca/ --- src/i18n/strings/ca.json | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/i18n/strings/ca.json b/src/i18n/strings/ca.json index 1bbf5ce18..0cae81931 100644 --- a/src/i18n/strings/ca.json +++ b/src/i18n/strings/ca.json @@ -2,22 +2,22 @@ "Dismiss": "Omet", "Unknown device": "Dispositiu desconegut", "Welcome to Element": "Benvingut/da a Element", - "You need to be using HTTPS to place a screen-sharing call.": "Necessites utilitzar HTTPS per poder fer una trucada amb pantalla compartida.", + "You need to be using HTTPS to place a screen-sharing call.": "Has d'utilitzar HTTPS per poder fer una trucada amb pantalla compartida.", "powered by Matrix": "amb tecnologia de Matrix", - "Decentralised, encrypted chat & collaboration powered by [matrix]": "Xat descentralitzat, encriptat & col·laboratiu amb tecnologia de [matrix]", + "Decentralised, encrypted chat & collaboration powered by [matrix]": "Xat descentralitzat, xifrat i col·laboratiu amb tecnologia de [matrix]", "Create Account": "Crea un compte", "Explore rooms": "Explora sales", - "Sign In": "Inicia la sessió", + "Sign In": "Inicia sessió", "Invalid configuration: no default server specified.": "Configuració invàlida: no s'ha especificat cap servidor predeterminat.", "Invalid JSON": "JSON invàlid", - "Go to your browser to complete Sign In": "Ves al teu navegador per completar l'inici de sessió", - "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Configuració invàlida: només pots especificar una sol de default_server_config, default_server_name, o default_hs_url.", + "Go to your browser to complete Sign In": "Vés al navegador per completar l'inici de sessió", + "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Configuració invàlida: només pots especificar una únic default_server_config, default_server_name, o default_hs_url.", "Your Element is misconfigured": "Element està mal configurat", - "Your Element configuration contains invalid JSON. Please correct the problem and reload the page.": "La configuració d'Element conté un JSON invàlid. Arregla el problema i actualitza la pàgina.", + "Your Element configuration contains invalid JSON. Please correct the problem and reload the page.": "La configuració d'Element conté un JSON invàlid. Soluciona el problema i actualitza la pàgina.", "The message from the parser is: %(message)s": "El missatge de l'analitzador és: %(message)s", "Unable to load config file: please refresh the page to try again.": "No s'ha pogut carregar el fitxer de configuració: actualitza la pàgina per tornar-ho a provar.", - "Unexpected error preparing the app. See console for details.": "Error inesperat preparant l'app. Consulta la consola pels a més detalls.", - "Download Completed": "Descàrrega completada", + "Unexpected error preparing the app. See console for details.": "Error inesperat durant la preparació de l'aplicació. Consulta la consola pels a més detalls.", + "Download Completed": "Baixada completada", "Open": "Obre", "Open user settings": "Obre la configuració d'usuari", "Previous/next recently visited room or community": "Anterior/següent sala o comunitat visitada recentment", From ade9babb80b81101aba7e3775c5cb5dfaef3f51a Mon Sep 17 00:00:00 2001 From: "J. Ryan Stinnett" Date: Tue, 2 Feb 2021 15:04:27 +0000 Subject: [PATCH 04/30] Upgrade matrix-widget-api --- package.json | 2 +- yarn.lock | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/package.json b/package.json index 392a8a898..cec7e8e68 100644 --- a/package.json +++ b/package.json @@ -60,7 +60,7 @@ "katex": "^0.12.0", "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop", "matrix-react-sdk": "github:matrix-org/matrix-react-sdk#develop", - "matrix-widget-api": "^0.1.0-beta.12", + "matrix-widget-api": "^0.1.0-beta.13", "olm": "https://packages.matrix.org/npm/olm/olm-3.2.1.tgz", "prop-types": "^15.7.2", "react": "^16.14.0", diff --git a/yarn.lock b/yarn.lock index e15979922..331571e5e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7535,7 +7535,7 @@ matrix-mock-request@^1.2.3: "matrix-react-sdk@github:matrix-org/matrix-react-sdk#develop": version "3.12.1" - resolved "https://codeload.github.com/matrix-org/matrix-react-sdk/tar.gz/241955f7c27d7649525fac1bf750a532ea34ff46" + resolved "https://codeload.github.com/matrix-org/matrix-react-sdk/tar.gz/ecc3dbbd80d9ce23a569f923809e6a269a117531" dependencies: "@babel/runtime" "^7.12.5" await-lock "^2.1.0" @@ -7564,7 +7564,7 @@ matrix-mock-request@^1.2.3: linkifyjs "^2.1.9" lodash "^4.17.20" matrix-js-sdk "github:matrix-org/matrix-js-sdk#develop" - matrix-widget-api "^0.1.0-beta.12" + matrix-widget-api "^0.1.0-beta.13" minimist "^1.2.5" pako "^2.0.3" parse5 "^6.0.1" @@ -7594,10 +7594,10 @@ matrix-react-test-utils@^0.2.2: resolved "https://registry.yarnpkg.com/matrix-react-test-utils/-/matrix-react-test-utils-0.2.2.tgz#c87144d3b910c7edc544a6699d13c7c2bf02f853" integrity sha512-49+7gfV6smvBIVbeloql+37IeWMTD+fiywalwCqk8Dnz53zAFjKSltB3rmWHso1uecLtQEcPtCijfhzcLXAxTQ== -matrix-widget-api@^0.1.0-beta.12: - version "0.1.0-beta.12" - resolved "https://registry.yarnpkg.com/matrix-widget-api/-/matrix-widget-api-0.1.0-beta.12.tgz#6cadeabde14f02949b7c3177434a4755942559b8" - integrity sha512-43xVAzLYzddYF73r6NK7NZ3geDLshQqCNAAcv0t5LFyFkKYGWDQG/cg8Vn8d37wm9WVBqYZUOXy9vBD4JcWVPA== +matrix-widget-api@^0.1.0-beta.13: + version "0.1.0-beta.13" + resolved "https://registry.yarnpkg.com/matrix-widget-api/-/matrix-widget-api-0.1.0-beta.13.tgz#ebddc83eaef39bbb87b621a02a35902e1a29b9ef" + integrity sha512-DJAvuX2E7gxc/a9rtJPDh17ba9xGIOAoBHcWirNTN3KGodzsrZ+Ns+M/BREFWMwGS5yEBZko5eq7uhXStEbnyQ== dependencies: "@types/events" "^3.0.0" events "^3.2.0" From 50adc958c34c79d37785b2c9e055e556a3b197d8 Mon Sep 17 00:00:00 2001 From: "@a2sc:matrix.org" Date: Tue, 2 Feb 2021 12:53:51 +0000 Subject: [PATCH 05/30] Translated using Weblate (German) Currently translated at 100.0% (33 of 33 strings) Translation: Element Web/element-web Translate-URL: https://translate.element.io/projects/element-web/element-web/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 3c53bd0bd..1c85bb22f 100644 --- a/src/i18n/strings/de_DE.json +++ b/src/i18n/strings/de_DE.json @@ -7,7 +7,7 @@ "Decentralised, encrypted chat & collaboration powered by [matrix]": "Dezentrale, verschlüsselte Chat- & Kollaborationslösung mittels [matrix]", "Sign In": "Anmelden", "Create Account": "Account erstellen", - "Explore rooms": "Erkunde Räume", + "Explore rooms": "Räume erkunden", "Unexpected error preparing the app. See console for details.": "Unerwarteter Fehler bei der Vorbereitung der App. Siehe Konsole für Details.", "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Ungültige Konfiguration: Es kann nur eine der Optionen default_server_config, default_server_name oder default_hs_url angegeben werden.", "Invalid configuration: no default server specified.": "Ungültige Konfiguration: Es wurde kein Standardserver angegeben.", From 59f82eaf0ab74815aedc92eccab3b0c53aff13c8 Mon Sep 17 00:00:00 2001 From: John Date: Mon, 1 Feb 2021 11:14:24 +0000 Subject: [PATCH 06/30] Translated using Weblate (Greek) Currently translated at 100.0% (33 of 33 strings) Translation: Element Web/element-web Translate-URL: https://translate.element.io/projects/element-web/element-web/el/ --- src/i18n/strings/el.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/i18n/strings/el.json b/src/i18n/strings/el.json index 4efc9d944..653558332 100644 --- a/src/i18n/strings/el.json +++ b/src/i18n/strings/el.json @@ -4,7 +4,7 @@ "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]", + "Decentralised, encrypted chat & collaboration powered by [matrix]": "Αποκεντρωμένη, κρυπτογραφημένη συνεργασία συνομιλίας χρησιμοποιώντας το [matrix]", "Sign In": "Σύνδεση", "Create Account": "Δημιουργία Λογαριασμού", "The message from the parser is: %(message)s": "Το μήνυμα από τον αναλυτή είναι: %(message)s", From 92d63579affd38c2beb287faff4afa717b14b311 Mon Sep 17 00:00:00 2001 From: Tim Al Date: Tue, 2 Feb 2021 07:31:56 +0000 Subject: [PATCH 07/30] Translated using Weblate (Dutch) Currently translated at 100.0% (33 of 33 strings) Translation: Element Web/element-web Translate-URL: https://translate.element.io/projects/element-web/element-web/nl/ --- src/i18n/strings/nl.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/i18n/strings/nl.json b/src/i18n/strings/nl.json index 4e75e2d5b..3054c0d98 100644 --- a/src/i18n/strings/nl.json +++ b/src/i18n/strings/nl.json @@ -26,7 +26,7 @@ "I understand the risks and wish to continue": "Ik begrijp de risico's en wil verder gaan", "Go to element.io": "Ga naar element.io", "Failed to start": "Opstarten mislukt", - "Open": "Open", + "Open": "Openen", "Your Element configuration contains invalid JSON. Please correct the problem and reload the page.": "Uw Element configuratie bevat ongeldige JSON. Gelieve het probleem te corrigeren daarna de pagina te herladen.", "Download Completed": "Download voltooid", "Your Element is misconfigured": "Uw Element is verkeerd geconfigureerd", From 1f71eb1b33c9fd820747413d6413375548112590 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Slobodan=20Simi=C4=87?= Date: Tue, 2 Feb 2021 12:09:24 +0000 Subject: [PATCH 08/30] Translated using Weblate (Serbian) Currently translated at 100.0% (33 of 33 strings) Translation: Element Web/element-web Translate-URL: https://translate.element.io/projects/element-web/element-web/sr/ --- src/i18n/strings/sr.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/i18n/strings/sr.json b/src/i18n/strings/sr.json index e54c71729..5d44f2918 100644 --- a/src/i18n/strings/sr.json +++ b/src/i18n/strings/sr.json @@ -5,7 +5,7 @@ "powered by Matrix": "покреће Матрикс", "Welcome to Element": "Добродошли у Елемент", "Decentralised, encrypted chat & collaboration powered by [matrix]": "Децентрализовано, шифровано ћаскање и сарадња коју покреће [matrix]", - "Sign In": "Пријава", + "Sign In": "Пријави се", "Create Account": "Направи налог", "Explore rooms": "Истражи собе", "Invalid configuration: no default server specified.": "Погрешно подешавање: подразумевани сервер није наведен.", From 9a32dd70712470a80ef10b4495e6a39a0efd624e Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Wed, 3 Feb 2021 12:29:42 +0000 Subject: [PATCH 09/30] 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 ba4f3371c..167af3088 100644 --- a/package.json +++ b/package.json @@ -58,7 +58,7 @@ "highlight.js": "^10.5.0", "jsrsasign": "^10.1.5", "katex": "^0.12.0", - "matrix-js-sdk": "9.6.0", + "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop", "matrix-react-sdk": "3.13.0", "matrix-widget-api": "^0.1.0-beta.13", "olm": "https://packages.matrix.org/npm/olm/olm-3.2.1.tgz", diff --git a/yarn.lock b/yarn.lock index 8a15dedd7..c8d3c47ac 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7526,6 +7526,20 @@ matrix-js-sdk@9.6.0: request "^2.88.2" unhomoglyph "^1.0.6" +"matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop": + version "9.6.0" + resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/6ad3fb16b3813c717943f6bc8bca5a55fe325477" + dependencies: + "@babel/runtime" "^7.12.5" + another-json "^0.2.0" + browser-request "^0.3.3" + bs58 "^4.0.1" + content-type "^1.0.4" + loglevel "^1.7.1" + qs "^6.9.6" + request "^2.88.2" + unhomoglyph "^1.0.6" + matrix-mock-request@^1.2.3: version "1.2.3" resolved "https://registry.yarnpkg.com/matrix-mock-request/-/matrix-mock-request-1.2.3.tgz#56b15d86e2601a9b48a854844396d18caab649c8" From c6e94c61dbaf8d840b58c080c5ddb8aa5a11928d Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Wed, 3 Feb 2021 12:29:53 +0000 Subject: [PATCH 10/30] 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 167af3088..fea8eb894 100644 --- a/package.json +++ b/package.json @@ -59,7 +59,7 @@ "jsrsasign": "^10.1.5", "katex": "^0.12.0", "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop", - "matrix-react-sdk": "3.13.0", + "matrix-react-sdk": "github:matrix-org/matrix-react-sdk#develop", "matrix-widget-api": "^0.1.0-beta.13", "olm": "https://packages.matrix.org/npm/olm/olm-3.2.1.tgz", "prop-types": "^15.7.2", diff --git a/yarn.lock b/yarn.lock index c8d3c47ac..742047afe 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7511,21 +7511,6 @@ mathml-tag-names@^2.1.3: resolved "https://registry.yarnpkg.com/mathml-tag-names/-/mathml-tag-names-2.1.3.tgz#4ddadd67308e780cf16a47685878ee27b736a0a3" integrity sha512-APMBEanjybaPzUrfqU0IMU5I0AswKMH7k8OTLs0vvV4KZpExkTkY87nR/zpbuTPj+gARop7aGUbl11pnDfW6xg== -matrix-js-sdk@9.6.0: - version "9.6.0" - resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-9.6.0.tgz#e3aee2f2a2c395aaa8a90a19023addee7af02099" - integrity sha512-zoNqB7z0C0QDncN7yD1K50c4C88VPofWaCQ0gNXqO/Ac1dr/xLF/46iNF9Y+dBwq7siBO9wEh20WFHMaRpeLOg== - dependencies: - "@babel/runtime" "^7.12.5" - another-json "^0.2.0" - browser-request "^0.3.3" - bs58 "^4.0.1" - content-type "^1.0.4" - loglevel "^1.7.1" - qs "^6.9.6" - request "^2.88.2" - unhomoglyph "^1.0.6" - "matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop": version "9.6.0" resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/6ad3fb16b3813c717943f6bc8bca5a55fe325477" @@ -7548,10 +7533,9 @@ matrix-mock-request@^1.2.3: bluebird "^3.5.0" expect "^1.20.2" -matrix-react-sdk@3.13.0: +"matrix-react-sdk@github:matrix-org/matrix-react-sdk#develop": version "3.13.0" - resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.13.0.tgz#6c34adc190338434849f946480e323d6d0c6f02d" - integrity sha512-G+9uLf07qIrpkLgtdhHkKhbNRvg6lX2xzXNwoi0pIn5L4MZmCrEmuixyCF0BVd8o8sYN2QMPeVTVSvLAl3BQHg== + resolved "https://codeload.github.com/matrix-org/matrix-react-sdk/tar.gz/bd538823cfc1046ce2577385a4ffdecca67e52f3" dependencies: "@babel/runtime" "^7.12.5" await-lock "^2.1.0" @@ -7579,7 +7563,7 @@ matrix-react-sdk@3.13.0: katex "^0.12.0" linkifyjs "^2.1.9" lodash "^4.17.20" - matrix-js-sdk "9.6.0" + matrix-js-sdk "github:matrix-org/matrix-js-sdk#develop" matrix-widget-api "^0.1.0-beta.13" minimist "^1.2.5" pako "^2.0.3" From b22484d203ef48558a9eece9ea0078801ecdc987 Mon Sep 17 00:00:00 2001 From: Denis Kasak Date: Thu, 4 Feb 2021 13:20:07 +0100 Subject: [PATCH 11/30] Add configuration security best practices to the README. Closes #13870. --- README.md | 49 ++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 46 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 484ed3756..51a797ff3 100644 --- a/README.md +++ b/README.md @@ -58,8 +58,11 @@ and thus allowed. To install Element as a desktop application, see [Running as a desktop app](#running-as-a-desktop-app) below. -Important Security Note -======================= +Important Security Notes +======================== + +Separate domains +---------------- We do not recommend running Element from the same domain name as your Matrix homeserver. The reason is the risk of XSS (cross-site-scripting) @@ -71,6 +74,45 @@ 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/element-web/issues/1977 for more details. +Configuration best practices +---------------------------- + +Unless you have special requirements, you will want to add the following to +your web server configuration when hosting Element Web: + +- The `X-Frame-Options: SAMEORIGIN` header, to prevent Element Web from being + framed and protect from [clickjacking][owasp-clickjacking]. +- The `frame-ancestors 'none'` directive to your `Content-Security-Policy` + header, as the modern replacement for `X-Frame-Options` (though both should be + included since not all browsers support it yet, see + [this][owasp-clickjacking-csp]). +- The `X-Content-Type-Options: nosniff` header, to [disable MIME + sniffing][mime-sniffing]. +- The `X-XSS-Protection: 1; mode=block;` header, for basic XSS protection in + legacy browsers. + +[mime-sniffing]: + + +[owasp-clickjacking-csp]: + + +[owasp-clickjacking]: + + +If you are using nginx, this would look something like the following: + +``` +add_header X-Frame-Options SAMEORIGIN; +add_header X-Content-Type-Options nosniff; +add_header X-XSS-Protection "1; mode=block"; +add_header Content-Security-Policy "frame-ancestors 'none'"; +``` + +Note: In case you are already setting a `Content-Security-Policy` header +elsewhere, you should modify it to include the `frame-ancestors` directive +instead of adding that last line. + Building From Source ==================== @@ -99,7 +141,8 @@ guide](https://classic.yarnpkg.com/en/docs/install) if you do not have it alread Note that `yarn dist` is not supported on Windows, so Windows users can run `yarn build`, which will build all the necessary files into the `webapp` directory. The version of Element will not appear in Settings without using the dist script. You can then mount the -`webapp` directory on your webserver to actually serve up the app, which is entirely static content. +`webapp` directory on your web server to actually serve up the app, which is +entirely static content. Running as a Desktop app ======================== From fb67a14486559859bff0d89951c883607bfcdac1 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Thu, 4 Feb 2021 12:25:41 +0000 Subject: [PATCH 12/30] 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 6b1c5bffd..8b668f703 100644 --- a/package.json +++ b/package.json @@ -58,7 +58,7 @@ "highlight.js": "^10.5.0", "jsrsasign": "^10.1.5", "katex": "^0.12.0", - "matrix-js-sdk": "9.6.0", + "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop", "matrix-react-sdk": "3.13.1", "matrix-widget-api": "^0.1.0-beta.13", "olm": "https://packages.matrix.org/npm/olm/olm-3.2.1.tgz", From 1b276c9e005c71909bc9bfea0e632ddc1fca6f3a Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Thu, 4 Feb 2021 12:27:31 +0000 Subject: [PATCH 13/30] 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 8b668f703..86b68bdc2 100644 --- a/package.json +++ b/package.json @@ -59,7 +59,7 @@ "jsrsasign": "^10.1.5", "katex": "^0.12.0", "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop", - "matrix-react-sdk": "3.13.1", + "matrix-react-sdk": "github:matrix-org/matrix-react-sdk#develop", "matrix-widget-api": "^0.1.0-beta.13", "olm": "https://packages.matrix.org/npm/olm/olm-3.2.1.tgz", "prop-types": "^15.7.2", diff --git a/yarn.lock b/yarn.lock index 43544cca0..538846995 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7533,10 +7533,9 @@ matrix-mock-request@^1.2.3: bluebird "^3.5.0" expect "^1.20.2" -matrix-react-sdk@3.13.1: +"matrix-react-sdk@github:matrix-org/matrix-react-sdk#develop": version "3.13.1" - resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.13.1.tgz#40256dda0d9b0e091ce01d1e48565f6aa93ad35d" - integrity sha512-VFcZSAO6P+afjKKJylgsp9PwjBf36xjaWN3l+8WaGqyZDKyJdYOjoU4UZE3O9s/W9YTIcb5UUYyq1y0sunJjog== + resolved "https://codeload.github.com/matrix-org/matrix-react-sdk/tar.gz/e9740f5a693861fb993bf9b85560d6c25784bca9" dependencies: "@babel/runtime" "^7.12.5" await-lock "^2.1.0" From 4f852f3d69834115df940764e4f47a8a1319eb6a Mon Sep 17 00:00:00 2001 From: Rintan Date: Wed, 3 Feb 2021 13:20:28 +0000 Subject: [PATCH 14/30] Translated using Weblate (Japanese) Currently translated at 100.0% (33 of 33 strings) Translation: Element Web/element-web Translate-URL: https://translate.element.io/projects/element-web/element-web/ja/ --- src/i18n/strings/ja.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/i18n/strings/ja.json b/src/i18n/strings/ja.json index ed0aed461..511ff584b 100644 --- a/src/i18n/strings/ja.json +++ b/src/i18n/strings/ja.json @@ -31,5 +31,6 @@ "Your Element configuration contains invalid JSON. Please correct the problem and reload the page.": "Elementの設定ファイルに不正なJSONが含まれています。問題を修正してからページを再読込してください。", "Your browser can't run %(brand)s": "このブラウザでは%(brand)sが動きません", "%(brand)s uses advanced browser features which aren't supported by your current browser.": "%(brand)sはブラウザの高度な機能を使う必要がありますが、このブラウザではその機能がサポートされていないようです。", - "Powered by Matrix": "Powered by Matrix" + "Powered by Matrix": "Powered by Matrix", + "Previous/next recently visited room or community": "最近利用したルームやコミュニティ" } From cfadc616b2d22806a2a5f23dbd36340965b816a4 Mon Sep 17 00:00:00 2001 From: Yamamoto Kenji Date: Thu, 4 Feb 2021 13:12:59 +0000 Subject: [PATCH 15/30] Translated using Weblate (Japanese) Currently translated at 100.0% (33 of 33 strings) Translation: Element Web/element-web Translate-URL: https://translate.element.io/projects/element-web/element-web/ja/ --- src/i18n/strings/ja.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/i18n/strings/ja.json b/src/i18n/strings/ja.json index 511ff584b..4bc406a73 100644 --- a/src/i18n/strings/ja.json +++ b/src/i18n/strings/ja.json @@ -8,8 +8,8 @@ "Unexpected error preparing the app. See console for details.": "アプリケーションの準備中に予期しないエラーが発生しました。詳細はコンソールを参照してください。", "Invalid configuration: no default server specified.": "不正な設定です：デフォルトのサーバーが設定されていません。", "Sign In": "サインイン", - "Create Account": "アカウント作成", - "Explore rooms": "部屋を探索する", + "Create Account": "アカウントの作成", + "Explore rooms": "部屋を探す", "The message from the parser is: %(message)s": "パーザーのメッセージ: %(message)s", "Invalid JSON": "妥当でないJSON", "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のいずれか一つのみが指定できます。", @@ -32,5 +32,5 @@ "Your browser can't run %(brand)s": "このブラウザでは%(brand)sが動きません", "%(brand)s uses advanced browser features which aren't supported by your current browser.": "%(brand)sはブラウザの高度な機能を使う必要がありますが、このブラウザではその機能がサポートされていないようです。", "Powered by Matrix": "Powered by Matrix", - "Previous/next recently visited room or community": "最近利用したルームやコミュニティ" + "Previous/next recently visited room or community": "最近利用したルームまたはコミュニティ" } From 0d4958319bb77e3f8f261a662298b37fc88720a5 Mon Sep 17 00:00:00 2001 From: Richard van der Hoff <1389908+richvdh@users.noreply.github.com> Date: Fri, 5 Feb 2021 16:16:48 +0000 Subject: [PATCH 16/30] README: remove Jenkins reference --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 51a797ff3..cabe52f58 100644 --- a/README.md +++ b/README.md @@ -31,7 +31,7 @@ Getting Started =============== The easiest way to test Element is to just use the hosted copy at https://app.element.io. -The `develop` branch is continuously deployed by Jenkins at https://develop.element.io +The `develop` branch is continuously deployed to https://develop.element.io for those who like living dangerously. To host your own copy of Element, the quickest bet is to use a pre-built From 29639bb0e6c7e9e1d44a81f2e4be1ce7ff12f0d4 Mon Sep 17 00:00:00 2001 From: iaiz Date: Sat, 6 Feb 2021 22:46:09 +0000 Subject: [PATCH 17/30] Translated using Weblate (Spanish) Currently translated at 100.0% (33 of 33 strings) Translation: Element Web/element-web Translate-URL: https://translate.element.io/projects/element-web/element-web/es/ --- src/i18n/strings/es.json | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/i18n/strings/es.json b/src/i18n/strings/es.json index 133943fcc..bb5949b4a 100644 --- a/src/i18n/strings/es.json +++ b/src/i18n/strings/es.json @@ -3,12 +3,12 @@ "Dismiss": "Omitir", "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", + "Welcome to Element": "Te damos la bienvenida a Element", "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", - "Unexpected error preparing the app. See console for details.": "Error inesperado preparando la aplicación. Vea la consola para más detalles.", + "Unexpected error preparing the app. See console for details.": "Error inesperado preparando la aplicación. Ver la consola para más detalles.", "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Configuración errónea: sólo puede especificar uno de default_server_config, default_server_name, o default_hs_url.", "Invalid configuration: no default server specified.": "Configuración errónea: no se ha especificado servidor.", "The message from the parser is: %(message)s": "El mensaje del parser es: %(message)s", @@ -16,21 +16,21 @@ "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!": "¡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.", + "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 intentarlo otra vez.", "Previous/next recently visited room or community": "Anterior/siguiente sala o comunidad visitada recientemente", - "%(brand)s Desktop (%(platformName)s)": "%(brand)s Escritorio (%(platformName)s)", + "%(brand)s Desktop (%(platformName)s)": "%(brand)s de escritorio (%(platformName)s)", "%(appName)s (%(browserName)s, %(osName)s)": "%(appName)s (%(browserName)s, %(osName)s)", - "Unsupported browser": "Navegador no soportado", + "Unsupported browser": "Navegador no compatible", "Please install Chrome, Firefox, or Safari for the best experience.": "Por favor, instale Chrome, Firefox, o Safari para la mejor experiencia.", "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.": "Puedes seguir utilizando tu navegador actual, pero puede que algunas funcionalidades no estén disponibles o que algunas partes de la aplicación se muestren de forma incorrecta.", "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": "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.", + "Your Element is misconfigured": "Element está mal configurado", + "Your Element configuration contains invalid JSON. Please correct the problem and reload the page.": "Tu configuración de Element contiene JSON inválido. Por favor corrígelo 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", + "Your browser can't run %(brand)s": "Su navegador no es compatible 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": "Desarrollado por Matrix" + "Powered by Matrix": "Funciona con Matrix" } From 52f469d7c958f821a4ae06bbb3fe567a098a620d Mon Sep 17 00:00:00 2001 From: Andrejs Date: Sat, 6 Feb 2021 16:32:16 +0000 Subject: [PATCH 18/30] Translated using Weblate (Latvian) Currently translated at 84.8% (28 of 33 strings) Translation: Element Web/element-web Translate-URL: https://translate.element.io/projects/element-web/element-web/lv/ --- src/i18n/strings/lv.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/i18n/strings/lv.json b/src/i18n/strings/lv.json index 1194db45c..de4dfc671 100644 --- a/src/i18n/strings/lv.json +++ b/src/i18n/strings/lv.json @@ -30,5 +30,6 @@ "Open": "Atvērt", "Download Completed": "Lejupielāde pabeigta", "Your Element configuration contains invalid JSON. Please correct the problem and reload the page.": "Jūsu Element konfigurācija satur kļūdainu JSON. Lūdzu, salabojiet problēmu un pārlādējiet lapu.", - "Your Element is misconfigured": "Jūsu Element ir nokonfigurēts kļūdaini" + "Your Element is misconfigured": "Jūsu Element ir nokonfigurēts kļūdaini", + "%(appName)s (%(browserName)s, %(osName)s)": "%(appName)s (%(browserName)s, %(osName)s)" } From 993c2e50b518842cf87f8c7c42a39048117ee34c Mon Sep 17 00:00:00 2001 From: "J. Ryan Stinnett" Date: Mon, 8 Feb 2021 15:12:30 +0000 Subject: [PATCH 19/30] Fix Electron type merging This changes to an interface for Electron types so that other layers can merge in further APIs as needed, such as the JS SDK. --- src/@types/global.d.ts | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/@types/global.d.ts b/src/@types/global.d.ts index f498103d6..68b85d6a8 100644 --- a/src/@types/global.d.ts +++ b/src/@types/global.d.ts @@ -39,18 +39,20 @@ declare global { matrixChat: ReturnType; // electron-only - electron: { - on(channel: ElectronChannel, listener: (event: Event, ...args: any[]) => void): void; - send(channel: ElectronChannel, ...args: any[]): void; - } + electron?: Electron; // opera-only - opera: any; + opera?: any; // https://developer.mozilla.org/en-US/docs/Web/API/InstallTrigger InstallTrigger: any; } + interface Electron { + on(channel: ElectronChannel, listener: (event: Event, ...args: any[]) => void): void; + send(channel: ElectronChannel, ...args: any[]): void; + } + interface Navigator { // PWA badging extensions https://w3c.github.io/badging/ setAppBadge?(count: number): Promise; From 27a92a5c894ff01566c7ddce84957334b78809da Mon Sep 17 00:00:00 2001 From: "J. Ryan Stinnett" Date: Mon, 8 Feb 2021 16:36:49 +0000 Subject: [PATCH 20/30] Add RegExp dotAll feature test As mentioned in https://github.com/vector-im/element-web/issues/16020#issuecomment-774384598, we're depending on the `dotAll` / `s` regex feature. This adds a test so browsers without this see an error screen. --- src/vector/index.ts | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/src/vector/index.ts b/src/vector/index.ts index b3e29bc38..21aacaf69 100644 --- a/src/vector/index.ts +++ b/src/vector/index.ts @@ -45,14 +45,20 @@ function checkBrowserFeatures() { return false; } - // custom checks atop Modernizr because it doesn't have ES2018/ES2019 checks in it for some features we depend on, - // Modernizr requires rules to be lowercase with no punctuation: - // ES2018: http://www.ecma-international.org/ecma-262/9.0/#sec-promise.prototype.finally + // Custom checks atop Modernizr because it doesn't have ES2018/ES2019 checks + // in it for some features we depend on. + // Modernizr requires rules to be lowercase with no punctuation. + // ES2018: http://262.ecma-international.org/9.0/#sec-promise.prototype.finally window.Modernizr.addTest("promiseprototypefinally", () => - window.Promise && window.Promise.prototype && typeof window.Promise.prototype.finally === "function"); - // ES2019: http://www.ecma-international.org/ecma-262/10.0/#sec-object.fromentries + typeof window.Promise?.prototype?.finally === "function"); + // ES2018: https://262.ecma-international.org/9.0/#sec-get-regexp.prototype.dotAll + window.Modernizr.addTest("regexpdotall", () => ( + window.RegExp?.prototype && + !!Object.getOwnPropertyDescriptor(window.RegExp.prototype, "dotAll")?.get + )); + // ES2019: http://262.ecma-international.org/10.0/#sec-object.fromentries window.Modernizr.addTest("objectfromentries", () => - window.Object && typeof window.Object.fromEntries === "function"); + typeof window.Object?.fromEntries === "function"); const featureList = Object.keys(window.Modernizr); From a500240d04874213fac8cc71d1183d2e1a706a75 Mon Sep 17 00:00:00 2001 From: Andrejs Date: Mon, 8 Feb 2021 19:47:37 +0000 Subject: [PATCH 21/30] Translated using Weblate (Latvian) Currently translated at 87.8% (29 of 33 strings) Translation: Element Web/element-web Translate-URL: https://translate.element.io/projects/element-web/element-web/lv/ --- src/i18n/strings/lv.json | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/i18n/strings/lv.json b/src/i18n/strings/lv.json index de4dfc671..6268c3f37 100644 --- a/src/i18n/strings/lv.json +++ b/src/i18n/strings/lv.json @@ -17,7 +17,7 @@ "Open user settings": "Atvērt lietotāja iestatījumus", "Go to your browser to complete Sign In": "Pārejiet uz pārlūku, lai pabeigtu pierakstīšanos", "Unsupported browser": "Neatbalstīts pārlūks", - "Please install Chrome, Firefox, or Safari for the best experience.": "Labākajai izmantošanas pieredzei, lūdzu, instalē Chrome, Firefox vai Safari pārlūku.", + "Please install Chrome, Firefox, or Safari for the best experience.": "Labākajai izmantošanas pieredzei, lūdzu, instalējiet Chrome, Firefox vai Safari pārlūku.", "You can continue using your current browser, but some or all features may not work and the look and feel of the application may be incorrect.": "Jūs varat turpināt lietot savu pašreizējo pārlūku, bet dažas vai visas funkcijas nestrādās, un lietotnes izskats var būt nepareizs.", "I understand the risks and wish to continue": "Es pieņemu riskus un vēlos turpināt", "Go to element.io": "Ej uz element.io", @@ -31,5 +31,6 @@ "Download Completed": "Lejupielāde pabeigta", "Your Element configuration contains invalid JSON. Please correct the problem and reload the page.": "Jūsu Element konfigurācija satur kļūdainu JSON. Lūdzu, salabojiet problēmu un pārlādējiet lapu.", "Your Element is misconfigured": "Jūsu Element ir nokonfigurēts kļūdaini", - "%(appName)s (%(browserName)s, %(osName)s)": "%(appName)s (%(browserName)s, %(osName)s)" + "%(appName)s (%(browserName)s, %(osName)s)": "%(appName)s (%(browserName)s, %(osName)s)", + "%(brand)s Desktop (%(platformName)s)": "%(brand)s Desktop (%(platformName)s)" } From e91e5132240152d3360cd14f71da1f5670d2eb40 Mon Sep 17 00:00:00 2001 From: jelv Date: Wed, 10 Feb 2021 14:35:07 +0000 Subject: [PATCH 22/30] Translated using Weblate (Dutch) Currently translated at 100.0% (33 of 33 strings) Translation: Element Web/element-web Translate-URL: https://translate.element.io/projects/element-web/element-web/nl/ --- src/i18n/strings/nl.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/i18n/strings/nl.json b/src/i18n/strings/nl.json index 3054c0d98..cb512bd7a 100644 --- a/src/i18n/strings/nl.json +++ b/src/i18n/strings/nl.json @@ -7,7 +7,7 @@ "Decentralised, encrypted chat & collaboration powered by [matrix]": "Gedecentraliseerd en versleuteld chatten & samenwerken dankzij [matrix]", "Sign In": "Aanmelden", "Create Account": "Account aanmaken", - "Explore rooms": "Kamers verkennen", + "Explore rooms": "Gesprekken ontdekken", "Unexpected error preparing the app. See console for details.": "Er is een onverwachte fout opgetreden bij het voorbereiden van de app. Zie de console voor details.", "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Configuratiefout: kan slechts één van default_server_config, default_server_name, of default_hs_url opgeven.", "Invalid configuration: no default server specified.": "Configuratie ongeldig: geen standaardserver opgegeven.", From 78d6ad8f29f53692bad3a302125221d88cf27d4e Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Wed, 10 Feb 2021 16:55:28 +0000 Subject: [PATCH 23/30] Upgrade matrix-js-sdk to 9.7.0-rc.1 --- package.json | 2 +- yarn.lock | 26 ++++++++++++++++---------- 2 files changed, 17 insertions(+), 11 deletions(-) diff --git a/package.json b/package.json index ae2777502..6e88c2f68 100644 --- a/package.json +++ b/package.json @@ -58,7 +58,7 @@ "highlight.js": "^10.5.0", "jsrsasign": "^10.1.5", "katex": "^0.12.0", - "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop", + "matrix-js-sdk": "9.7.0-rc.1", "matrix-react-sdk": "github:matrix-org/matrix-react-sdk#develop", "matrix-widget-api": "^0.1.0-beta.13", "olm": "https://packages.matrix.org/npm/olm/olm-3.2.1.tgz", diff --git a/yarn.lock b/yarn.lock index e78fafea4..87132cf54 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7511,6 +7511,21 @@ mathml-tag-names@^2.1.3: resolved "https://registry.yarnpkg.com/mathml-tag-names/-/mathml-tag-names-2.1.3.tgz#4ddadd67308e780cf16a47685878ee27b736a0a3" integrity sha512-APMBEanjybaPzUrfqU0IMU5I0AswKMH7k8OTLs0vvV4KZpExkTkY87nR/zpbuTPj+gARop7aGUbl11pnDfW6xg== +matrix-js-sdk@9.7.0-rc.1: + version "9.7.0-rc.1" + resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-9.7.0-rc.1.tgz#30cabda3f2b416d09c95afc4fe138bba44534c76" + integrity sha512-y6D2bXYKQqGrtf1PLHjjHf6wW67DIhdrwQ77nKOhEd/rfaEqcMf99wqSvF/nzFexbG1Y7PG4IdM4YTdOQ9UD+g== + dependencies: + "@babel/runtime" "^7.12.5" + another-json "^0.2.0" + browser-request "^0.3.3" + bs58 "^4.0.1" + content-type "^1.0.4" + loglevel "^1.7.1" + qs "^6.9.6" + request "^2.88.2" + unhomoglyph "^1.0.6" + "matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop": version "9.6.0" resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/6ad3fb16b3813c717943f6bc8bca5a55fe325477" @@ -8890,16 +8905,7 @@ postcss-attribute-case-insensitive@^4.0.1: postcss "^7.0.2" postcss-selector-parser "^6.0.2" -postcss-calc@^7.0.1: - version "7.0.5" - resolved "https://registry.yarnpkg.com/postcss-calc/-/postcss-calc-7.0.5.tgz#f8a6e99f12e619c2ebc23cf6c486fdc15860933e" - integrity sha512-1tKHutbGtLtEZF6PT4JSihCHfIVldU72mZ8SdZHIYriIZ9fh9k9aWSppaT8rHsyI3dX+KSR+W+Ix9BMY3AODrg== - dependencies: - postcss "^7.0.27" - postcss-selector-parser "^6.0.2" - postcss-value-parser "^4.0.2" - -postcss-calc@^7.0.5: +postcss-calc@^7.0.1, postcss-calc@^7.0.5: version "7.0.5" resolved "https://registry.yarnpkg.com/postcss-calc/-/postcss-calc-7.0.5.tgz#f8a6e99f12e619c2ebc23cf6c486fdc15860933e" integrity sha512-1tKHutbGtLtEZF6PT4JSihCHfIVldU72mZ8SdZHIYriIZ9fh9k9aWSppaT8rHsyI3dX+KSR+W+Ix9BMY3AODrg== From f998f85c3c168cbdc13c3a17aa07bbb0ddc89fbd Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Wed, 10 Feb 2021 16:56:55 +0000 Subject: [PATCH 24/30] Upgrade matrix-react-sdk to 3.14.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 6e88c2f68..7f4d40cf7 100644 --- a/package.json +++ b/package.json @@ -59,7 +59,7 @@ "jsrsasign": "^10.1.5", "katex": "^0.12.0", "matrix-js-sdk": "9.7.0-rc.1", - "matrix-react-sdk": "github:matrix-org/matrix-react-sdk#develop", + "matrix-react-sdk": "3.14.0-rc.1", "matrix-widget-api": "^0.1.0-beta.13", "olm": "https://packages.matrix.org/npm/olm/olm-3.2.1.tgz", "prop-types": "^15.7.2", diff --git a/yarn.lock b/yarn.lock index 87132cf54..1154f5739 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7526,20 +7526,6 @@ matrix-js-sdk@9.7.0-rc.1: request "^2.88.2" unhomoglyph "^1.0.6" -"matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop": - version "9.6.0" - resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/6ad3fb16b3813c717943f6bc8bca5a55fe325477" - dependencies: - "@babel/runtime" "^7.12.5" - another-json "^0.2.0" - browser-request "^0.3.3" - bs58 "^4.0.1" - content-type "^1.0.4" - loglevel "^1.7.1" - qs "^6.9.6" - request "^2.88.2" - unhomoglyph "^1.0.6" - matrix-mock-request@^1.2.3: version "1.2.3" resolved "https://registry.yarnpkg.com/matrix-mock-request/-/matrix-mock-request-1.2.3.tgz#56b15d86e2601a9b48a854844396d18caab649c8" @@ -7548,9 +7534,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.13.1" - resolved "https://codeload.github.com/matrix-org/matrix-react-sdk/tar.gz/e9740f5a693861fb993bf9b85560d6c25784bca9" +matrix-react-sdk@3.14.0-rc.1: + version "3.14.0-rc.1" + resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.14.0-rc.1.tgz#a6a6891ca6ca32b581e3921b6293e49800141e2f" + integrity sha512-19tASw75pUDaUHAxCimEKquaOvG/eRcvc38wPTIWnfcx5Nm4a4gioOy6spu5moV9hd/2JDRJHRrU5dbsvVW8Gg== dependencies: "@babel/runtime" "^7.12.5" await-lock "^2.1.0" @@ -7578,7 +7565,7 @@ matrix-mock-request@^1.2.3: katex "^0.12.0" linkifyjs "^2.1.9" lodash "^4.17.20" - matrix-js-sdk "github:matrix-org/matrix-js-sdk#develop" + matrix-js-sdk "9.7.0-rc.1" matrix-widget-api "^0.1.0-beta.13" minimist "^1.2.5" pako "^2.0.3" From 402f97b43091c733615dbe4eb44b208bcc44fca7 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Wed, 10 Feb 2021 17:03:39 +0000 Subject: [PATCH 25/30] Prepare changelog for v1.7.21-rc.1 --- CHANGELOG.md | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7c2441bc7..90e9376b9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,23 @@ +Changes in [1.7.21-rc.1](https://github.com/vector-im/element-web/releases/tag/v1.7.21-rc.1) (2021-02-10) +========================================================================================================= +[Full Changelog](https://github.com/vector-im/element-web/compare/v1.7.20...v1.7.21-rc.1) + + * Upgrade to React SDK 3.14.0-rc.1 and JS SDK 9.7.0-rc.1 + * Translations update from Weblate + [\#16427](https://github.com/vector-im/element-web/pull/16427) + * Add RegExp dotAll feature test + [\#16408](https://github.com/vector-im/element-web/pull/16408) + * Fix Electron type merging + [\#16405](https://github.com/vector-im/element-web/pull/16405) + * README: remove Jenkins reference + [\#16381](https://github.com/vector-im/element-web/pull/16381) + * Enable PostCSS Calc in webpack builds + [\#16307](https://github.com/vector-im/element-web/pull/16307) + * Add configuration security best practices to the README. + [\#16367](https://github.com/vector-im/element-web/pull/16367) + * Upgrade matrix-widget-api + [\#16347](https://github.com/vector-im/element-web/pull/16347) + Changes in [1.7.20](https://github.com/vector-im/element-web/releases/tag/v1.7.20) (2021-02-04) =============================================================================================== [Full Changelog](https://github.com/vector-im/element-web/compare/v1.7.19...v1.7.20) From c4c1b728cc9bf4eecca0245cb2f73329fae275ec Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Wed, 10 Feb 2021 17:03:39 +0000 Subject: [PATCH 26/30] v1.7.21-rc.1 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 7f4d40cf7..4bf37c0ab 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "element-web", - "version": "1.7.20", + "version": "1.7.21-rc.1", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "repository": { From 31ec953a921ac6ac2a03a8ace651007a698f6c2d Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Tue, 16 Feb 2021 11:11:43 +0000 Subject: [PATCH 27/30] Upgrade matrix-js-sdk to 9.7.0 --- package.json | 2 +- yarn.lock | 15 +++++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index 4bf37c0ab..4df9211e3 100644 --- a/package.json +++ b/package.json @@ -58,7 +58,7 @@ "highlight.js": "^10.5.0", "jsrsasign": "^10.1.5", "katex": "^0.12.0", - "matrix-js-sdk": "9.7.0-rc.1", + "matrix-js-sdk": "9.7.0", "matrix-react-sdk": "3.14.0-rc.1", "matrix-widget-api": "^0.1.0-beta.13", "olm": "https://packages.matrix.org/npm/olm/olm-3.2.1.tgz", diff --git a/yarn.lock b/yarn.lock index 1154f5739..44ac977cd 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7511,6 +7511,21 @@ mathml-tag-names@^2.1.3: resolved "https://registry.yarnpkg.com/mathml-tag-names/-/mathml-tag-names-2.1.3.tgz#4ddadd67308e780cf16a47685878ee27b736a0a3" integrity sha512-APMBEanjybaPzUrfqU0IMU5I0AswKMH7k8OTLs0vvV4KZpExkTkY87nR/zpbuTPj+gARop7aGUbl11pnDfW6xg== +matrix-js-sdk@9.7.0: + version "9.7.0" + resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-9.7.0.tgz#fbd03c188546f9733b28ea1752476b22ca63d2f2" + integrity sha512-cVBHhQVGk2WWQ2kv0Ov8CTcgZVJhMuZBejXZnKqp6qEgSpmb4xQRxewbxjF53ixO7uRUzGFtAlDiW4BeHZnN/g== + dependencies: + "@babel/runtime" "^7.12.5" + another-json "^0.2.0" + browser-request "^0.3.3" + bs58 "^4.0.1" + content-type "^1.0.4" + loglevel "^1.7.1" + qs "^6.9.6" + request "^2.88.2" + unhomoglyph "^1.0.6" + matrix-js-sdk@9.7.0-rc.1: version "9.7.0-rc.1" resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-9.7.0-rc.1.tgz#30cabda3f2b416d09c95afc4fe138bba44534c76" From afb469ce4244cb0365e34cc4e2cdff92d6337140 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Tue, 16 Feb 2021 11:14:40 +0000 Subject: [PATCH 28/30] Upgrade matrix-react-sdk to 3.14.0 --- package.json | 2 +- yarn.lock | 25 +++++-------------------- 2 files changed, 6 insertions(+), 21 deletions(-) diff --git a/package.json b/package.json index 4df9211e3..01175cef0 100644 --- a/package.json +++ b/package.json @@ -59,7 +59,7 @@ "jsrsasign": "^10.1.5", "katex": "^0.12.0", "matrix-js-sdk": "9.7.0", - "matrix-react-sdk": "3.14.0-rc.1", + "matrix-react-sdk": "3.14.0", "matrix-widget-api": "^0.1.0-beta.13", "olm": "https://packages.matrix.org/npm/olm/olm-3.2.1.tgz", "prop-types": "^15.7.2", diff --git a/yarn.lock b/yarn.lock index 44ac977cd..c039416ba 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7526,21 +7526,6 @@ matrix-js-sdk@9.7.0: request "^2.88.2" unhomoglyph "^1.0.6" -matrix-js-sdk@9.7.0-rc.1: - version "9.7.0-rc.1" - resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-9.7.0-rc.1.tgz#30cabda3f2b416d09c95afc4fe138bba44534c76" - integrity sha512-y6D2bXYKQqGrtf1PLHjjHf6wW67DIhdrwQ77nKOhEd/rfaEqcMf99wqSvF/nzFexbG1Y7PG4IdM4YTdOQ9UD+g== - dependencies: - "@babel/runtime" "^7.12.5" - another-json "^0.2.0" - browser-request "^0.3.3" - bs58 "^4.0.1" - content-type "^1.0.4" - loglevel "^1.7.1" - qs "^6.9.6" - request "^2.88.2" - unhomoglyph "^1.0.6" - matrix-mock-request@^1.2.3: version "1.2.3" resolved "https://registry.yarnpkg.com/matrix-mock-request/-/matrix-mock-request-1.2.3.tgz#56b15d86e2601a9b48a854844396d18caab649c8" @@ -7549,10 +7534,10 @@ matrix-mock-request@^1.2.3: bluebird "^3.5.0" expect "^1.20.2" -matrix-react-sdk@3.14.0-rc.1: - version "3.14.0-rc.1" - resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.14.0-rc.1.tgz#a6a6891ca6ca32b581e3921b6293e49800141e2f" - integrity sha512-19tASw75pUDaUHAxCimEKquaOvG/eRcvc38wPTIWnfcx5Nm4a4gioOy6spu5moV9hd/2JDRJHRrU5dbsvVW8Gg== +matrix-react-sdk@3.14.0: + version "3.14.0" + resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.14.0.tgz#86cd273e7828da2f9b9d3bcf6a5d1e7046e37788" + integrity sha512-W/MTmkESvnsOi6K4VwP6sfSXY9HxdINtPP3Jvlr9EO1PxahYs9BxxQ90gguij6I38dwM9/miChBG9uAO7mL9+A== dependencies: "@babel/runtime" "^7.12.5" await-lock "^2.1.0" @@ -7580,7 +7565,7 @@ matrix-react-sdk@3.14.0-rc.1: katex "^0.12.0" linkifyjs "^2.1.9" lodash "^4.17.20" - matrix-js-sdk "9.7.0-rc.1" + matrix-js-sdk "9.7.0" matrix-widget-api "^0.1.0-beta.13" minimist "^1.2.5" pako "^2.0.3" From 2e00314dc0eff86d2ceb8a788c28f2db4bea8a2f Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Tue, 16 Feb 2021 11:18:00 +0000 Subject: [PATCH 29/30] Prepare changelog for v1.7.21 --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 90e9376b9..76e7c0b42 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +Changes in [1.7.21](https://github.com/vector-im/element-web/releases/tag/v1.7.21) (2021-02-16) +=============================================================================================== +[Full Changelog](https://github.com/vector-im/element-web/compare/v1.7.21-rc.1...v1.7.21) + + * Upgrade to React SDK 3.14.0 and JS SDK 9.7.0 + Changes in [1.7.21-rc.1](https://github.com/vector-im/element-web/releases/tag/v1.7.21-rc.1) (2021-02-10) ========================================================================================================= [Full Changelog](https://github.com/vector-im/element-web/compare/v1.7.20...v1.7.21-rc.1) From dd0e2e52f8dc78e541b4fc9306e32acfe3132f68 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Tue, 16 Feb 2021 11:18:00 +0000 Subject: [PATCH 30/30] v1.7.21 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 01175cef0..b90111dbe 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "element-web", - "version": "1.7.21-rc.1", + "version": "1.7.21", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "repository": {