From 628409d75e29b0da1755ecfecc4f0908159afa47 Mon Sep 17 00:00:00 2001 From: XoseM Date: Fri, 26 Jun 2020 14:08:19 +0000 Subject: [PATCH 01/22] Translated using Weblate (Galician) Currently translated at 100.0% (33 of 33 strings) Translation: Riot Web/riot-web Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/gl/ --- src/i18n/strings/gl.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/i18n/strings/gl.json b/src/i18n/strings/gl.json index 7b3d5eebc8..b24f4fcb8a 100644 --- a/src/i18n/strings/gl.json +++ b/src/i18n/strings/gl.json @@ -24,7 +24,7 @@ "Invalid configuration: no default server specified.": "Configuración non válida: non se indicou servidor por omisión.", "Missing indexeddb worker script!": "Falta o script indexeddb!", "Unable to load config file: please refresh the page to try again.": "Non se cargou o ficheiro de configuración: actualiza a páxina para reintentalo.", - "Open user settings": "Abrir axustes do usuario", + "Open user settings": "Abrir axustes da usuaria", "Previous/next recently visited room or community": "Anterior/seguinte sala ou comunidade recentes", "Riot Desktop (%(platformName)s)": "Riot Desktop (%(platformName)s)", "Go to your browser to complete Sign In": "Abre o navegador para realizar a Conexión", From 9d39a3aea7a705414c21274fcfbbae7bdadc4f38 Mon Sep 17 00:00:00 2001 From: aWeinzierl Date: Fri, 26 Jun 2020 01:35:16 +0000 Subject: [PATCH 02/22] Translated using Weblate (Spanish) Currently translated at 100.0% (33 of 33 strings) Translation: Riot Web/riot-web Translate-URL: https://translate.riot.im/projects/riot-web/riot-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 1b1f22fe9c..07de9c2df3 100644 --- a/src/i18n/strings/es.json +++ b/src/i18n/strings/es.json @@ -9,7 +9,7 @@ "Welcome to Riot.im": "Bienvenido a Riot.im", "Decentralised, encrypted chat & collaboration powered by [matrix]": "Conversaciones cifradas y descentralizadas y colaboración con el poder de [matrix]", "Chat with Riot Bot": "Hablar con Riot Bot", - "Sign In": "Registrarse", + "Sign In": "Iniciar sesión", "Create Account": "Crear cuenta", "Need help?": "Necesitas ayuda?", "Explore rooms": "Explorar salas", From 4b49fb49add0e47e8f4d2faafba3af449f0b296b Mon Sep 17 00:00:00 2001 From: pebles Date: Fri, 26 Jun 2020 19:53:11 +0000 Subject: [PATCH 03/22] Translated using Weblate (Spanish) Currently translated at 100.0% (33 of 33 strings) Translation: Riot Web/riot-web Translate-URL: https://translate.riot.im/projects/riot-web/riot-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 07de9c2df3..8bb48e0dba 100644 --- a/src/i18n/strings/es.json +++ b/src/i18n/strings/es.json @@ -16,7 +16,7 @@ "Room Directory": "Directorio de salas", "You can use the custom server options to sign into other Matrix servers by specifying a different homeserver URL. This allows you to use Riot with an existing Matrix account on a different homeserver.": "Puedes usar las opciones personalizadas del servidor para iniciar sesión en otros servidores Matrix, especificando la dirección URL del servidor. Esto te permite usar una cuenta Matrix en un servidor diferente.", "Unexpected error preparing the app. See console for details.": "Error inesperado preparando la aplicación. Vea la consola para más detalles.", - "Your Riot is misconfigured": "Tu Riot está mal configurado", + "Your Riot is misconfigured": "Tu Riot tiene un error de configuración", "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.", "Your Riot configuration contains invalid JSON. Please correct the problem and reload the page.": "Tu configuración de Riot contiene JSON inválido. Por favor corrige el error y recarga la página.", From 6413c3c2fad6a32133134c1e0438b895c171bf7d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Erik=20Lindstr=C3=B6m?= Date: Thu, 25 Jun 2020 11:52:36 +0000 Subject: [PATCH 04/22] Translated using Weblate (Swedish) Currently translated at 100.0% (33 of 33 strings) Translation: Riot Web/riot-web Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/sv/ --- src/i18n/strings/sv.json | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/src/i18n/strings/sv.json b/src/i18n/strings/sv.json index 1c0bbb5834..c7d9b7e392 100644 --- a/src/i18n/strings/sv.json +++ b/src/i18n/strings/sv.json @@ -15,7 +15,7 @@ "Need help?": "Behöver du hjälp?", "Explore rooms": "Utforska rum", "Room Directory": "Rumslista", - "Your Riot configuration contains invalid JSON. Please correct the problem and reload the page.": "Dina Riot-inställningar innhåller ogiltig JSON. Vänligen uppdatera inställningarna och ladda om sidan.", + "Your Riot configuration contains invalid JSON. Please correct the problem and reload the page.": "Dina Riot-inställningar innehåller ogiltig JSON. Vänligen uppdatera inställningarna och ladda om sidan.", "The message from the parser is: %(message)s": "Medelandet från parsern är: %(message)s", "Invalid JSON": "Ogiltig JSON", "Your Riot is misconfigured": "Riot är felkonfigurerat", @@ -23,5 +23,18 @@ "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.", "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" + "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", + "Riot Desktop (%(platformName)s)": "Riot Desktop (%(platformName)s)", + "%(appName)s (%(browserName)s, %(osName)s)": "%(appName)s (%(browserName)s, %(osName)s)", + "Unsupported browser": "Webbläsaren stöds ej", + "Your browser can't run Riot": "Din webbläsare kan inte köra Riot", + "Riot uses advanced browser features which aren't supported by your current browser.": "Riot användare avancerade webbläsarfunktioner som inte stöds av din nuvarande webbläsare.", + "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.", + "I understand the risks and wish to continue": "Jag förstår riskerna och vill fortsätta", + "Go to Riot.im": "Gå till Riot.im", + "Failed to start": "Misslyckade att starta" } From 87527d7b166f4627f9e7f5a2e0714883582776a7 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Mon, 29 Jun 2020 11:41:18 +0100 Subject: [PATCH 05/22] Show expiring toast on completed downloads Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- src/vector/platform/ElectronPlatform.tsx | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/src/vector/platform/ElectronPlatform.tsx b/src/vector/platform/ElectronPlatform.tsx index be1b5838b1..c356e0b052 100644 --- a/src/vector/platform/ElectronPlatform.tsx +++ b/src/vector/platform/ElectronPlatform.tsx @@ -45,6 +45,8 @@ import {Action} from "matrix-react-sdk/src/dispatcher/actions"; import {ActionPayload} from "matrix-react-sdk/src/dispatcher/payloads"; import {showToast as showUpdateToast} from "matrix-react-sdk/src/toasts/UpdateToast"; import {CheckUpdatesPayload} from "matrix-react-sdk/src/dispatcher/payloads/CheckUpdatesPayload"; +import ToastStore from "matrix-react-sdk/src/stores/ToastStore"; +import GenericExpiringToast from "matrix-react-sdk/src/components/views/toasts/GenericExpiringToast"; const ipcRenderer = window.ipcRenderer; const isMac = navigator.platform.toUpperCase().includes('MAC'); @@ -247,6 +249,26 @@ export default class ElectronPlatform extends VectorBasePlatform { dis.fire(Action.ViewUserSettings); }); + ipcRenderer.on('userDownloadCompleted', (ev, {path, name}) => { + const onAccept = () => { + ipcRenderer.send('userDownloadOpen', {path}); + }; + + ToastStore.sharedInstance().addOrReplaceToast({ + key: `DOWNLOAD_TOAST_${path}`, + title: _t("Download Completed"), + props: { + description: name, + acceptLabel: _t("Open"), + onAccept, + dismissLabel: _t("Dismiss"), + numSeconds: 10, + }, + component: GenericExpiringToast, + priority: 99, + }); + }); + // register OS-specific shortcuts if (isMac) { registerShortcut(Categories.NAVIGATION, { From 7a7abc74d98ebe4c4b15f667b600c7da271b2a0f Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Mon, 29 Jun 2020 15:59:37 +0100 Subject: [PATCH 06/22] i18n Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- src/i18n/strings/en_EN.json | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json index bfccb8135f..d2a95c8daf 100644 --- a/src/i18n/strings/en_EN.json +++ b/src/i18n/strings/en_EN.json @@ -8,6 +8,9 @@ "Invalid JSON": "Invalid JSON", "Unable to load config file: please refresh the page to try again.": "Unable to load config file: please refresh the page to try again.", "Unexpected error preparing the app. See console for details.": "Unexpected error preparing the app. See console for details.", + "Download Completed": "Download Completed", + "Open": "Open", + "Dismiss": "Dismiss", "Open user settings": "Open user settings", "Previous/next recently visited room or community": "Previous/next recently visited room or community", "Riot Desktop (%(platformName)s)": "Riot Desktop (%(platformName)s)", @@ -18,7 +21,6 @@ "powered by Matrix": "powered by Matrix", "Custom Server Options": "Custom Server Options", "You can use the custom server options to sign into other Matrix servers by specifying a different homeserver URL. This allows you to use Riot with an existing Matrix account on a different homeserver.": "You can use the custom server options to sign into other Matrix servers by specifying a different homeserver URL. This allows you to use Riot with an existing Matrix account on a different homeserver.", - "Dismiss": "Dismiss", "Unsupported browser": "Unsupported browser", "Your browser can't run Riot": "Your browser can't run Riot", "Riot uses advanced browser features which aren't supported by your current browser.": "Riot uses advanced browser features which aren't supported by your current browser.", From d6cb83eb7a4e5270f91aea546d187c7eb61033ee Mon Sep 17 00:00:00 2001 From: ButterflyOfFire Date: Mon, 29 Jun 2020 08:56:26 +0000 Subject: [PATCH 07/22] Translated using Weblate (Kabyle) Currently translated at 100.0% (33 of 33 strings) Translation: Riot Web/riot-web Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/kab/ --- src/i18n/strings/kab.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/i18n/strings/kab.json b/src/i18n/strings/kab.json index 8a3307909c..1004da4f01 100644 --- a/src/i18n/strings/kab.json +++ b/src/i18n/strings/kab.json @@ -11,7 +11,7 @@ "Dismiss": "Agwi", "Sign In": "Kcem", "Explore rooms": "Snirem tixxamin", - "Missing indexeddb worker script!": "Asekript n uxeddam IndexedB ulac-it!", + "Missing indexeddb worker script!": "Asekript n uxeddam Indexeddb ulac-it!", "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Tawila d tarmeɣtut: mudd-d kan yiwen seg default_server_config, default_server_name, neɣ default_hs_url.", "Invalid configuration: no default server specified.": "Tawila d tarmeɣtut: ulac aqeddac amezwer i d-yettwafernen.", "Your Riot is misconfigured": "Riot inek(inem) ur ittusbadu ara", From 58c8ac05b97ca8505554215f85040792e3479b89 Mon Sep 17 00:00:00 2001 From: Besnik Bleta Date: Tue, 30 Jun 2020 19:43:22 +0000 Subject: [PATCH 08/22] Translated using Weblate (Albanian) Currently translated at 100.0% (35 of 35 strings) Translation: Riot Web/riot-web Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/sq/ --- src/i18n/strings/sq.json | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/i18n/strings/sq.json b/src/i18n/strings/sq.json index 48d4d6ed72..32a452a677 100644 --- a/src/i18n/strings/sq.json +++ b/src/i18n/strings/sq.json @@ -36,5 +36,7 @@ "I understand the risks and wish to continue": "I kuptoj rreziqet dhe dëshiroj të vazhdoj", "Go to Riot.im": "Shko te Riot.im", "Failed to start": "S’u arrit të nisej", - "Missing indexeddb worker script!": "Mungon programth worker-i indexeddb-je!" + "Missing indexeddb worker script!": "Mungon programth worker-i indexeddb-je!", + "Download Completed": "Shkarkim i Plotësuar", + "Open": "Hape" } From 935914e5728b28697438533596757e092166da5c Mon Sep 17 00:00:00 2001 From: Jeff Huang Date: Wed, 1 Jul 2020 02:31:57 +0000 Subject: [PATCH 09/22] Translated using Weblate (Chinese (Traditional)) Currently translated at 100.0% (35 of 35 strings) Translation: Riot Web/riot-web Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/zh_Hant/ --- src/i18n/strings/zh_Hant.json | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/i18n/strings/zh_Hant.json b/src/i18n/strings/zh_Hant.json index e3324e3589..34a2f517f7 100644 --- a/src/i18n/strings/zh_Hant.json +++ b/src/i18n/strings/zh_Hant.json @@ -36,5 +36,7 @@ "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 Riot.im": "到 Riot.im", - "Failed to start": "啟動失敗" + "Failed to start": "啟動失敗", + "Download Completed": "下載完成", + "Open": "開啟" } From f58c59553f8b1479f5923bde64ce2a91d669a78b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?K=C3=A9vin=20C?= Date: Wed, 1 Jul 2020 07:57:15 +0000 Subject: [PATCH 10/22] Translated using Weblate (French) Currently translated at 100.0% (35 of 35 strings) Translation: Riot Web/riot-web Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/fr/ --- src/i18n/strings/fr.json | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json index 611ba14e5c..63ee73c169 100644 --- a/src/i18n/strings/fr.json +++ b/src/i18n/strings/fr.json @@ -36,5 +36,7 @@ "I understand the risks and wish to continue": "Je comprends les risques et souhaite continuer", "Go to Riot.im": "Aller vers Riot.im", "Failed to start": "Échec au démarrage", - "Riot Desktop (%(platformName)s)": "Riot pour bureau (%(platformName)s)" + "Riot Desktop (%(platformName)s)": "Riot pour bureau (%(platformName)s)", + "Download Completed": "Téléchargement terminé", + "Open": "Ouvrir" } From 2c0fef92ef4f191e52c8c26009f0f55e3e3ecec9 Mon Sep 17 00:00:00 2001 From: XoseM Date: Wed, 1 Jul 2020 05:15:25 +0000 Subject: [PATCH 11/22] Translated using Weblate (Galician) Currently translated at 100.0% (35 of 35 strings) Translation: Riot Web/riot-web Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/gl/ --- src/i18n/strings/gl.json | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/i18n/strings/gl.json b/src/i18n/strings/gl.json index b24f4fcb8a..ed4667d029 100644 --- a/src/i18n/strings/gl.json +++ b/src/i18n/strings/gl.json @@ -36,5 +36,7 @@ "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.": "Podes continuar co teu navegador, pero algunhas características poderían non funcionar e o aspecto da aplicación podería non ser o correcto.", "I understand the risks and wish to continue": "Entendo os riscos e desexo continuar", "Go to Riot.im": "Ir a Riot.im", - "Failed to start": "Fallou o inicio" + "Failed to start": "Fallou o inicio", + "Download Completed": "Descarga realizada", + "Open": "Abrir" } From 0dc9cdadf93d7218a0987c59d5296c8ca230250f Mon Sep 17 00:00:00 2001 From: Szimszon Date: Wed, 1 Jul 2020 07:43:33 +0000 Subject: [PATCH 12/22] Translated using Weblate (Hungarian) Currently translated at 100.0% (35 of 35 strings) Translation: Riot Web/riot-web Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/hu/ --- src/i18n/strings/hu.json | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/i18n/strings/hu.json b/src/i18n/strings/hu.json index e9017b8184..8925b27ef2 100644 --- a/src/i18n/strings/hu.json +++ b/src/i18n/strings/hu.json @@ -36,5 +36,7 @@ "You can continue using your current browser, but some or all features may not work and the look and feel of the application may be incorrect.": "Folytathatod a jelenlegi böngésződdel, de néhány vagy az összes funkció használhatatlan lehet, vagy hibák lehetnek az alkalmazás kinézetében és viselkedésében.", "I understand the risks and wish to continue": "Megértettem a kockázatot és folytatom", "Go to Riot.im": "Irány a Riot.im", - "Failed to start": "Az indítás sikertelen" + "Failed to start": "Az indítás sikertelen", + "Download Completed": "A letöltés befejeződött", + "Open": "Megnyitás" } From 003a2942febb66e6abe594e9e501027eb3600898 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Wed, 1 Jul 2020 14:34:47 +0100 Subject: [PATCH 13/22] Upgrade matrix-js-sdk to 7.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 0db981cbda..edaea44c0a 100644 --- a/package.json +++ b/package.json @@ -60,7 +60,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": "7.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", "postcss-easings": "^2.0.0", diff --git a/yarn.lock b/yarn.lock index 95a56a20b4..6bd998369e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6973,6 +6973,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@7.1.0-rc.1: + version "7.1.0-rc.1" + resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-7.1.0-rc.1.tgz#eba6232c5980010783f0d4987421e36d4b365ead" + integrity sha512-h0KmA5RcY7Ui2406Et2plrwQRk8R6r3dBdsihaE6XIbtFaqQgJ4Q/eECFphHU20HA2SXrqXVcgvAIfds5y27aw== + 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 "7.0.0" resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/68c7273f56d5e88b9af783c396963d03e2de4a92" From a14cff6539a2c1b6876b0b05d10b4a82da46ca71 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Wed, 1 Jul 2020 14:37:15 +0100 Subject: [PATCH 14/22] Upgrade matrix-react-sdk to 2.9.0-rc.1 --- package.json | 2 +- yarn.lock | 23 +++++------------------ 2 files changed, 6 insertions(+), 19 deletions(-) diff --git a/package.json b/package.json index edaea44c0a..44b794c445 100644 --- a/package.json +++ b/package.json @@ -61,7 +61,7 @@ "gfm.css": "^1.1.2", "highlight.js": "^9.13.1", "matrix-js-sdk": "7.1.0-rc.1", - "matrix-react-sdk": "github:matrix-org/matrix-react-sdk#develop", + "matrix-react-sdk": "2.9.0-rc.1", "olm": "https://packages.matrix.org/npm/olm/olm-3.1.4.tgz", "postcss-easings": "^2.0.0", "prop-types": "^15.7.2", diff --git a/yarn.lock b/yarn.lock index 6bd998369e..716cb869be 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6988,20 +6988,6 @@ matrix-js-sdk@7.1.0-rc.1: request "^2.88.0" unhomoglyph "^1.0.2" -"matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop": - version "7.0.0" - resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/68c7273f56d5e88b9af783c396963d03e2de4a92" - 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" @@ -7010,9 +6996,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 "2.8.1" - resolved "https://codeload.github.com/matrix-org/matrix-react-sdk/tar.gz/0059d44e1512e87a108b91d93e820b0dcc7be2a9" +matrix-react-sdk@2.9.0-rc.1: + version "2.9.0-rc.1" + resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-2.9.0-rc.1.tgz#7174234c3b37d117f42f59e362b9fd8a9a8c1d99" + integrity sha512-gHdLmgqINvBx0qtqu4A5r3Wlt7oTXjJR7EfNcVGkHmhEBoCl1EL5B20MOy0sE8yBpUXirjerb9TsxuHx6i+/xg== dependencies: "@babel/runtime" "^7.8.3" await-lock "^2.0.1" @@ -7040,7 +7027,7 @@ matrix-mock-request@^1.2.3: is-ip "^2.0.0" linkifyjs "^2.1.6" lodash "^4.17.14" - matrix-js-sdk "github:matrix-org/matrix-js-sdk#develop" + matrix-js-sdk "7.1.0-rc.1" minimist "^1.2.0" pako "^1.0.5" parse5 "^5.1.1" From 82f599714f53bbdbd0e9648bb6e957fa28349348 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Wed, 1 Jul 2020 14:43:56 +0100 Subject: [PATCH 15/22] Prepare changelog for v1.6.8-rc.1 --- CHANGELOG.md | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8303256ef2..a8573d5bed 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,29 @@ +Changes in [1.6.8-rc.1](https://github.com/vector-im/riot-web/releases/tag/v1.6.8-rc.1) (2020-07-01) +==================================================================================================== +[Full Changelog](https://github.com/vector-im/riot-web/compare/v1.6.7...v1.6.8-rc.1) + + * Upgrade to JS SDK 7.1.0-rc.1 and React SDK 2.9.0-rc.1 + * Update from Weblate + [\#14282](https://github.com/vector-im/riot-web/pull/14282) + * Show a download completed toast in electron + [\#14248](https://github.com/vector-im/riot-web/pull/14248) + * Add the new spinner feature labs flag + [\#14213](https://github.com/vector-im/riot-web/pull/14213) + * Fix loading-test for SSO plaf changes + [\#14212](https://github.com/vector-im/riot-web/pull/14212) + * Fix spelling on startup error page + [\#14199](https://github.com/vector-im/riot-web/pull/14199) + * Document fonts in custom theme + [\#14175](https://github.com/vector-im/riot-web/pull/14175) + * Update from Weblate + [\#14129](https://github.com/vector-im/riot-web/pull/14129) + * ElectronPlatform: Implement the isRoomIndexed method. + [\#13957](https://github.com/vector-im/riot-web/pull/13957) + * ElectronPlatform: Add support to set and get the index user version. + [\#14080](https://github.com/vector-im/riot-web/pull/14080) + * Mark the new room list as ready for general testing + [\#14102](https://github.com/vector-im/riot-web/pull/14102) + Changes in [1.6.7](https://github.com/vector-im/riot-web/releases/tag/v1.6.7) (2020-06-29) ========================================================================================== [Full Changelog](https://github.com/vector-im/riot-web/compare/v1.6.6...v1.6.7) From 1726615b8af84ed86de5bf6b8555f980c1802083 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Wed, 1 Jul 2020 14:43:57 +0100 Subject: [PATCH 16/22] v1.6.8-rc.1 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 44b794c445..77bce79124 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "riot-web", "productName": "Riot", - "version": "1.6.7", + "version": "1.6.8-rc.1", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "repository": { From 14fc25e635f918d49d748f781d380df520e0dd49 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Fri, 3 Jul 2020 13:30:52 +0100 Subject: [PATCH 17/22] Upgrade matrix-js-sdk to 7.1.0 --- package.json | 2 +- yarn.lock | 15 +++++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index 77bce79124..3491c288f7 100644 --- a/package.json +++ b/package.json @@ -60,7 +60,7 @@ "browser-request": "^0.3.3", "gfm.css": "^1.1.2", "highlight.js": "^9.13.1", - "matrix-js-sdk": "7.1.0-rc.1", + "matrix-js-sdk": "7.1.0", "matrix-react-sdk": "2.9.0-rc.1", "olm": "https://packages.matrix.org/npm/olm/olm-3.1.4.tgz", "postcss-easings": "^2.0.0", diff --git a/yarn.lock b/yarn.lock index 716cb869be..accf0c0530 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6973,6 +6973,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@7.1.0: + version "7.1.0" + resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-7.1.0.tgz#b3e3304e890df45c827706831748935168ee839f" + integrity sha512-Y+MdOfsVQRGx0KcwSdNtwsFNGWUF7Zi7wPxUSa050J8eBlbkXUNFAyuSWviLJ5pUwzmp9XMEKD9Cdv+tGZG1ww== + 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@7.1.0-rc.1: version "7.1.0-rc.1" resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-7.1.0-rc.1.tgz#eba6232c5980010783f0d4987421e36d4b365ead" From 7815810cf837e244e384193103537346da6109d4 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Fri, 3 Jul 2020 13:31:26 +0100 Subject: [PATCH 18/22] Upgrade matrix-react-sdk to 2.9.0 --- package.json | 2 +- yarn.lock | 25 +++++-------------------- 2 files changed, 6 insertions(+), 21 deletions(-) diff --git a/package.json b/package.json index 3491c288f7..e9a46fe6de 100644 --- a/package.json +++ b/package.json @@ -61,7 +61,7 @@ "gfm.css": "^1.1.2", "highlight.js": "^9.13.1", "matrix-js-sdk": "7.1.0", - "matrix-react-sdk": "2.9.0-rc.1", + "matrix-react-sdk": "2.9.0", "olm": "https://packages.matrix.org/npm/olm/olm-3.1.4.tgz", "postcss-easings": "^2.0.0", "prop-types": "^15.7.2", diff --git a/yarn.lock b/yarn.lock index accf0c0530..611f7b5dd6 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6988,21 +6988,6 @@ matrix-js-sdk@7.1.0: request "^2.88.0" unhomoglyph "^1.0.2" -matrix-js-sdk@7.1.0-rc.1: - version "7.1.0-rc.1" - resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-7.1.0-rc.1.tgz#eba6232c5980010783f0d4987421e36d4b365ead" - integrity sha512-h0KmA5RcY7Ui2406Et2plrwQRk8R6r3dBdsihaE6XIbtFaqQgJ4Q/eECFphHU20HA2SXrqXVcgvAIfds5y27aw== - 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" @@ -7011,10 +6996,10 @@ matrix-mock-request@^1.2.3: bluebird "^3.5.0" expect "^1.20.2" -matrix-react-sdk@2.9.0-rc.1: - version "2.9.0-rc.1" - resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-2.9.0-rc.1.tgz#7174234c3b37d117f42f59e362b9fd8a9a8c1d99" - integrity sha512-gHdLmgqINvBx0qtqu4A5r3Wlt7oTXjJR7EfNcVGkHmhEBoCl1EL5B20MOy0sE8yBpUXirjerb9TsxuHx6i+/xg== +matrix-react-sdk@2.9.0: + version "2.9.0" + resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-2.9.0.tgz#4086422ee57bcb7f90a9d00e902136459dd78bee" + integrity sha512-SxA6fUuo4DINkNBcEx5nWuvQOo/5fm+oAI3QSECl6uAaefx2qKUc+tsB+Rdqe/IC/h6LDGmg4ljg9iPG95Ebuw== dependencies: "@babel/runtime" "^7.8.3" await-lock "^2.0.1" @@ -7042,7 +7027,7 @@ matrix-react-sdk@2.9.0-rc.1: is-ip "^2.0.0" linkifyjs "^2.1.6" lodash "^4.17.14" - matrix-js-sdk "7.1.0-rc.1" + matrix-js-sdk "7.1.0" minimist "^1.2.0" pako "^1.0.5" parse5 "^5.1.1" From 8e81ee071fc8b6e38dbf129cd6cbb29af19d4e8d Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Fri, 3 Jul 2020 13:33:14 +0100 Subject: [PATCH 19/22] Prepare changelog for v1.6.8 --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index a8573d5bed..40049b6ab5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +Changes in [1.6.8](https://github.com/vector-im/riot-web/releases/tag/v1.6.8) (2020-07-03) +========================================================================================== +[Full Changelog](https://github.com/vector-im/riot-web/compare/v1.6.8-rc.1...v1.6.8) + + * Upgrade to JS SDK 7.1.0 and React SDK 2.9.0 + Changes in [1.6.8-rc.1](https://github.com/vector-im/riot-web/releases/tag/v1.6.8-rc.1) (2020-07-01) ==================================================================================================== [Full Changelog](https://github.com/vector-im/riot-web/compare/v1.6.7...v1.6.8-rc.1) From 1f543994d4aa71b3b06abdac9e4ce23da255274a Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Fri, 3 Jul 2020 13:33:15 +0100 Subject: [PATCH 20/22] v1.6.8 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index e9a46fe6de..983d8e0616 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "riot-web", "productName": "Riot", - "version": "1.6.8-rc.1", + "version": "1.6.8", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "repository": { From ebe1d7c33678391e6e44f2c38c1ddc69c32d6cfb Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Fri, 3 Jul 2020 13:37:22 +0100 Subject: [PATCH 21/22] Reset matrix-js-sdk back to develop branch --- package.json | 2 +- yarn.lock | 14 ++++++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index 983d8e0616..cc90ace8e3 100644 --- a/package.json +++ b/package.json @@ -60,7 +60,7 @@ "browser-request": "^0.3.3", "gfm.css": "^1.1.2", "highlight.js": "^9.13.1", - "matrix-js-sdk": "7.1.0", + "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop", "matrix-react-sdk": "2.9.0", "olm": "https://packages.matrix.org/npm/olm/olm-3.1.4.tgz", "postcss-easings": "^2.0.0", diff --git a/yarn.lock b/yarn.lock index 611f7b5dd6..67cec34764 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6988,6 +6988,20 @@ matrix-js-sdk@7.1.0: request "^2.88.0" unhomoglyph "^1.0.2" +"matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop": + version "7.1.0" + resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/2a688bdac828dc62916437d83c72cef1e525d5f9" + 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 449ac2e5e4fca6acc789a570b7f75eb4f4dfb2ea Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Fri, 3 Jul 2020 13:37:33 +0100 Subject: [PATCH 22/22] Reset matrix-react-sdk back to develop branch --- package.json | 2 +- yarn.lock | 22 +++------------------- 2 files changed, 4 insertions(+), 20 deletions(-) diff --git a/package.json b/package.json index cc90ace8e3..41f27e93d5 100644 --- a/package.json +++ b/package.json @@ -61,7 +61,7 @@ "gfm.css": "^1.1.2", "highlight.js": "^9.13.1", "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop", - "matrix-react-sdk": "2.9.0", + "matrix-react-sdk": "github:matrix-org/matrix-react-sdk#develop", "olm": "https://packages.matrix.org/npm/olm/olm-3.1.4.tgz", "postcss-easings": "^2.0.0", "prop-types": "^15.7.2", diff --git a/yarn.lock b/yarn.lock index 67cec34764..aaee042a9b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6973,21 +6973,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@7.1.0: - version "7.1.0" - resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-7.1.0.tgz#b3e3304e890df45c827706831748935168ee839f" - integrity sha512-Y+MdOfsVQRGx0KcwSdNtwsFNGWUF7Zi7wPxUSa050J8eBlbkXUNFAyuSWviLJ5pUwzmp9XMEKD9Cdv+tGZG1ww== - 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 "7.1.0" resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/2a688bdac828dc62916437d83c72cef1e525d5f9" @@ -7010,10 +6995,9 @@ matrix-mock-request@^1.2.3: bluebird "^3.5.0" expect "^1.20.2" -matrix-react-sdk@2.9.0: +"matrix-react-sdk@github:matrix-org/matrix-react-sdk#develop": version "2.9.0" - resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-2.9.0.tgz#4086422ee57bcb7f90a9d00e902136459dd78bee" - integrity sha512-SxA6fUuo4DINkNBcEx5nWuvQOo/5fm+oAI3QSECl6uAaefx2qKUc+tsB+Rdqe/IC/h6LDGmg4ljg9iPG95Ebuw== + resolved "https://codeload.github.com/matrix-org/matrix-react-sdk/tar.gz/511e0682fcd49fab9a508c7075b7100cefd4bcc4" dependencies: "@babel/runtime" "^7.8.3" await-lock "^2.0.1" @@ -7041,7 +7025,7 @@ matrix-react-sdk@2.9.0: is-ip "^2.0.0" linkifyjs "^2.1.6" lodash "^4.17.14" - matrix-js-sdk "7.1.0" + matrix-js-sdk "github:matrix-org/matrix-js-sdk#develop" minimist "^1.2.0" pako "^1.0.5" parse5 "^5.1.1"