diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8303256ef2..40049b6ab5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,35 @@
+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)
+
+ * 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)
diff --git a/package.json b/package.json
index 0db981cbda..41f27e93d5 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
{
"name": "riot-web",
"productName": "Riot",
- "version": "1.6.7",
+ "version": "1.6.8",
"description": "A feature-rich client for Matrix.org",
"author": "New Vector Ltd.",
"repository": {
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.",
diff --git a/src/i18n/strings/es.json b/src/i18n/strings/es.json
index 1b1f22fe9c..8bb48e0dba 100644
--- a/src/i18n/strings/es.json
+++ b/src/i18n/strings/es.json
@@ -9,14 +9,14 @@
"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",
"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.",
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"
}
diff --git a/src/i18n/strings/gl.json b/src/i18n/strings/gl.json
index 7b3d5eebc8..ed4667d029 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",
@@ -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"
}
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"
}
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",
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"
}
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"
}
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": "開啟"
}
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, {
diff --git a/yarn.lock b/yarn.lock
index 95a56a20b4..aaee042a9b 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6974,8 +6974,8 @@ mathml-tag-names@^2.1.1:
integrity sha512-APMBEanjybaPzUrfqU0IMU5I0AswKMH7k8OTLs0vvV4KZpExkTkY87nR/zpbuTPj+gARop7aGUbl11pnDfW6xg==
"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"
+ 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"
@@ -6996,8 +6996,8 @@ matrix-mock-request@^1.2.3:
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"
+ version "2.9.0"
+ resolved "https://codeload.github.com/matrix-org/matrix-react-sdk/tar.gz/511e0682fcd49fab9a508c7075b7100cefd4bcc4"
dependencies:
"@babel/runtime" "^7.8.3"
await-lock "^2.0.1"