From 14f5d2a48920cdf70011b2f8bb532c9a036baa1a Mon Sep 17 00:00:00 2001 From: Simone Salsi Date: Wed, 2 May 2018 20:34:00 +0000 Subject: [PATCH 01/66] Translated using Weblate (Italian) Currently translated at 100.0% (37 of 37 strings) Translation: Riot Web/riot-web Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/it/ --- src/i18n/strings/it.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/i18n/strings/it.json b/src/i18n/strings/it.json index 58a812d6..97aaeef1 100644 --- a/src/i18n/strings/it.json +++ b/src/i18n/strings/it.json @@ -34,5 +34,6 @@ "Dev chat for the Riot/Web dev team": "Chat per gli sviluppatori di Riot/Web", "Dev chat for the Dendrite dev team": "Chat per gli sviluppatori di Dendrite", "Lots of rooms already exist in Matrix, linked to existing networks (Slack, IRC, Gitter etc) or independent. Check out the directory!": "Esistono già molte stanze in Matrix, collegate a reti già esistenti (Slack, IRC, Gitter ecc) o indipendenti. Dai un'occhiata all'elenco!", - "You can use the custom server options to sign into other Matrix servers by specifying a different Home server URL.
This allows you to use Riot with an existing Matrix account on a different home server.

You can also set a custom identity server but you won't be able to invite users by email address, or be invited by email address yourself.": "Puoi usare le opzioni server personalizzate per accedere ad altri server Matrix specificando l'indirizzo dell'home server.
Questo permette di usare Matrix con un account esistente su un home server diverso.

È anche possibile impostare un diverso identity server, ma in quel caso non sarà possibile invitare utenti attraverso l'indirizzo e-mail o essere invitati attraverso l'indirizzo e-mail." + "You can use the custom server options to sign into other Matrix servers by specifying a different Home server URL.
This allows you to use Riot with an existing Matrix account on a different home server.

You can also set a custom identity server but you won't be able to invite users by email address, or be invited by email address yourself.": "Puoi usare le opzioni server personalizzate per accedere ad altri server Matrix specificando l'indirizzo dell'home server.
Questo permette di usare Matrix con un account esistente su un home server diverso.

È anche possibile impostare un diverso identity server, ma in quel caso non sarà possibile invitare utenti attraverso l'indirizzo e-mail o essere invitati attraverso l'indirizzo e-mail.", + "Co-ordination for Riot translators": "Coordinazione per i traduttori di Riot" } From 1bfe4513ac1f05fda82ca65403393221d380614c Mon Sep 17 00:00:00 2001 From: David Baker Date: Thu, 24 May 2018 18:24:20 +0100 Subject: [PATCH 02/66] js-sdk & react-sdk RCs --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index e78e45e2..586265ff 100644 --- a/package.json +++ b/package.json @@ -64,8 +64,8 @@ "gemini-scrollbar": "matrix-org/gemini-scrollbar#b302279", "gfm.css": "^1.1.1", "highlight.js": "^9.0.0", - "matrix-js-sdk": "0.10.2", - "matrix-react-sdk": "0.12.5", + "matrix-js-sdk": "0.10.3-rc.1", + "matrix-react-sdk": "0.12.6-rc.1", "modernizr": "^3.1.0", "prop-types": "^15.5.10", "react": "^15.6.0", From 5f6b60370d48384d0411d465f72c5a45ec7be46f Mon Sep 17 00:00:00 2001 From: David Baker Date: Thu, 24 May 2018 18:24:59 +0100 Subject: [PATCH 03/66] v0.15.4-rc.1 --- electron_app/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/electron_app/package.json b/electron_app/package.json index 10cd9331..60faf72f 100644 --- a/electron_app/package.json +++ b/electron_app/package.json @@ -2,7 +2,7 @@ "name": "riot-web", "productName": "Riot", "main": "src/electron-main.js", - "version": "0.15.3", + "version": "0.15.4-rc.1", "description": "A feature-rich client for Matrix.org", "author": "Vector Creations Ltd.", "dependencies": { From 10881587e98739da059469392fc444069bb62f04 Mon Sep 17 00:00:00 2001 From: David Baker Date: Thu, 24 May 2018 18:25:35 +0100 Subject: [PATCH 04/66] electron 2.0.2 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index e78e45e2..3accf5f5 100644 --- a/package.json +++ b/package.json @@ -144,7 +144,7 @@ "build": { "appId": "im.riot.app", "category": "Network", - "electronVersion": "2.0.1", + "electronVersion": "2.0.2", "//asar=false": "https://github.com/electron-userland/electron-builder/issues/675", "asar": false, "dereference": true, From 581c95d0935b12064b176c4632d255b05c75b221 Mon Sep 17 00:00:00 2001 From: David Baker Date: Thu, 24 May 2018 18:26:43 +0100 Subject: [PATCH 05/66] Temporarily revert electron version bump --- electron_app/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/electron_app/package.json b/electron_app/package.json index 60faf72f..10cd9331 100644 --- a/electron_app/package.json +++ b/electron_app/package.json @@ -2,7 +2,7 @@ "name": "riot-web", "productName": "Riot", "main": "src/electron-main.js", - "version": "0.15.4-rc.1", + "version": "0.15.3", "description": "A feature-rich client for Matrix.org", "author": "Vector Creations Ltd.", "dependencies": { From bd3eedbda9956ec7ec29c0f65006fb2aabb2943d Mon Sep 17 00:00:00 2001 From: David Baker Date: Thu, 24 May 2018 18:27:06 +0100 Subject: [PATCH 06/66] v0.15.4-rc.1 --- electron_app/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/electron_app/package.json b/electron_app/package.json index 10cd9331..60faf72f 100644 --- a/electron_app/package.json +++ b/electron_app/package.json @@ -2,7 +2,7 @@ "name": "riot-web", "productName": "Riot", "main": "src/electron-main.js", - "version": "0.15.3", + "version": "0.15.4-rc.1", "description": "A feature-rich client for Matrix.org", "author": "Vector Creations Ltd.", "dependencies": { From b6fa68370b13a0ac617b607687ce0a426e8a9b94 Mon Sep 17 00:00:00 2001 From: David Baker Date: Thu, 24 May 2018 18:28:44 +0100 Subject: [PATCH 07/66] Prepare changelog for v0.15.4-rc.1 --- CHANGELOG.md | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index a6aa51f6..df20c779 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,18 @@ +Changes in [0.15.4-rc.1](https://github.com/vector-im/riot-web/releases/tag/v0.15.4-rc.1) (2018-05-24) +====================================================================================================== +[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.15.3...v0.15.4-rc.1) + + * Update from Weblate. + [\#6792](https://github.com/vector-im/riot-web/pull/6792) + * Hide URL options for e2e blob: URL images + [\#6765](https://github.com/vector-im/riot-web/pull/6765) + * Fix right click menu in electron + [\#6763](https://github.com/vector-im/riot-web/pull/6763) + * Update to electron 2.0.1 + [\#6764](https://github.com/vector-im/riot-web/pull/6764) + * Add instructions for changing translated strings + [\#6528](https://github.com/vector-im/riot-web/pull/6528) + Changes in [0.15.3](https://github.com/vector-im/riot-web/releases/tag/v0.15.3) (2018-05-18) ============================================================================================ [Full Changelog](https://github.com/vector-im/riot-web/compare/v0.15.2...v0.15.3) From 93ea9d7c3669b4890e8154c86ec2fb97b2535aa7 Mon Sep 17 00:00:00 2001 From: David Baker Date: Thu, 24 May 2018 18:28:44 +0100 Subject: [PATCH 08/66] v0.15.4-rc.1 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 12cb8d99..29de88d5 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "riot-web", "productName": "Riot", "main": "electron_app/src/electron-main.js", - "version": "0.15.3", + "version": "0.15.4-rc.1", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "repository": { From 05e0e842d6aca188ecad64d7f2064b3de168be86 Mon Sep 17 00:00:00 2001 From: David Baker Date: Fri, 25 May 2018 10:00:44 +0100 Subject: [PATCH 09/66] Add cookie policy URL to electron config --- electron_app/riot.im/config.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/electron_app/riot.im/config.json b/electron_app/riot.im/config.json index 099db1b5..10b453a4 100644 --- a/electron_app/riot.im/config.json +++ b/electron_app/riot.im/config.json @@ -18,7 +18,8 @@ }, "piwik": { "url": "https://piwik.riot.im/", - "siteId": 1 + "siteId": 1, + "policyUrl": "https://matrix.org/docs/guides/riot_im_cookie_policy" }, "enable_presence_by_hs_url": { "https://matrix.org": false From 57c79c7133f65066455b5dafbe23b048377f41bd Mon Sep 17 00:00:00 2001 From: David Baker Date: Fri, 25 May 2018 15:22:39 +0100 Subject: [PATCH 10/66] released react-sdk & js-sdk --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 29de88d5..804e7418 100644 --- a/package.json +++ b/package.json @@ -64,8 +64,8 @@ "gemini-scrollbar": "matrix-org/gemini-scrollbar#b302279", "gfm.css": "^1.1.1", "highlight.js": "^9.0.0", - "matrix-js-sdk": "0.10.3-rc.1", - "matrix-react-sdk": "0.12.6-rc.1", + "matrix-js-sdk": "0.10.3", + "matrix-react-sdk": "0.12.6", "modernizr": "^3.1.0", "prop-types": "^15.5.10", "react": "^15.6.0", From 07772ef5a288f1e4d969f4f2a515bc4b9bd4d674 Mon Sep 17 00:00:00 2001 From: David Baker Date: Fri, 25 May 2018 15:23:18 +0100 Subject: [PATCH 11/66] v0.15.4 --- electron_app/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/electron_app/package.json b/electron_app/package.json index 60faf72f..babd9a8a 100644 --- a/electron_app/package.json +++ b/electron_app/package.json @@ -2,7 +2,7 @@ "name": "riot-web", "productName": "Riot", "main": "src/electron-main.js", - "version": "0.15.4-rc.1", + "version": "0.15.4", "description": "A feature-rich client for Matrix.org", "author": "Vector Creations Ltd.", "dependencies": { From ddbac1ad9f12926949d4864dab6e18b04bb3fb05 Mon Sep 17 00:00:00 2001 From: David Baker Date: Fri, 25 May 2018 15:25:09 +0100 Subject: [PATCH 12/66] Prepare changelog for v0.15.4 --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index df20c779..4ed95690 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +Changes in [0.15.4](https://github.com/vector-im/riot-web/releases/tag/v0.15.4) (2018-05-25) +============================================================================================ +[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.15.4-rc.1...v0.15.4) + + * Add cookie policy link to desktop app config + Changes in [0.15.4-rc.1](https://github.com/vector-im/riot-web/releases/tag/v0.15.4-rc.1) (2018-05-24) ====================================================================================================== [Full Changelog](https://github.com/vector-im/riot-web/compare/v0.15.3...v0.15.4-rc.1) From a4b58f4d83e325f4ee7fc8ac8581ac0af91ab291 Mon Sep 17 00:00:00 2001 From: David Baker Date: Fri, 25 May 2018 15:25:10 +0100 Subject: [PATCH 13/66] v0.15.4 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 804e7418..0bb8b35f 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "riot-web", "productName": "Riot", "main": "electron_app/src/electron-main.js", - "version": "0.15.4-rc.1", + "version": "0.15.4", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "repository": { From fb7a8b76967d3cf6ab690b7bf4820f5d82d89758 Mon Sep 17 00:00:00 2001 From: Iulian Date: Sat, 26 May 2018 03:41:22 +0000 Subject: [PATCH 14/66] Added translation using Weblate (Romanian) --- src/i18n/strings/ro.json | 1 + 1 file changed, 1 insertion(+) create mode 100644 src/i18n/strings/ro.json diff --git a/src/i18n/strings/ro.json b/src/i18n/strings/ro.json new file mode 100644 index 00000000..9e26dfee --- /dev/null +++ b/src/i18n/strings/ro.json @@ -0,0 +1 @@ +{} \ No newline at end of file From ca2533cafaa0fde625affe8785cf07edff324ac5 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Sat, 26 May 2018 14:00:45 +0100 Subject: [PATCH 15/66] delint Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- electron_app/src/electron-main.js | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/electron_app/src/electron-main.js b/electron_app/src/electron-main.js index 4ffe2110..c84fcb73 100644 --- a/electron_app/src/electron-main.js +++ b/electron_app/src/electron-main.js @@ -145,7 +145,9 @@ electron.ipcMain.on('settings_get', async function(ev) { })); ev.sender.send('settings', data); - } catch(e) { console.error(e); } + } catch (e) { + console.error(e); + } }); electron.ipcMain.on('settings_set', function(ev, key, value) { @@ -156,17 +158,18 @@ electron.ipcMain.on('settings_set', function(ev, key, value) { }); electron.app.on('ready', () => { - if (argv.devtools) { try { - const { default: installExtension, REACT_DEVELOPER_TOOLS, REACT_PERF } = require('electron-devtools-installer'); - installExtension(REACT_DEVELOPER_TOOLS) + const { default: installExt, REACT_DEVELOPER_TOOLS, REACT_PERF } = require('electron-devtools-installer'); + installExt(REACT_DEVELOPER_TOOLS) .then((name) => console.log(`Added Extension: ${name}`)) .catch((err) => console.log('An error occurred: ', err)); - installExtension(REACT_PERF) + installExt(REACT_PERF) .then((name) => console.log(`Added Extension: ${name}`)) .catch((err) => console.log('An error occurred: ', err)); - } catch(e) {console.log(e);} + } catch (e) { + console.log(e); + } } From 8a4a6b2023d86f86427ee7984d0a51e9302deefb Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Sat, 26 May 2018 14:21:38 +0100 Subject: [PATCH 16/66] refactor hidden logic to be more resilient against electron weirdness Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- electron_app/src/electron-main.js | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/electron_app/src/electron-main.js b/electron_app/src/electron-main.js index c84fcb73..d9473dcf 100644 --- a/electron_app/src/electron-main.js +++ b/electron_app/src/electron-main.js @@ -101,6 +101,9 @@ electron.ipcMain.on('app_onAction', function(ev, payload) { electron.app.commandLine.appendSwitch('--enable-usermedia-screen-capturing'); const shouldQuit = electron.app.makeSingleInstance((commandLine, workingDirectory) => { + // If other instance launched with --hidden then skip showing window + if (commandLine.includes('--hidden')) return; + // Someone tried to run a second instance, we should focus our window. if (mainWindow) { if (!mainWindow.isVisible()) mainWindow.show(); @@ -211,11 +214,17 @@ electron.app.on('ready', () => { brand: vectorConfig.brand || 'Riot', }); - if (!argv.hidden) { - mainWindow.once('ready-to-show', () => { + mainWindow.once('ready-to-show', () => { + mainWindowState.manage(mainWindow); + + if (!argv.hidden) { + console.log("Showing window"); mainWindow.show(); - }); - } + } else { + // hide here explicitly because window manage above sometimes shows it + mainWindow.hide(); + } + }); mainWindow.on('closed', () => { mainWindow = global.mainWindow = null; @@ -243,7 +252,6 @@ electron.app.on('ready', () => { } webContentsHandler(mainWindow.webContents); - mainWindowState.manage(mainWindow); }); electron.app.on('window-all-closed', () => { From 20dd2c0b585054e979901d9e9b6e0980b0e6c313 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Sat, 26 May 2018 14:36:25 +0100 Subject: [PATCH 17/66] tidy code Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- electron_app/src/electron-main.js | 58 +++++++++++++++---------------- 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/electron_app/src/electron-main.js b/electron_app/src/electron-main.js index d9473dcf..c5448cd3 100644 --- a/electron_app/src/electron-main.js +++ b/electron_app/src/electron-main.js @@ -23,7 +23,7 @@ const checkSquirrelHooks = require('./squirrelhooks'); if (checkSquirrelHooks()) return; const argv = require('minimist')(process.argv); -const electron = require('electron'); +const {app, ipcMain, powerSaveBlocker, BrowserWindow, Menu} = require('electron'); const AutoLaunch = require('auto-launch'); const tray = require('./tray'); @@ -33,8 +33,8 @@ const updater = require('./updater'); const windowStateKeeper = require('electron-window-state'); -if (argv.profile) { - electron.app.setPath('userData', `${electron.app.getPath('userData')}-${argv.profile}`); +if (argv['profile']) { + app.setPath('userData', `${app.getPath('userData')}-${argv['profile']}`); } let vectorConfig = {}; @@ -62,14 +62,14 @@ process.on('uncaughtException', function(error) { }); let focusHandlerAttached = false; -electron.ipcMain.on('setBadgeCount', function(ev, count) { - electron.app.setBadgeCount(count); - if (count === 0) { +ipcMain.on('setBadgeCount', function(ev, count) { + app.setBadgeCount(count); + if (count === 0 && mainWindow) { mainWindow.flashFrame(false); } }); -electron.ipcMain.on('loudNotification', function() { +ipcMain.on('loudNotification', function() { if (process.platform === 'win32' && mainWindow && !mainWindow.isFocused() && !focusHandlerAttached) { mainWindow.flashFrame(true); mainWindow.once('focus', () => { @@ -81,16 +81,16 @@ electron.ipcMain.on('loudNotification', function() { }); let powerSaveBlockerId; -electron.ipcMain.on('app_onAction', function(ev, payload) { +ipcMain.on('app_onAction', function(ev, payload) { switch (payload.action) { case 'call_state': - if (powerSaveBlockerId && electron.powerSaveBlocker.isStarted(powerSaveBlockerId)) { + if (powerSaveBlockerId && powerSaveBlocker.isStarted(powerSaveBlockerId)) { if (payload.state === 'ended') { - electron.powerSaveBlocker.stop(powerSaveBlockerId); + powerSaveBlocker.stop(powerSaveBlockerId); } } else { if (payload.state === 'connected') { - powerSaveBlockerId = electron.powerSaveBlocker.start('prevent-display-sleep'); + powerSaveBlockerId = powerSaveBlocker.start('prevent-display-sleep'); } } break; @@ -98,9 +98,9 @@ electron.ipcMain.on('app_onAction', function(ev, payload) { }); -electron.app.commandLine.appendSwitch('--enable-usermedia-screen-capturing'); +app.commandLine.appendSwitch('--enable-usermedia-screen-capturing'); -const shouldQuit = electron.app.makeSingleInstance((commandLine, workingDirectory) => { +const shouldQuit = app.makeSingleInstance((commandLine, workingDirectory) => { // If other instance launched with --hidden then skip showing window if (commandLine.includes('--hidden')) return; @@ -114,7 +114,7 @@ const shouldQuit = electron.app.makeSingleInstance((commandLine, workingDirector if (shouldQuit) { console.log('Other instance detected: exiting'); - electron.app.exit(); + app.exit(); } @@ -139,7 +139,7 @@ const settings = { }, }; -electron.ipcMain.on('settings_get', async function(ev) { +ipcMain.on('settings_get', async function(ev) { const data = {}; try { @@ -153,15 +153,15 @@ electron.ipcMain.on('settings_get', async function(ev) { } }); -electron.ipcMain.on('settings_set', function(ev, key, value) { +ipcMain.on('settings_set', function(ev, key, value) { console.log(key, value); if (settings[key] && settings[key].set) { settings[key].set(value); } }); -electron.app.on('ready', () => { - if (argv.devtools) { +app.on('ready', () => { + if (argv['devtools']) { try { const { default: installExt, REACT_DEVELOPER_TOOLS, REACT_PERF } = require('electron-devtools-installer'); installExt(REACT_DEVELOPER_TOOLS) @@ -176,9 +176,9 @@ electron.app.on('ready', () => { } - if (vectorConfig.update_base_url) { - console.log(`Starting auto update with base URL: ${vectorConfig.update_base_url}`); - updater.start(vectorConfig.update_base_url); + if (vectorConfig['update_base_url']) { + console.log(`Starting auto update with base URL: ${vectorConfig['update_base_url']}`); + updater.start(vectorConfig['update_base_url']); } else { console.log('No update_base_url is defined: auto update is disabled'); } @@ -191,7 +191,7 @@ electron.app.on('ready', () => { defaultHeight: 768, }); - mainWindow = global.mainWindow = new electron.BrowserWindow({ + mainWindow = global.mainWindow = new BrowserWindow({ icon: iconPath, show: false, autoHideMenuBar: true, @@ -202,7 +202,7 @@ electron.app.on('ready', () => { height: mainWindowState.height, }); mainWindow.loadURL(`file://${__dirname}/../../webapp/index.html`); - electron.Menu.setApplicationMenu(vectorMenu); + Menu.setApplicationMenu(vectorMenu); // explicitly hide because setApplicationMenu on Linux otherwise shows... // https://github.com/electron/electron/issues/9621 @@ -217,7 +217,7 @@ electron.app.on('ready', () => { mainWindow.once('ready-to-show', () => { mainWindowState.manage(mainWindow); - if (!argv.hidden) { + if (!argv['hidden']) { console.log("Showing window"); mainWindow.show(); } else { @@ -254,15 +254,15 @@ electron.app.on('ready', () => { webContentsHandler(mainWindow.webContents); }); -electron.app.on('window-all-closed', () => { - electron.app.quit(); +app.on('window-all-closed', () => { + app.quit(); }); -electron.app.on('activate', () => { +app.on('activate', () => { mainWindow.show(); }); -electron.app.on('before-quit', () => { +app.on('before-quit', () => { global.appQuitting = true; if (mainWindow) { mainWindow.webContents.send('before-quit'); @@ -273,4 +273,4 @@ electron.app.on('before-quit', () => { // installer uses for the shortcut icon. // This makes notifications work on windows 8.1 (and is // a noop on other platforms). -electron.app.setAppUserModelId('com.squirrel.riot-web.Riot'); +app.setAppUserModelId('com.squirrel.riot-web.Riot'); From e0bb6183a6aa8dff65b0dc9643fa27cb8dbb8337 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Sat, 26 May 2018 14:37:04 +0100 Subject: [PATCH 18/66] remove debug log Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- electron_app/src/electron-main.js | 1 - 1 file changed, 1 deletion(-) diff --git a/electron_app/src/electron-main.js b/electron_app/src/electron-main.js index c5448cd3..85955392 100644 --- a/electron_app/src/electron-main.js +++ b/electron_app/src/electron-main.js @@ -218,7 +218,6 @@ app.on('ready', () => { mainWindowState.manage(mainWindow); if (!argv['hidden']) { - console.log("Showing window"); mainWindow.show(); } else { // hide here explicitly because window manage above sometimes shows it From b80180df22f0310444d86096711a28fbb2e70d52 Mon Sep 17 00:00:00 2001 From: Joachim Nielandt Date: Tue, 19 Dec 2017 17:48:16 +0000 Subject: [PATCH 19/66] Translated using Weblate (Dutch) Currently translated at 100.0% (37 of 37 strings) Translation: Riot Web/riot-web Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/nl/ --- src/i18n/strings/nl.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/i18n/strings/nl.json b/src/i18n/strings/nl.json index c683e2c0..74e21025 100644 --- a/src/i18n/strings/nl.json +++ b/src/i18n/strings/nl.json @@ -34,5 +34,6 @@ "Support for those using, running and writing other bridges": "Ondersteuning voor het gebruiken, draaien en ontwikkelen aan andere bruggen", "Dev chat for the Riot/Web dev team": "Dev-chat voor het Riot/Web ontwikkelteam", "Dev chat for the Dendrite dev team": "Dev-chat voor het Dendrite-ontwikkelteam", - "You can use the custom server options to sign into other Matrix servers by specifying a different Home server URL.
This allows you to use Riot with an existing Matrix account on a different home server.

You can also set a custom identity server but you won't be able to invite users by email address, or be invited by email address yourself.": "Je kan de custom server opties gebruiken om op andere Matrix server in te loggen door een andere Home server URL op te geven.
Dit laat je toe om Riot te gebruiken met een bestaande Matrix account op een andere home server.

Je kan ook een custom identiteits-server opzetten maar dan kan je geen gebruikers uitnodigen via hun email adres, of zelf uitgenodigd worden via je email adres." + "You can use the custom server options to sign into other Matrix servers by specifying a different Home server URL.
This allows you to use Riot with an existing Matrix account on a different home server.

You can also set a custom identity server but you won't be able to invite users by email address, or be invited by email address yourself.": "Je kan de custom server opties gebruiken om op andere Matrix server in te loggen door een andere Home server URL op te geven.
Dit laat je toe om Riot te gebruiken met een bestaande Matrix account op een andere home server.

Je kan ook een custom identiteits-server opzetten maar dan kan je geen gebruikers uitnodigen via hun email adres, of zelf uitgenodigd worden via je email adres.", + "Co-ordination for Riot translators": "Coördinatie voor Riot vertalers" } From 787252ef812d0c71b3534685adfc4a8d1e25a846 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sveinn=20=C3=AD=20Felli?= Date: Mon, 28 May 2018 08:46:13 +0000 Subject: [PATCH 20/66] Translated using Weblate (Icelandic) Currently translated at 100.0% (37 of 37 strings) Translation: Riot Web/riot-web Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/is/ --- src/i18n/strings/is.json | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/src/i18n/strings/is.json b/src/i18n/strings/is.json index 7e9aad3a..92babad1 100644 --- a/src/i18n/strings/is.json +++ b/src/i18n/strings/is.json @@ -23,5 +23,17 @@ "Co-ordination for Riot translators": "Yfirlit fyrir þýðendur Riot", "Search the room directory": "Leita í herbergisskránni", "Building services on Matrix": "Að byggja þjónustur á Matrix", - "Design and implementation of E2E in Matrix": "Hönnun og framkvæmd E2E í Matrix" + "Design and implementation of E2E in Matrix": "Hönnun og framkvæmd E2E í Matrix", + "You can use the custom server options to sign into other Matrix servers by specifying a different Home server URL.
This allows you to use Riot with an existing Matrix account on a different home server.

You can also set a custom identity server but you won't be able to invite users by email address, or be invited by email address yourself.": "Þú getur notað sérsniðna valkosti til að skrá inn á aðra Matrix-vefþjóna með því að tilgreina aðra slóð á Heimavefþjón.
Þetta gerir þér kleift að nota Riot með fyrirliggjandi Matrix notandaaðgangi á öðrum heimaþjóni.

Þú getur líka stillt sérsniðinn auðkenningarþjón, en þá getur þú ekki boðið notendum eftir tölvupóstfangi eða sjálfur fengið boð með tölvupósti.", + "Decentralised, encrypted chat & collaboration powered by [matrix]": "Dulritað dreifvinnsluspjall & samstarfstól keyrt með [matrix]", + "Lots of rooms already exist in Matrix, linked to existing networks (Slack, IRC, Gitter etc) or independent. Check out the directory!": "Margar spjallrásir eru til í Matrix, tengdar við fyrirliggjandi netkerfi (Slack, IRC, Gitter, o.s.frv.) eða óháð. Skoðaðu skráninguna!", + "Community-run support for Synapse": "Aðstoð frá samfélaginu fyrir Synapse", + "Admin support for Dendrite": "Kerfisstjórnarstuðningur fyrir Dendrite", + "Announcements about Synapse releases": "Tilkynningar um Synapse útgáfur", + "Support for those using and running matrix-appservice-irc": "Stuðningur við þá sem nota og keyra matrix-appservice-irc", + "Support for those using the Matrix spec": "Stuðningur við þá sem nota tæknilega Matrix eiginleika", + "Discussion of the Identity Service API": "Umræða um Identity Service API-kerfisviðmót", + "Support for those using, running and writing other bridges": "Stuðningur við þá sem nota, keyra og skrifa aðrar brýr", + "Dev chat for the Riot/Web dev team": "Forritaraspjall fyrir Riot/vefþróunarhópinn", + "Dev chat for the Dendrite dev team": "Forritaraspjall fyrir Dendrite þróunarhópinn" } From 65f101e7bb228d5644e1168c905a5b4d4fec3016 Mon Sep 17 00:00:00 2001 From: Iulian Date: Sat, 26 May 2018 03:43:48 +0000 Subject: [PATCH 21/66] Translated using Weblate (Romanian) Currently translated at 8.1% (3 of 37 strings) Translation: Riot Web/riot-web Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/ro/ --- src/i18n/strings/ro.json | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/i18n/strings/ro.json b/src/i18n/strings/ro.json index 9e26dfee..5a23ed83 100644 --- a/src/i18n/strings/ro.json +++ b/src/i18n/strings/ro.json @@ -1 +1,5 @@ -{} \ No newline at end of file +{ + "Riot is not supported on mobile web. Install the app?": "Riot nu functionează pe mobil. Instalezi aplicaţia?", + "Riot Desktop on %(platformName)s": "Riot Desktop pe %(platformName)s", + "Unknown device": "Device necunoscut" +} From 17180d31d77e3afbc59864facf6dc8bd95968a57 Mon Sep 17 00:00:00 2001 From: Kenneth Larsson Date: Thu, 31 May 2018 09:31:23 +0000 Subject: [PATCH 22/66] Translated using Weblate (Swedish) Currently translated at 100.0% (37 of 37 strings) Translation: Riot Web/riot-web Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/sv/ --- src/i18n/strings/sv.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/i18n/strings/sv.json b/src/i18n/strings/sv.json index eb59cd6f..5251ffa3 100644 --- a/src/i18n/strings/sv.json +++ b/src/i18n/strings/sv.json @@ -27,7 +27,7 @@ "Dev chat for the Riot/Web dev team": "Chatt för utvecklare av Riot/Web", "Dev chat for the Dendrite dev team": "Chatt för utvecklare av Dendrite", "Lots of rooms already exist in Matrix, linked to existing networks (Slack, IRC, Gitter etc) or independent. Check out the directory!": "Många rum finns redan i Matrix, länkade till andra nätverk (Slack, IRC, Gitter etc.) eller fristående. Kolla in katalogen!", - "Decentralised, encrypted chat & collaboration powered by [matrix]": "Decentraliserad, krypterad chatt & samarbete möjliggjort med [matrix]", + "Decentralised, encrypted chat & collaboration powered by [matrix]": "Decentraliserad, krypterad chatt & samarbetsplattform möjliggjort med [matrix]", "Search the room directory": "Sök i rumskatalogen", "Riot/Web & Desktop chat": "Riot/Web & Desktop-chatt", "Riot/iOS & matrix-ios-sdk chat": "Riot/iOS & matrix-ios-sdk-chatt", From 1ed2935eb6658604db0e5eddb1487df9026c5eb7 Mon Sep 17 00:00:00 2001 From: David Baker Date: Wed, 6 Jun 2018 16:08:47 +0100 Subject: [PATCH 23/66] react-sdk & js-sdk rc.1 --- package-lock.json | 2 +- package.json | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index f3f58e50..6d73381f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "riot-web", - "version": "0.12.2", + "version": "0.15.4", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 0bb8b35f..9e20d752 100644 --- a/package.json +++ b/package.json @@ -64,8 +64,8 @@ "gemini-scrollbar": "matrix-org/gemini-scrollbar#b302279", "gfm.css": "^1.1.1", "highlight.js": "^9.0.0", - "matrix-js-sdk": "0.10.3", - "matrix-react-sdk": "0.12.6", + "matrix-js-sdk": "0.10.4-rc.1", + "matrix-react-sdk": "0.12.7-rc.1", "modernizr": "^3.1.0", "prop-types": "^15.5.10", "react": "^15.6.0", From e03248929de8213ce343adb2766a638cc207fa0e Mon Sep 17 00:00:00 2001 From: David Baker Date: Wed, 6 Jun 2018 16:09:22 +0100 Subject: [PATCH 24/66] v0.15.5-rc.1 --- electron_app/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/electron_app/package.json b/electron_app/package.json index babd9a8a..6bb5a878 100644 --- a/electron_app/package.json +++ b/electron_app/package.json @@ -2,7 +2,7 @@ "name": "riot-web", "productName": "Riot", "main": "src/electron-main.js", - "version": "0.15.4", + "version": "0.15.5-rc.1", "description": "A feature-rich client for Matrix.org", "author": "Vector Creations Ltd.", "dependencies": { From 9a3e98ac8f24445f32fb121513c15a3a44869778 Mon Sep 17 00:00:00 2001 From: David Baker Date: Wed, 6 Jun 2018 16:11:57 +0100 Subject: [PATCH 25/66] Prepare changelog for v0.15.5-rc.1 --- CHANGELOG.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4ed95690..82844019 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +Changes in [0.15.5-rc.1](https://github.com/vector-im/riot-web/releases/tag/v0.15.5-rc.1) (2018-06-06) +====================================================================================================== +[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.15.4...v0.15.5-rc.1) + + * Update from Weblate. + [\#6846](https://github.com/vector-im/riot-web/pull/6846) + Changes in [0.15.4](https://github.com/vector-im/riot-web/releases/tag/v0.15.4) (2018-05-25) ============================================================================================ [Full Changelog](https://github.com/vector-im/riot-web/compare/v0.15.4-rc.1...v0.15.4) From 33a2e068f6d0a7d01ece221640786908df934bb2 Mon Sep 17 00:00:00 2001 From: David Baker Date: Wed, 6 Jun 2018 16:11:58 +0100 Subject: [PATCH 26/66] v0.15.5-rc.1 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 9e20d752..1535f6c2 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "riot-web", "productName": "Riot", "main": "electron_app/src/electron-main.js", - "version": "0.15.4", + "version": "0.15.5-rc.1", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "repository": { From 79bc81317df4eea8b9eea8e1fef0caa188800479 Mon Sep 17 00:00:00 2001 From: David Baker Date: Tue, 12 Jun 2018 14:30:44 +0100 Subject: [PATCH 27/66] Released react-sdk & js-sdk --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 1535f6c2..2b1a675a 100644 --- a/package.json +++ b/package.json @@ -64,8 +64,8 @@ "gemini-scrollbar": "matrix-org/gemini-scrollbar#b302279", "gfm.css": "^1.1.1", "highlight.js": "^9.0.0", - "matrix-js-sdk": "0.10.4-rc.1", - "matrix-react-sdk": "0.12.7-rc.1", + "matrix-js-sdk": "0.10.4", + "matrix-react-sdk": "0.12.7", "modernizr": "^3.1.0", "prop-types": "^15.5.10", "react": "^15.6.0", From ef341d43330823e4f9ae52c51a65fc8258082698 Mon Sep 17 00:00:00 2001 From: David Baker Date: Tue, 12 Jun 2018 14:33:22 +0100 Subject: [PATCH 28/66] v0.15.5 --- electron_app/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/electron_app/package.json b/electron_app/package.json index 6bb5a878..910933c1 100644 --- a/electron_app/package.json +++ b/electron_app/package.json @@ -2,7 +2,7 @@ "name": "riot-web", "productName": "Riot", "main": "src/electron-main.js", - "version": "0.15.5-rc.1", + "version": "0.15.5", "description": "A feature-rich client for Matrix.org", "author": "Vector Creations Ltd.", "dependencies": { From 32c66e9d1aec55912cc5405e1590c70d05038fed Mon Sep 17 00:00:00 2001 From: David Baker Date: Tue, 12 Jun 2018 14:36:09 +0100 Subject: [PATCH 29/66] Prepare changelog for v0.15.5 --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 82844019..7d5e870d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +Changes in [0.15.5](https://github.com/vector-im/riot-web/releases/tag/v0.15.5) (2018-06-12) +============================================================================================ +[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.15.5-rc.1...v0.15.5) + + * No changes since rc.1 + Changes in [0.15.5-rc.1](https://github.com/vector-im/riot-web/releases/tag/v0.15.5-rc.1) (2018-06-06) ====================================================================================================== [Full Changelog](https://github.com/vector-im/riot-web/compare/v0.15.4...v0.15.5-rc.1) From 9dd37ac9e270d9a7f9d5550f5a4858837f025d2d Mon Sep 17 00:00:00 2001 From: David Baker Date: Tue, 12 Jun 2018 14:36:10 +0100 Subject: [PATCH 30/66] v0.15.5 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 2b1a675a..71f6062c 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "riot-web", "productName": "Riot", "main": "electron_app/src/electron-main.js", - "version": "0.15.5-rc.1", + "version": "0.15.5", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "repository": { From 5d7fb0e3888b8f415c58b311534ea21d851d61e6 Mon Sep 17 00:00:00 2001 From: Yao Wei Date: Thu, 7 Jun 2018 08:29:26 +0000 Subject: [PATCH 31/66] Translated using Weblate (Chinese (Traditional)) Currently translated at 100.0% (37 of 37 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 | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/i18n/strings/zh_Hant.json b/src/i18n/strings/zh_Hant.json index 93184603..8670b7b2 100644 --- a/src/i18n/strings/zh_Hant.json +++ b/src/i18n/strings/zh_Hant.json @@ -1,14 +1,14 @@ { - "%(appName)s via %(browserName)s on %(osName)s": "%(appName)s 透過 %(browserName)s 在 %(osName)s", + "%(appName)s via %(browserName)s on %(osName)s": "在 %(osName)s 的 %(browserName)s 上的 %(appName)s", "Custom Server Options": "自訂伺服器選項", - "Dismiss": "無視", - "powered by Matrix": "由 Matrix 架設", + "Dismiss": "關閉", + "powered by Matrix": "由 Matrix 提供", "Unknown device": "未知裝置", - "You need to be using HTTPS to place a screen-sharing call.": "你需要使用 HTTPS 來放置螢幕分享的通話。", - "Riot Desktop on %(platformName)s": "Riot 桌面版在 %(platformName)s", + "You need to be using HTTPS to place a screen-sharing call.": "你需要使用 HTTPS 來撥打螢幕分享的通話。", + "Riot Desktop on %(platformName)s": "%(platformName)s 的 Riot 桌面版", "Riot is not supported on mobile web. Install the app?": "Riot 不支援行動版網頁，要安裝應用程式嗎？", "Welcome to Riot.im": "歡迎來到 Riot.im", - "Decentralised, encrypted chat & collaboration powered by [matrix]": "去中心化、保密的聊天與協作，由 [matrix] 出品", + "Decentralised, encrypted chat & collaboration powered by [matrix]": "去中心化、保密的聊天與協作，由 [matrix] 提供", "Search the room directory": "搜尋聊天室目錄", "Chat with Riot Bot": "與 Riot 機器人聊天", "Get started with some tips from Riot Bot!": "從 Riot 機器人了解使用 Riot 的訣竅吧！", From 9fa5f16ca0cb8462cd4c013f10890c3dde12537f Mon Sep 17 00:00:00 2001 From: Kenneth Larsson Date: Thu, 7 Jun 2018 09:55:43 +0000 Subject: [PATCH 32/66] Translated using Weblate (Swedish) Currently translated at 100.0% (37 of 37 strings) Translation: Riot Web/riot-web Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/sv/ --- src/i18n/strings/sv.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/i18n/strings/sv.json b/src/i18n/strings/sv.json index 5251ffa3..44fa9818 100644 --- a/src/i18n/strings/sv.json +++ b/src/i18n/strings/sv.json @@ -1,12 +1,12 @@ { - "Custom Server Options": "Egna serverinställningar", + "Custom Server Options": "Anpassade serverinställningar", "Dismiss": "Avvisa", "%(appName)s via %(browserName)s on %(osName)s": "%(appName)s via %(browserName)s på %(osName)s", "powered by Matrix": "drivs av Matrix", "Riot Desktop on %(platformName)s": "Riot Desktop på %(platformName)s", "Riot is not supported on mobile web. Install the app?": "Riot stöds inte på mobil-webb. Installera appen?", "Unknown device": "Okänd enhet", - "You need to be using HTTPS to place a screen-sharing call.": "Du måste använda HTTPS för att dela din skärm.", + "You need to be using HTTPS to place a screen-sharing call.": "Du måste använda HTTPS för att ringa med skärmdelning.", "Welcome to Riot.im": "Välkommen till Riot.im", "Chat with Riot Bot": "Chatta med Riot Bot", "Get started with some tips from Riot Bot!": "Kom igång med några tips från Riot Bot!", From 7d47aebfc531ebe11f1061de04cfe79ca0d5b0a0 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Sat, 16 Jun 2018 17:46:56 +0100 Subject: [PATCH 33/66] add override for colour of room tile text within memberinfo (unreadable) Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- res/themes/status/css/_status.scss | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/res/themes/status/css/_status.scss b/res/themes/status/css/_status.scss index cdfd8e56..7e97bb48 100644 --- a/res/themes/status/css/_status.scss +++ b/res/themes/status/css/_status.scss @@ -283,4 +283,8 @@ $progressbar-color: #000; .mx_RoomSubList_chevron { top: 8px ! important; -} \ No newline at end of file +} + +.mx_MemberInfo .mx_RoomTile_name { + color: $primary-fg-color ! important; +} From ef91fce6216bec3c32c80c4a58c779efb3a01e72 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Kozio=C5=82?= Date: Tue, 19 Jun 2018 20:21:14 +0000 Subject: [PATCH 34/66] Translated using Weblate (Polish) Currently translated at 100.0% (37 of 37 strings) Translation: Riot Web/riot-web Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/pl/ --- src/i18n/strings/pl.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/i18n/strings/pl.json b/src/i18n/strings/pl.json index 33e488d5..47c0c7a6 100644 --- a/src/i18n/strings/pl.json +++ b/src/i18n/strings/pl.json @@ -34,5 +34,6 @@ "Dev chat for the Riot/Web dev team": "Czat deweloperów zespołu Riot/Web", "Dev chat for the Dendrite dev team": "Czat deweloperów zespołu Dendrite", "Lots of rooms already exist in Matrix, linked to existing networks (Slack, IRC, Gitter etc) or independent. Check out the directory!": "Matrix ma wiele, już działających pokoi, połączonych z istniejącymi sieciami, takimi jak Slack, IRC lub Gitter, a także wiele zupełnie niezależnych. Możesz przejrzeć je wszystkie w spisie pokoi!", - "You can use the custom server options to sign into other Matrix servers by specifying a different Home server URL.
This allows you to use Riot with an existing Matrix account on a different home server.

You can also set a custom identity server but you won't be able to invite users by email address, or be invited by email address yourself.": "Możesz skorzystać z opcji dedykowanego serwera, aby zalogować się na inne serwery Matrix, podając inny adres URL serwera Domowego.
Pozwala to na używanie Riot z istniejącym kontem Matrix na innym serwerze domowym.

Możesz również ustawić dedykowany serwer tożsamości, ale nie będziesz w stanie zapraszać użytkowników przez adres email, lub otrzymywać zaproszeń na adres email." + "You can use the custom server options to sign into other Matrix servers by specifying a different Home server URL.
This allows you to use Riot with an existing Matrix account on a different home server.

You can also set a custom identity server but you won't be able to invite users by email address, or be invited by email address yourself.": "Możesz skorzystać z opcji niestandardowego serwera, aby zalogować się na inne serwery Matrix, podając inny adres URL serwera domowego.
Pozwala to na używanie Riot z istniejącym kontem Matrix na innym serwerze domowym.

Możesz również ustawić niestandardowy serwer tożsamości, ale nie będziesz w stanie zapraszać użytkowników przez adres e-mail ani otrzymywać zaproszeń na adres e-mail.", + "Co-ordination for Riot translators": "Koordynacja tłumaczy Riot" } From a182174fba0374f0c3497c10b53380f3040f0ee2 Mon Sep 17 00:00:00 2001 From: Sandipan Banerjee Date: Sun, 17 Jun 2018 22:30:46 +0000 Subject: [PATCH 35/66] Translated using Weblate (Bengali (India)) Currently translated at 2.7% (1 of 37 strings) Translation: Riot Web/riot-web Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/bn_IN/ --- src/i18n/strings/bn_IN.json | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/i18n/strings/bn_IN.json b/src/i18n/strings/bn_IN.json index 0967ef42..e2c37d43 100644 --- a/src/i18n/strings/bn_IN.json +++ b/src/i18n/strings/bn_IN.json @@ -1 +1,3 @@ -{} +{ + "Riot is not supported on mobile web. Install the app?": "মোবাইল ওয়েব রায়ট সমর্থন করে না. অ্য়াপ টি ইনস্টল করতে চান?" +} From 47cfe7a877265894893e3dd0b227cea91be6b74c Mon Sep 17 00:00:00 2001 From: Miguel Branco Date: Mon, 18 Jun 2018 15:36:14 +0000 Subject: [PATCH 36/66] Translated using Weblate (Galician) Currently translated at 100.0% (37 of 37 strings) Translation: Riot Web/riot-web Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/gl/ --- src/i18n/strings/gl.json | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/src/i18n/strings/gl.json b/src/i18n/strings/gl.json index e8347d0a..be3e3cc0 100644 --- a/src/i18n/strings/gl.json +++ b/src/i18n/strings/gl.json @@ -4,36 +4,36 @@ "Dismiss": "Rexeitar", "powered by Matrix": "funciona grazas a Matrix", "Riot Desktop on %(platformName)s": "Riot Desktop en %(platformName)s", - "Riot is not supported on mobile web. Install the app?": "Riot no se pode executar na web móbil. Instalar a app?", + "Riot is not supported on mobile web. Install the app?": "Riot non se pode executar na web do móbil. Instalar a aplicación?", "Unknown device": "Dispositivo descoñecido", "You need to be using HTTPS to place a screen-sharing call.": "Precisa utilizar HTTPS para establecer unha chamada de pantalla compartida.", - "Welcome to Riot.im": "Benvida a Riot.im", - "Decentralised, encrypted chat & collaboration powered by [matrix]": "Chat & colaboración descentralizados e cifrados grazas a [matrix]", + "Welcome to Riot.im": "Benvida/o a Riot.im", + "Decentralised, encrypted chat & collaboration powered by [matrix]": "Conversas e colaboración descentralizada e cifrada grazas a [matrix]", "Search the room directory": "Buscar no directorio de salas", - "Chat with Riot Bot": "Chat co Bot de Riot", - "Get started with some tips from Riot Bot!": "Iníciese con algúns consellos do Bot de Riot!", + "Chat with Riot Bot": "Conversa co bot de Riot", + "Get started with some tips from Riot Bot!": "Iníciese con algúns consellos do bot de Riot!", "General discussion about Matrix and Riot": "Discusión xeral sobre Matrix e Riot", - "Discussion of all things Matrix!": "Conversa sobre to o relativo a Matrix!", - "Riot/Web & Desktop chat": "Riot/Web & chat de Escritorio", - "Riot/iOS & matrix-ios-sdk chat": "Riot/iOS & chat matrix-ios-sdk", + "Discussion of all things Matrix!": "Conversa sobre todo o relativo a Matrix!", + "Riot/Web & Desktop chat": "Riot/Web & sala de conversas para escritorio", + "Riot/iOS & matrix-ios-sdk chat": "Riot/iOS & sala de conversas matrix-ios-sdk", "Matrix technical discussions": "Discusións técnicas sobre Matrix", - "Running Matrix services": "Servizos correndo sobre Matrix", + "Running Matrix services": "Servizos que empregan Matrix", "Community-run support for Synapse": "Axuda da comunidade para Synapse", - "Admin support for Dendrite": "Axuda administrador para Dendrite", + "Admin support for Dendrite": "Axuda de administrador para Dendrite", "Announcements about Synapse releases": "Anuncios sobre lanzamentos de Synapse", "Support for those using and running matrix-appservice-irc": "Axuda para quen usa matrix-appservice-irc", "Building services on Matrix": "Deseñando servizos sobre Matrix", - "Support for those using the Matrix spec": "Axuda para quen usa a especificación Matrix", + "Support for those using the Matrix spec": "Axuda para quen usa a especificación de Matrix", "Design and implementation of E2E in Matrix": "Deseño e implementación de E2E en Matrix", "Implementing VR services with Matrix": "Implementando servizos de RV con Matrix", "Implementing VoIP services with Matrix": "Implementación de servizos VoIP con Matrix", - "Discussion of the Identity Service API": "Conversa sobre a Identity Service API", - "Support for those using, running and writing other bridges": "Axuda para que utiliza, executa e desenvolve outras pontes", - "Contributing code to Matrix and Riot": "Contribuíndo ao código en Matrix e Riot", - "Dev chat for the Riot/Web dev team": "Chat para o equipo de desenvolvemento do Riot/Web", - "Dev chat for the Dendrite dev team": "Chat para o equipo de desenvolvemento de Dendrite", - "Lots of rooms already exist in Matrix, linked to existing networks (Slack, IRC, Gitter etc) or independent. Check out the directory!": "Xa existen multitude de salas en Matrix, ligadas a redes existentes (Slack, IRC, Gitter etc) ou independentes. Busque no directorio!", - "Riot/Android & matrix-android-sdk chat": "Chat para Riot/Android & matrix-android-sdk", - "You can use the custom server options to sign into other Matrix servers by specifying a different Home server URL.
This allows you to use Riot with an existing Matrix account on a different home server.

You can also set a custom identity server but you won't be able to invite users by email address, or be invited by email address yourself.": "Vostede pode utilizar as opcións de servidor personalizado para conectarse a outros servidores Matrix indicando o enderezo URL do Servidor.
Esto permítelle utilizar Riot con unha conta Matrix existente en outro servidor.

Tamén pode indicar un servidor de identidade pero non poderá convidar a usarias polo seu enderezo de correo electrónico, o ser convidada vostede por correo electrónico.", - "Co-ordination for Riot translators": "Coordinación para tradutoras de Riot" + "Discussion of the Identity Service API": "Conversa sobre a API do servizo de identificación", + "Support for those using, running and writing other bridges": "Axuda para quen está a utilizar, executar ou desenvolver outras pontes", + "Contributing code to Matrix and Riot": "Contribuíndo ao código de Matrix e Riot", + "Dev chat for the Riot/Web dev team": "Sala de conversa para o equipo de desenvolvemento de Riot/Web", + "Dev chat for the Dendrite dev team": "Sala de conversas para o equipo de desenvolvemento de Dendrite", + "Lots of rooms already exist in Matrix, linked to existing networks (Slack, IRC, Gitter etc) or independent. Check out the directory!": "Xa existen multitude de salas en Matrix ben ligadas a redes existentes (Slack, IRC, Gitter etc) ou ben independentes. Busque no directorio!", + "Riot/Android & matrix-android-sdk chat": "Riot/Android & sala de conversas matrix-android-sdk", + "You can use the custom server options to sign into other Matrix servers by specifying a different Home server URL.
This allows you to use Riot with an existing Matrix account on a different home server.

You can also set a custom identity server but you won't be able to invite users by email address, or be invited by email address yourself.": "Pode utilizar as opcións persoais de servidor para conectarse a outros servidores Matrix indicando o enderezo URL dese servidor.
Isto permítelle utilizar Riot cunha conta Matrix existente en outro servidor.

Tamén pode empregar un servidor personalizado de identidade mais nese caso nin se poderán convidar a outros usuarios empregando os correo electrónicos nin tampouco eles o poderán convidar a vostede por correo.", + "Co-ordination for Riot translators": "Coordinación para tradutora/es de Riot" } From f9e7af6e90ada69cd5560d81db9fc7e8059a623d Mon Sep 17 00:00:00 2001 From: David Baker Date: Thu, 21 Jun 2018 10:09:01 +0100 Subject: [PATCH 37/66] js & react sdk rc.1 --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 71f6062c..01db8709 100644 --- a/package.json +++ b/package.json @@ -64,8 +64,8 @@ "gemini-scrollbar": "matrix-org/gemini-scrollbar#b302279", "gfm.css": "^1.1.1", "highlight.js": "^9.0.0", - "matrix-js-sdk": "0.10.4", - "matrix-react-sdk": "0.12.7", + "matrix-js-sdk": "0.10.5-rc.1", + "matrix-react-sdk": "0.12.8-rc.1", "modernizr": "^3.1.0", "prop-types": "^15.5.10", "react": "^15.6.0", From f9868b6100d5a5d81fd5fa776a4ef47232431739 Mon Sep 17 00:00:00 2001 From: David Baker Date: Thu, 21 Jun 2018 10:18:45 +0100 Subject: [PATCH 38/66] v0.15.6-rc.1 --- electron_app/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/electron_app/package.json b/electron_app/package.json index 910933c1..a0c21800 100644 --- a/electron_app/package.json +++ b/electron_app/package.json @@ -2,7 +2,7 @@ "name": "riot-web", "productName": "Riot", "main": "src/electron-main.js", - "version": "0.15.5", + "version": "0.15.6-rc.1", "description": "A feature-rich client for Matrix.org", "author": "Vector Creations Ltd.", "dependencies": { From f13bf59a82cbe28ec843585edcdace8fa0c98a95 Mon Sep 17 00:00:00 2001 From: David Baker Date: Thu, 21 Jun 2018 10:20:26 +0100 Subject: [PATCH 39/66] Prepare changelog for v0.15.6-rc.1 --- CHANGELOG.md | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7d5e870d..de99e7b9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,12 @@ +Changes in [0.15.6-rc.1](https://github.com/vector-im/riot-web/releases/tag/v0.15.6-rc.1) (2018-06-21) +====================================================================================================== +[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.15.5...v0.15.6-rc.1) + + * Update from Weblate. + [\#6915](https://github.com/vector-im/riot-web/pull/6915) + * [electron] Fix desktop app --hidden flag + [\#6805](https://github.com/vector-im/riot-web/pull/6805) + Changes in [0.15.5](https://github.com/vector-im/riot-web/releases/tag/v0.15.5) (2018-06-12) ============================================================================================ [Full Changelog](https://github.com/vector-im/riot-web/compare/v0.15.5-rc.1...v0.15.5) From ee6fc5859c1efc4734eeda005473826bdf5056fa Mon Sep 17 00:00:00 2001 From: David Baker Date: Thu, 21 Jun 2018 10:20:26 +0100 Subject: [PATCH 40/66] v0.15.6-rc.1 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 01db8709..9d7e7ee8 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "riot-web", "productName": "Riot", "main": "electron_app/src/electron-main.js", - "version": "0.15.5", + "version": "0.15.6-rc.1", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "repository": { From 79cf34b72e8d582279b2b55a6248f458f73d617e Mon Sep 17 00:00:00 2001 From: David Baker Date: Fri, 22 Jun 2018 18:12:41 +0100 Subject: [PATCH 41/66] react-sdk rc.2 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 9d7e7ee8..d8138a15 100644 --- a/package.json +++ b/package.json @@ -65,7 +65,7 @@ "gfm.css": "^1.1.1", "highlight.js": "^9.0.0", "matrix-js-sdk": "0.10.5-rc.1", - "matrix-react-sdk": "0.12.8-rc.1", + "matrix-react-sdk": "0.12.8-rc.2", "modernizr": "^3.1.0", "prop-types": "^15.5.10", "react": "^15.6.0", From 62653d39b347f6568d869a2e8dcd6054b91d2b0b Mon Sep 17 00:00:00 2001 From: David Baker Date: Fri, 22 Jun 2018 18:13:00 +0100 Subject: [PATCH 42/66] v0.15.6-rc.2 --- electron_app/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/electron_app/package.json b/electron_app/package.json index a0c21800..d71f36f8 100644 --- a/electron_app/package.json +++ b/electron_app/package.json @@ -2,7 +2,7 @@ "name": "riot-web", "productName": "Riot", "main": "src/electron-main.js", - "version": "0.15.6-rc.1", + "version": "0.15.6-rc.2", "description": "A feature-rich client for Matrix.org", "author": "Vector Creations Ltd.", "dependencies": { From 41575382ce72680a93120df79b0a815a2c5e4134 Mon Sep 17 00:00:00 2001 From: David Baker Date: Fri, 22 Jun 2018 18:15:33 +0100 Subject: [PATCH 43/66] Prepare changelog for v0.15.6-rc.2 --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index de99e7b9..73380579 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +Changes in [0.15.6-rc.2](https://github.com/vector-im/riot-web/releases/tag/v0.15.6-rc.2) (2018-06-22) +====================================================================================================== +[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.15.6-rc.1...v0.15.6-rc.2) + + * Update to react-sdk rc.2 for fix to slash commands + Changes in [0.15.6-rc.1](https://github.com/vector-im/riot-web/releases/tag/v0.15.6-rc.1) (2018-06-21) ====================================================================================================== [Full Changelog](https://github.com/vector-im/riot-web/compare/v0.15.5...v0.15.6-rc.1) From fb43e49954bb36f6e6277362d505c325569d8a51 Mon Sep 17 00:00:00 2001 From: David Baker Date: Fri, 22 Jun 2018 18:15:34 +0100 Subject: [PATCH 44/66] v0.15.6-rc.2 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index d8138a15..871417d2 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "riot-web", "productName": "Riot", "main": "electron_app/src/electron-main.js", - "version": "0.15.6-rc.1", + "version": "0.15.6-rc.2", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "repository": { From e193b65bc7583a187eb93cdccbccbaa37e2410c1 Mon Sep 17 00:00:00 2001 From: David Baker Date: Fri, 29 Jun 2018 11:54:01 +0100 Subject: [PATCH 45/66] Released js-sdk & react-sdk --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 871417d2..8f4fca70 100644 --- a/package.json +++ b/package.json @@ -64,8 +64,8 @@ "gemini-scrollbar": "matrix-org/gemini-scrollbar#b302279", "gfm.css": "^1.1.1", "highlight.js": "^9.0.0", - "matrix-js-sdk": "0.10.5-rc.1", - "matrix-react-sdk": "0.12.8-rc.2", + "matrix-js-sdk": "0.10.5", + "matrix-react-sdk": "0.12.8", "modernizr": "^3.1.0", "prop-types": "^15.5.10", "react": "^15.6.0", From 3126bf6561dbede3af154ba84f41a898b8e0dd8f Mon Sep 17 00:00:00 2001 From: David Baker Date: Fri, 29 Jun 2018 11:56:19 +0100 Subject: [PATCH 46/66] Prepare changelog for v0.15.6 --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 73380579..da133816 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +Changes in [0.15.6](https://github.com/vector-im/riot-web/releases/tag/v0.15.6) (2018-06-29) +============================================================================================ +[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.15.6-rc.2...v0.15.6) + + * Pull in bug fixes from react-sdk + Changes in [0.15.6-rc.2](https://github.com/vector-im/riot-web/releases/tag/v0.15.6-rc.2) (2018-06-22) ====================================================================================================== [Full Changelog](https://github.com/vector-im/riot-web/compare/v0.15.6-rc.1...v0.15.6-rc.2) From 84fbee085de5786a855373530cd3a7e86bc3a0a3 Mon Sep 17 00:00:00 2001 From: David Baker Date: Fri, 29 Jun 2018 12:01:17 +0100 Subject: [PATCH 47/66] v0.15.6 --- electron_app/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/electron_app/package.json b/electron_app/package.json index d71f36f8..3e841019 100644 --- a/electron_app/package.json +++ b/electron_app/package.json @@ -2,7 +2,7 @@ "name": "riot-web", "productName": "Riot", "main": "src/electron-main.js", - "version": "0.15.6-rc.2", + "version": "0.15.6", "description": "A feature-rich client for Matrix.org", "author": "Vector Creations Ltd.", "dependencies": { From 768e206c4a7c46451217876d7c4e29b714445453 Mon Sep 17 00:00:00 2001 From: David Baker Date: Fri, 29 Jun 2018 12:02:51 +0100 Subject: [PATCH 48/66] v0.15.6 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 8f4fca70..7f2c1510 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "riot-web", "productName": "Riot", "main": "electron_app/src/electron-main.js", - "version": "0.15.6-rc.2", + "version": "0.15.6", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "repository": { From aee6b2846996b37d34472aeffedc9434032131e2 Mon Sep 17 00:00:00 2001 From: David Baker Date: Wed, 4 Jul 2018 11:18:30 +0100 Subject: [PATCH 49/66] Bump electron version --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 7f2c1510..51bc5c45 100644 --- a/package.json +++ b/package.json @@ -144,7 +144,7 @@ "build": { "appId": "im.riot.app", "category": "Network", - "electronVersion": "2.0.2", + "electronVersion": "2.0.4", "//asar=false": "https://github.com/electron-userland/electron-builder/issues/675", "asar": false, "dereference": true, From 6ada5e5b264e2ebbed91613e99ea20d8ade1e069 Mon Sep 17 00:00:00 2001 From: David Baker Date: Wed, 4 Jul 2018 11:26:33 +0100 Subject: [PATCH 50/66] react-sdk rc.1 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 51bc5c45..15089d57 100644 --- a/package.json +++ b/package.json @@ -65,7 +65,7 @@ "gfm.css": "^1.1.1", "highlight.js": "^9.0.0", "matrix-js-sdk": "0.10.5", - "matrix-react-sdk": "0.12.8", + "matrix-react-sdk": "0.12.9-rc.1", "modernizr": "^3.1.0", "prop-types": "^15.5.10", "react": "^15.6.0", From 7e3cb3ba31bc9fda0c33a6067717adc604532239 Mon Sep 17 00:00:00 2001 From: David Baker Date: Wed, 4 Jul 2018 11:27:21 +0100 Subject: [PATCH 51/66] v0.15.7-rc.1 --- electron_app/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/electron_app/package.json b/electron_app/package.json index 3e841019..b7996435 100644 --- a/electron_app/package.json +++ b/electron_app/package.json @@ -2,7 +2,7 @@ "name": "riot-web", "productName": "Riot", "main": "src/electron-main.js", - "version": "0.15.6", + "version": "0.15.7-rc.1", "description": "A feature-rich client for Matrix.org", "author": "Vector Creations Ltd.", "dependencies": { From de713c564f4d89dfea8e1b477c409654ad2fd564 Mon Sep 17 00:00:00 2001 From: David Baker Date: Wed, 4 Jul 2018 11:28:19 +0100 Subject: [PATCH 52/66] Prepare changelog for v0.15.7-rc.1 --- CHANGELOG.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index da133816..f3561e4a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +Changes in [0.15.7-rc.1](https://github.com/vector-im/riot-web/releases/tag/v0.15.7-rc.1) (2018-07-04) +====================================================================================================== +[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.15.6...v0.15.7-rc.1) + + * add override for colour of room tile text within memberinfo (unreadable) + [\#6889](https://github.com/vector-im/riot-web/pull/6889) + Changes in [0.15.6](https://github.com/vector-im/riot-web/releases/tag/v0.15.6) (2018-06-29) ============================================================================================ [Full Changelog](https://github.com/vector-im/riot-web/compare/v0.15.6-rc.2...v0.15.6) From 0de36d331ff5f64caa54eec1d02d8b4fdc8a61af Mon Sep 17 00:00:00 2001 From: David Baker Date: Wed, 4 Jul 2018 11:28:19 +0100 Subject: [PATCH 53/66] v0.15.7-rc.1 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 15089d57..6b79bea9 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "riot-web", "productName": "Riot", "main": "electron_app/src/electron-main.js", - "version": "0.15.6", + "version": "0.15.7-rc.1", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "repository": { From a94f5dd692693f49cbef0fe6e54275dbbfa7c010 Mon Sep 17 00:00:00 2001 From: David Baker Date: Wed, 4 Jul 2018 11:34:55 +0100 Subject: [PATCH 54/66] Update package-lock.json --- package-lock.json | 377 ++++++++++++++++++++++++++++++---------------- 1 file changed, 244 insertions(+), 133 deletions(-) diff --git a/package-lock.json b/package-lock.json index 6d73381f..55170051 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "riot-web", - "version": "0.15.4", + "version": "0.15.6", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -260,6 +260,16 @@ "integrity": "sha1-ml9pkFGx5wczKPKgCJaLZOopVdI=", "dev": true }, + "array-includes": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.0.3.tgz", + "integrity": "sha1-GEtI9i2S10UrsxsyMWXH+L0CJm0=", + "dev": true, + "requires": { + "define-properties": "1.1.2", + "es-abstract": "1.9.0" + } + }, "array-map": { "version": "0.0.0", "resolved": "https://registry.npmjs.org/array-map/-/array-map-0.0.0.tgz", @@ -299,16 +309,6 @@ "integrity": "sha1-odl8yvy8JiXMcPrc6zalDFiwGlM=", "dev": true }, - "array.prototype.find": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/array.prototype.find/-/array.prototype.find-2.0.4.tgz", - "integrity": "sha1-VWpcU2LAhkgyPdrrnenRS8GGTJA=", - "dev": true, - "requires": { - "define-properties": "1.1.2", - "es-abstract": "1.9.0" - } - }, "arraybuffer.slice": { "version": "0.0.6", "resolved": "https://registry.npmjs.org/arraybuffer.slice/-/arraybuffer.slice-0.0.6.tgz", @@ -1877,17 +1877,6 @@ "integrity": "sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs=", "dev": true }, - "commonmark": { - "version": "0.27.0", - "resolved": "https://registry.npmjs.org/commonmark/-/commonmark-0.27.0.tgz", - "integrity": "sha1-2GwmK5YoIelIPGnFR7xYhAwEezQ=", - "requires": { - "entities": "1.1.1", - "mdurl": "1.0.1", - "minimist": "1.2.0", - "string.prototype.repeat": "0.2.0" - } - }, "compare-version": { "version": "0.1.2", "resolved": "https://registry.npmjs.org/compare-version/-/compare-version-0.1.2.tgz", @@ -2414,22 +2403,6 @@ "integrity": "sha1-fyjS657nsVqX79ic5j3P2qPMur8=", "dev": true }, - "disposables": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/disposables/-/disposables-1.0.1.tgz", - "integrity": "sha1-BkcnoltU9QK9griaot+4358bOeM=" - }, - "dnd-core": { - "version": "2.5.4", - "resolved": "https://registry.npmjs.org/dnd-core/-/dnd-core-2.5.4.tgz", - "integrity": "sha512-BcI782MfTm3wCxeIS5c7tAutyTwEIANtuu3W6/xkoJRwiqhRXKX3BbGlycUxxyzMsKdvvoavxgrC3EMPFNYL9A==", - "requires": { - "asap": "2.0.6", - "invariant": "2.2.2", - "lodash": "4.17.4", - "redux": "3.7.2" - } - }, "doctrine": { "version": "1.2.3", "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-1.2.3.tgz", @@ -3202,16 +3175,54 @@ } }, "eslint-plugin-react": { - "version": "6.10.3", - "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-6.10.3.tgz", - "integrity": "sha1-xUNb6wZ3ThLH2y9qut3L+QDNP3g=", + "version": "7.10.0", + "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.10.0.tgz", + "integrity": "sha512-18rzWn4AtbSUxFKKM7aCVcj5LXOhOKdwBino3KKWy4psxfPW0YtIbE8WNRDUdyHFL50BeLb6qFd4vpvNYyp7hw==", "dev": true, "requires": { - "array.prototype.find": "2.0.4", - "doctrine": "1.2.3", - "has": "1.0.1", - "jsx-ast-utils": "1.4.1", - "object.assign": "4.0.4" + "doctrine": "2.1.0", + "has": "1.0.3", + "jsx-ast-utils": "2.0.1", + "prop-types": "15.6.2" + }, + "dependencies": { + "doctrine": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz", + "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==", + "dev": true, + "requires": { + "esutils": "2.0.2" + } + }, + "has": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz", + "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==", + "dev": true, + "requires": { + "function-bind": "1.1.1" + } + }, + "jsx-ast-utils": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/jsx-ast-utils/-/jsx-ast-utils-2.0.1.tgz", + "integrity": "sha1-6AGxs5mF4g//yHtA43SAgOLcrH8=", + "dev": true, + "requires": { + "array-includes": "3.0.3" + } + }, + "prop-types": { + "version": "15.6.2", + "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.6.2.tgz", + "integrity": "sha512-3pboPvLiWD7dkI3qf3KbUe6hKFKa52w+AE0VCqECtf+QHAKgOL37tTaNCnuX1nAAQ4ZhyP+kYVKf8rLmJ/feDQ==", + "dev": true, + "requires": { + "loose-envify": "1.3.1", + "object-assign": "4.1.1" + } + } } }, "espree": { @@ -3699,6 +3710,22 @@ } } }, + "focus-trap": { + "version": "2.4.6", + "resolved": "https://registry.npmjs.org/focus-trap/-/focus-trap-2.4.6.tgz", + "integrity": "sha512-vWZTPtBU6pBoyWZDRZJHkXsyP2ZCZBHE3DRVXnSVdQKH/mcDtu9S5Kz8CUDyIqpfZfLEyI9rjKJLnc4Y40BRBg==", + "requires": { + "tabbable": "1.1.3" + } + }, + "focus-trap-react": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/focus-trap-react/-/focus-trap-react-3.1.2.tgz", + "integrity": "sha512-MoQmONoy9gRPyrC5DGezkcOMGgx7MtIOAQDHe098UtL2sA2vmucJwEmQisb+8LRXNYFHxuw5zJ1oLFeKu4Mteg==", + "requires": { + "focus-trap": "2.4.6" + } + }, "for-in": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz", @@ -4657,8 +4684,7 @@ "tweetnacl": { "version": "0.14.5", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "uid-number": { "version": "0.0.6", @@ -4959,11 +4985,6 @@ "resolved": "https://registry.npmjs.org/hoek/-/hoek-4.2.1.tgz", "integrity": "sha512-QLg82fGkfnJ/4iy1xZ81/9SIJiq1NGFUMGs6ParyjBZr6jW2Ufj/snDqTHixNlHdPNwN2RLVD0Pi3igeK9+JfA==" }, - "hoist-non-react-statics": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-2.3.1.tgz", - "integrity": "sha1-ND24TGAYxlB3iJgkATWhQg7iLOA=" - }, "home-or-tmp": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/home-or-tmp/-/home-or-tmp-2.0.0.tgz", @@ -5696,12 +5717,6 @@ "verror": "1.10.0" } }, - "jsx-ast-utils": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/jsx-ast-utils/-/jsx-ast-utils-1.4.1.tgz", - "integrity": "sha1-OGchPo3Xm/Ho8jAMDPwe+xgsDfE=", - "dev": true - }, "karma": { "version": "1.7.1", "resolved": "https://registry.npmjs.org/karma/-/karma-1.7.1.tgz", @@ -5740,7 +5755,7 @@ "glob": { "version": "7.1.2", "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz", - "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==", + "integrity": "sha1-wZyd+aAocC1nhhI4SmVSQExjbRU=", "dev": true, "requires": { "fs.realpath": "1.0.0", @@ -6049,6 +6064,11 @@ } } }, + "lolex": { + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/lolex/-/lolex-2.3.2.tgz", + "integrity": "sha512-A5pN2tkFj7H0dGIAM6MFvHKMJcPnjZsOMvR7ujCjfgW5TbV6H9vb1PgxLtHvjqNZTHsUolz+6/WEO0N1xNx2ng==" + }, "longest": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/longest/-/longest-1.0.1.tgz", @@ -6108,11 +6128,12 @@ "dev": true }, "matrix-js-sdk": { - "version": "0.8.2", - "resolved": "https://registry.npmjs.org/matrix-js-sdk/-/matrix-js-sdk-0.8.2.tgz", - "integrity": "sha1-e7mrVoXrNCFLOFlMiDn++pY2ViE=", + "version": "0.10.5", + "resolved": "https://registry.npmjs.org/matrix-js-sdk/-/matrix-js-sdk-0.10.5.tgz", + "integrity": "sha512-3Gt3tVKgkn4ufU9qLyrBxQqILZsSK3J58pmL+1IpDYEgA/lLeBPCtl2s5DL/CngjaWg6knph+1ZJO/fznTyTgQ==", "requires": { "another-json": "0.2.0", + "babel-runtime": "6.26.0", "bluebird": "3.5.1", "browser-request": "0.3.3", "content-type": "1.0.4", @@ -6130,9 +6151,9 @@ } }, "matrix-react-sdk": { - "version": "0.10.2", - "resolved": "https://registry.npmjs.org/matrix-react-sdk/-/matrix-react-sdk-0.10.2.tgz", - "integrity": "sha1-TNSwkN1P4Jsl4Yh5Z/XOE17U8q4=", + "version": "0.12.8", + "resolved": "https://registry.npmjs.org/matrix-react-sdk/-/matrix-react-sdk-0.12.8.tgz", + "integrity": "sha512-K7Jpj8me8eywtv1LznGlsjiQGuVWIBXA/afshkRiEuSH13lk+XW8+9eQD+GcyZ0/6ziIkMMrmmgDH5gV0xKorA==", "requires": { "babel-runtime": "6.26.0", "bluebird": "3.5.1", @@ -6140,7 +6161,7 @@ "browser-encrypt-attachment": "0.3.0", "browser-request": "0.3.3", "classnames": "2.2.5", - "commonmark": "0.27.0", + "commonmark": "0.28.1", "counterpart": "0.18.3", "draft-js": "0.11.0-alpha", "draft-js-export-html": "0.6.0", @@ -6149,17 +6170,25 @@ "file-saver": "1.3.3", "filesize": "3.5.6", "flux": "2.1.1", + "focus-trap-react": "3.1.2", "fuse.js": "2.7.4", + "gemini-scrollbar": "github:matrix-org/gemini-scrollbar#b302279810d05319ac5ff1bd34910bff32325c7b", + "gfm.css": "1.1.1", "glob": "5.0.15", - "highlight.js": "8.9.1", + "highlight.js": "9.12.0", "isomorphic-fetch": "2.2.1", "linkifyjs": "2.1.5", "lodash": "4.17.4", - "matrix-js-sdk": "0.8.2", + "lolex": "2.3.2", + "matrix-js-sdk": "0.10.5", "optimist": "0.6.1", + "pako": "1.0.6", "prop-types": "15.6.0", + "qrcode-react": "0.1.16", + "querystring": "0.2.0", "react": "15.6.2", "react-addons-css-transition-group": "15.3.2", + "react-beautiful-dnd": "4.0.1", "react-dom": "15.6.2", "react-gemini-scrollbar": "github:matrix-org/react-gemini-scrollbar#5e97aef7e034efc8db1431f4b0efe3b26e249ae9", "sanitize-html": "1.14.1", @@ -6169,10 +6198,28 @@ "whatwg-fetch": "1.1.1" }, "dependencies": { - "highlight.js": { - "version": "8.9.1", - "resolved": "https://registry.npmjs.org/highlight.js/-/highlight.js-8.9.1.tgz", - "integrity": "sha1-uKnFSTISqTkvAiK2SclhFJfr+4g=" + "commonmark": { + "version": "0.28.1", + "resolved": "https://registry.npmjs.org/commonmark/-/commonmark-0.28.1.tgz", + "integrity": "sha1-Buq41SM4uDn6Gi11rwCF7tGxvq4=", + "requires": { + "entities": "1.1.1", + "mdurl": "1.0.1", + "minimist": "1.2.0", + "string.prototype.repeat": "0.2.0" + } + }, + "react-gemini-scrollbar": { + "version": "github:matrix-org/react-gemini-scrollbar#5e97aef7e034efc8db1431f4b0efe3b26e249ae9", + "requires": { + "gemini-scrollbar": "github:matrix-org/gemini-scrollbar#b302279810d05319ac5ff1bd34910bff32325c7b" + } + }, + "velocity-vector": { + "version": "github:vector-im/velocity#059e3b2348f1110888d033974d3109fd5a3af00f", + "requires": { + "jquery": "3.2.1" + } }, "whatwg-fetch": { "version": "1.1.1", @@ -6202,6 +6249,11 @@ "integrity": "sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g=", "dev": true }, + "memoize-one": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/memoize-one/-/memoize-one-3.1.1.tgz", + "integrity": "sha512-YqVh744GsMlZu6xkhGslPSqSurOv6P+kLN2J3ysBZfagLcL5FdRK/0UpgLoL8hwjjEvvAVkjJZyFP+1T6p1vgA==" + }, "memory-fs": { "version": "0.4.1", "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.4.1.tgz", @@ -6611,25 +6663,6 @@ "integrity": "sha1-KKaq50KN0sOpLz2V8hM13SBOAzY=", "dev": true }, - "object.assign": { - "version": "4.0.4", - "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.0.4.tgz", - "integrity": "sha1-scnMBE7xuf5jYG/BQau7MuFHMMw=", - "dev": true, - "requires": { - "define-properties": "1.1.2", - "function-bind": "1.1.1", - "object-keys": "1.0.11" - }, - "dependencies": { - "object-keys": { - "version": "1.0.11", - "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.0.11.tgz", - "integrity": "sha1-xUYBd4rVYPEULODgG8yotW0TQm0=", - "dev": true - } - } - }, "object.entries": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/object.entries/-/object.entries-1.0.4.tgz", @@ -7322,6 +7355,19 @@ "integrity": "sha1-ZZ3p8s+NzCehSBJ28gU3cnI4LnM=", "dev": true }, + "qr.js": { + "version": "0.0.0", + "resolved": "https://registry.npmjs.org/qr.js/-/qr.js-0.0.0.tgz", + "integrity": "sha1-ys6GOG9ZoNuAUPqQ2baw6IoeNk8=" + }, + "qrcode-react": { + "version": "0.1.16", + "resolved": "https://registry.npmjs.org/qrcode-react/-/qrcode-react-0.1.16.tgz", + "integrity": "sha512-FK+QCfFqCQMSxUE1byzglERJQkwKqXYvYMCS+/Ad2zACJOfoHkHHtRqsQQPji7lfb1y1qCXLvL+3eP1hAfg8Ng==", + "requires": { + "qr.js": "0.0.0" + } + }, "qs": { "version": "6.5.1", "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.1.tgz", @@ -7344,6 +7390,19 @@ "integrity": "sha1-DPf4T5Rj/wrlHExLFC2VvjdyTZw=", "dev": true }, + "raf": { + "version": "3.4.0", + "resolved": "https://registry.npmjs.org/raf/-/raf-3.4.0.tgz", + "integrity": "sha512-pDP/NMRAXoTfrhCfyfSEwJAKLaxBU9eApMeBPB1TkDouZmvPerIClV8lTAd+uF8ZiTaVl69e1FCxQrAd/VTjGw==", + "requires": { + "performance-now": "2.1.0" + } + }, + "raf-schd": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/raf-schd/-/raf-schd-2.1.2.tgz", + "integrity": "sha512-Orl0IEvMtUCgPddgSxtxreK77UiQz4nPYJy9RggVzu4mKsZkQWiAaG1y9HlYWdvm9xtN348xRaT37qkvL/+A+g==" + }, "randomatic": { "version": "1.1.7", "resolved": "https://registry.npmjs.org/randomatic/-/randomatic-1.1.7.tgz", @@ -7448,25 +7507,21 @@ "integrity": "sha1-wStu/cIkfBDae4dw0YUICnsEcVY=", "dev": true }, - "react-dnd": { - "version": "2.5.4", - "resolved": "https://registry.npmjs.org/react-dnd/-/react-dnd-2.5.4.tgz", - "integrity": "sha512-y9YmnusURc+3KPgvhYKvZ9oCucj51MSZWODyaeV0KFU0cquzA7dCD1g/OIYUKtNoZ+MXtacDngkdud2TklMSjw==", + "react-beautiful-dnd": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/react-beautiful-dnd/-/react-beautiful-dnd-4.0.1.tgz", + "integrity": "sha512-d73RMu4QOFCyjUELLWFyY/EuclnfqulI9pECx+2gIuJvV0ycf1uR88o+1x0RSB9ILD70inHMzCBKNkWVbbt+vA==", "requires": { - "disposables": "1.0.1", - "dnd-core": "2.5.4", - "hoist-non-react-statics": "2.3.1", + "babel-runtime": "6.26.0", "invariant": "2.2.2", - "lodash": "4.17.4", - "prop-types": "15.6.0" - } - }, - "react-dnd-html5-backend": { - "version": "2.5.4", - "resolved": "https://registry.npmjs.org/react-dnd-html5-backend/-/react-dnd-html5-backend-2.5.4.tgz", - "integrity": "sha512-jDqAkm/hI8Tl4HcsbhkBgB6HgpJR1e+ML1SbfxaegXYiuMxEVQm0FOwEH5WxUoo6fmIG4N+H0rSm59POuZOCaA==", - "requires": { - "lodash": "4.17.4" + "memoize-one": "3.1.1", + "prop-types": "15.6.0", + "raf-schd": "2.1.2", + "react-motion": "0.5.2", + "react-redux": "5.0.7", + "redux": "3.7.2", + "redux-thunk": "2.3.0", + "reselect": "3.0.1" } }, "react-dom": { @@ -7480,10 +7535,51 @@ "prop-types": "15.6.0" } }, - "react-gemini-scrollbar": { - "version": "github:matrix-org/react-gemini-scrollbar#5e97aef7e034efc8db1431f4b0efe3b26e249ae9", + "react-motion": { + "version": "0.5.2", + "resolved": "https://registry.npmjs.org/react-motion/-/react-motion-0.5.2.tgz", + "integrity": "sha512-9q3YAvHoUiWlP3cK0v+w1N5Z23HXMj4IF4YuvjvWegWqNPfLXsOBE/V7UvQGpXxHFKRQQcNcVQE31g9SB/6qgQ==", "requires": { - "gemini-scrollbar": "github:matrix-org/gemini-scrollbar#b302279810d05319ac5ff1bd34910bff32325c7b" + "performance-now": "0.2.0", + "prop-types": "15.6.0", + "raf": "3.4.0" + }, + "dependencies": { + "performance-now": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-0.2.0.tgz", + "integrity": "sha1-M+8wxcd9TqIcWlOGnZG1bY8lVeU=" + } + } + }, + "react-redux": { + "version": "5.0.7", + "resolved": "https://registry.npmjs.org/react-redux/-/react-redux-5.0.7.tgz", + "integrity": "sha512-5VI8EV5hdgNgyjfmWzBbdrqUkrVRKlyTKk1sGH3jzM2M2Mhj/seQgPXaz6gVAj2lz/nz688AdTqMO18Lr24Zhg==", + "requires": { + "hoist-non-react-statics": "2.5.5", + "invariant": "2.2.2", + "lodash": "4.17.10", + "lodash-es": "4.17.10", + "loose-envify": "1.3.1", + "prop-types": "15.6.0" + }, + "dependencies": { + "hoist-non-react-statics": { + "version": "2.5.5", + "resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-2.5.5.tgz", + "integrity": "sha512-rqcy4pJo55FTTLWt+bU8ukscqHeE/e9KWvsOW2b/a3afxQZhwkQdT1rPPCJ0rYXdj4vNcasY8zHTH+jF/qStxw==" + }, + "lodash": { + "version": "4.17.10", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.10.tgz", + "integrity": "sha512-UejweD1pDoXu+AD825lWwp4ZGtSwgnpZxb3JDViD7StjQz+Nb/6l093lx4OQ0foGWNRoc19mWy7BzL+UAK2iVg==" + }, + "lodash-es": { + "version": "4.17.10", + "resolved": "https://registry.npmjs.org/lodash-es/-/lodash-es-4.17.10.tgz", + "integrity": "sha512-iesFYPmxYYGTcmQK0sL8bX3TGHyM6b2qREaB4kamHfQyfPJP0xgoGxp19nsH16nsfquLdiyKyX3mQkfiSGV8Rg==" + } } }, "read-all-stream": { @@ -7591,6 +7687,11 @@ "symbol-observable": "1.0.4" } }, + "redux-thunk": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/redux-thunk/-/redux-thunk-2.3.0.tgz", + "integrity": "sha512-km6dclyFnmcvxhAcrQV2AkZmPQjzPDjgVlQtR0EQjxZPyJ0BnMf3in1ryuR8A2qU0HldVRfxYXbFSKlI3N7Slw==" + }, "regenerate": { "version": "1.3.3", "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.3.3.tgz", @@ -7863,6 +7964,11 @@ "integrity": "sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8=", "dev": true }, + "reselect": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/reselect/-/reselect-3.0.1.tgz", + "integrity": "sha1-79qpjqdFEyTQkrKyFjpqHXqaIUc=" + }, "resolve": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.4.0.tgz", @@ -8360,30 +8466,36 @@ "dev": true }, "source-map-loader": { - "version": "0.1.6", - "resolved": "https://registry.npmjs.org/source-map-loader/-/source-map-loader-0.1.6.tgz", - "integrity": "sha1-wJkD2m1zueU7ftjuUkVZcFHpjpE=", + "version": "0.2.3", + "resolved": "https://registry.npmjs.org/source-map-loader/-/source-map-loader-0.2.3.tgz", + "integrity": "sha512-MYbFX9DYxmTQFfy2v8FC1XZwpwHKYxg3SK8Wb7VPBKuhDjz8gi9re2819MsG4p49HDyiOSUKlmZ+nQBArW5CGw==", "dev": true, "requires": { - "async": "0.9.2", + "async": "2.6.1", "loader-utils": "0.2.17", - "source-map": "0.1.43" + "source-map": "0.6.1" }, "dependencies": { "async": { - "version": "0.9.2", - "resolved": "https://registry.npmjs.org/async/-/async-0.9.2.tgz", - "integrity": "sha1-rqdNXmHB+JlhO/ZL2mbUx48v0X0=", + "version": "2.6.1", + "resolved": "https://registry.npmjs.org/async/-/async-2.6.1.tgz", + "integrity": "sha512-fNEiL2+AZt6AlAw/29Cr0UDe4sRAHCpEHh54WMz+Bb7QfNcFw4h3loofyJpLeQs4Yx7yuqu/2dLgM5hKOs6HlQ==", + "dev": true, + "requires": { + "lodash": "4.17.10" + } + }, + "lodash": { + "version": "4.17.10", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.10.tgz", + "integrity": "sha512-UejweD1pDoXu+AD825lWwp4ZGtSwgnpZxb3JDViD7StjQz+Nb/6l093lx4OQ0foGWNRoc19mWy7BzL+UAK2iVg==", "dev": true }, "source-map": { - "version": "0.1.43", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.43.tgz", - "integrity": "sha1-wkvBRspRfBRx9drL4lcbK3+eM0Y=", - "dev": true, - "requires": { - "amdefine": "1.0.1" - } + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true } } }, @@ -8582,6 +8694,11 @@ "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-1.0.4.tgz", "integrity": "sha1-Kb9hXUqnEhvdiYsi1LP5vE4qoD0=" }, + "tabbable": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/tabbable/-/tabbable-1.1.3.tgz", + "integrity": "sha512-nOWwx35/JuDI4ONuF0ZTo6lYvI0fY0tZCH1ErzY2EXfu4az50ZyiUX8X073FLiZtmWUVlkRnuXsehjJgCw9tYg==" + }, "table": { "version": "3.8.3", "resolved": "https://registry.npmjs.org/table/-/table-3.8.3.tgz", @@ -9095,12 +9212,6 @@ "integrity": "sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=", "dev": true }, - "velocity-vector": { - "version": "github:vector-im/velocity#059e3b2348f1110888d033974d3109fd5a3af00f", - "requires": { - "jquery": "3.2.1" - } - }, "verror": { "version": "1.10.0", "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz", From 75e9489db574643fe1927cb2484b6b1735728c26 Mon Sep 17 00:00:00 2001 From: David Baker Date: Fri, 6 Jul 2018 15:58:39 +0100 Subject: [PATCH 55/66] js-sdk rc.1 & react-sdk rc.2 --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 6b79bea9..0a68673b 100644 --- a/package.json +++ b/package.json @@ -64,8 +64,8 @@ "gemini-scrollbar": "matrix-org/gemini-scrollbar#b302279", "gfm.css": "^1.1.1", "highlight.js": "^9.0.0", - "matrix-js-sdk": "0.10.5", - "matrix-react-sdk": "0.12.9-rc.1", + "matrix-js-sdk": "0.10.6-rc.1", + "matrix-react-sdk": "0.12.9-rc.2", "modernizr": "^3.1.0", "prop-types": "^15.5.10", "react": "^15.6.0", From d7ebd888049c3e65e228ff0dfb4e6eab4371e2f1 Mon Sep 17 00:00:00 2001 From: David Baker Date: Fri, 6 Jul 2018 15:59:20 +0100 Subject: [PATCH 56/66] v0.15.7-rc.2 --- electron_app/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/electron_app/package.json b/electron_app/package.json index b7996435..4dd12e7e 100644 --- a/electron_app/package.json +++ b/electron_app/package.json @@ -2,7 +2,7 @@ "name": "riot-web", "productName": "Riot", "main": "src/electron-main.js", - "version": "0.15.7-rc.1", + "version": "0.15.7-rc.2", "description": "A feature-rich client for Matrix.org", "author": "Vector Creations Ltd.", "dependencies": { From db3ffd29dacf99d9622dc9b3be36998a139761dc Mon Sep 17 00:00:00 2001 From: David Baker Date: Fri, 6 Jul 2018 16:01:42 +0100 Subject: [PATCH 57/66] Prepare changelog for v0.15.7-rc.2 --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index f3561e4a..264cff68 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +Changes in [0.15.7-rc.2](https://github.com/vector-im/riot-web/releases/tag/v0.15.7-rc.2) (2018-07-06) +====================================================================================================== +[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.15.7-rc.1...v0.15.7-rc.2) + + * Update react-sdk and js-sdk + Changes in [0.15.7-rc.1](https://github.com/vector-im/riot-web/releases/tag/v0.15.7-rc.1) (2018-07-04) ====================================================================================================== [Full Changelog](https://github.com/vector-im/riot-web/compare/v0.15.6...v0.15.7-rc.1) From c36b42af71f9399fed66e67212f26526bbbfba2f Mon Sep 17 00:00:00 2001 From: David Baker Date: Fri, 6 Jul 2018 16:01:42 +0100 Subject: [PATCH 58/66] v0.15.7-rc.2 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 0a68673b..f553fd8f 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "riot-web", "productName": "Riot", "main": "electron_app/src/electron-main.js", - "version": "0.15.7-rc.1", + "version": "0.15.7-rc.2", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "repository": { From 73be5005c2f52ce92b22b9b3e876ef4adceaa03c Mon Sep 17 00:00:00 2001 From: David Baker Date: Mon, 9 Jul 2018 13:16:42 +0100 Subject: [PATCH 59/66] Released react-sdk & js-sdk --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index f553fd8f..b8ec1573 100644 --- a/package.json +++ b/package.json @@ -64,8 +64,8 @@ "gemini-scrollbar": "matrix-org/gemini-scrollbar#b302279", "gfm.css": "^1.1.1", "highlight.js": "^9.0.0", - "matrix-js-sdk": "0.10.6-rc.1", - "matrix-react-sdk": "0.12.9-rc.2", + "matrix-js-sdk": "0.10.6", + "matrix-react-sdk": "0.12.9", "modernizr": "^3.1.0", "prop-types": "^15.5.10", "react": "^15.6.0", From 847df2f75b49f717a06bac16f4060c57c7e11aae Mon Sep 17 00:00:00 2001 From: David Baker Date: Mon, 9 Jul 2018 13:19:14 +0100 Subject: [PATCH 60/66] v0.15.7 --- electron_app/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/electron_app/package.json b/electron_app/package.json index 4dd12e7e..d236395f 100644 --- a/electron_app/package.json +++ b/electron_app/package.json @@ -2,7 +2,7 @@ "name": "riot-web", "productName": "Riot", "main": "src/electron-main.js", - "version": "0.15.7-rc.2", + "version": "0.15.7", "description": "A feature-rich client for Matrix.org", "author": "Vector Creations Ltd.", "dependencies": { From c68623ddb0b2a13736e216e750fbb8975f13a8c8 Mon Sep 17 00:00:00 2001 From: David Baker Date: Mon, 9 Jul 2018 13:20:28 +0100 Subject: [PATCH 61/66] Prepare changelog for v0.15.7 --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 264cff68..6fa4eddf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +Changes in [0.15.7](https://github.com/vector-im/riot-web/releases/tag/v0.15.7) (2018-07-09) +============================================================================================ +[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.15.7-rc.2...v0.15.7) + + * No changes since rc.2 + Changes in [0.15.7-rc.2](https://github.com/vector-im/riot-web/releases/tag/v0.15.7-rc.2) (2018-07-06) ====================================================================================================== [Full Changelog](https://github.com/vector-im/riot-web/compare/v0.15.7-rc.1...v0.15.7-rc.2) From 7e03b2503016d5dea3daf52525f0ba490dfe811d Mon Sep 17 00:00:00 2001 From: David Baker Date: Mon, 9 Jul 2018 13:20:29 +0100 Subject: [PATCH 62/66] v0.15.7 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index b8ec1573..e82142f5 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "riot-web", "productName": "Riot", "main": "electron_app/src/electron-main.js", - "version": "0.15.7-rc.2", + "version": "0.15.7", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "repository": { From b2ae1926a6fca8419df60aaeea2138ecc450074a Mon Sep 17 00:00:00 2001 From: David Baker Date: Wed, 18 Jul 2018 12:06:07 +0100 Subject: [PATCH 63/66] Sample cionfig for jitsi integration URL --- config.sample.json | 1 + 1 file changed, 1 insertion(+) diff --git a/config.sample.json b/config.sample.json index b80746f6..a50eaf7d 100644 --- a/config.sample.json +++ b/config.sample.json @@ -8,6 +8,7 @@ "brand": "Riot", "integrations_ui_url": "https://scalar.vector.im/", "integrations_rest_url": "https://scalar.vector.im/api", + "integrations_jitsi_widget_url": "https://scalar.vector.im/api/widgets/jitsi.html", "bug_report_endpoint_url": "https://riot.im/bugreports/submit", "features": { "feature_groups": "labs", From c6c2a77c3a9d2284b10f836fe5f90b17568b5007 Mon Sep 17 00:00:00 2001 From: Hugues De Keyzer Date: Mon, 16 Jul 2018 18:44:10 +0000 Subject: [PATCH 64/66] Translated using Weblate (French) Currently translated at 100.0% (37 of 37 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, 2 insertions(+), 2 deletions(-) diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json index 98c5e836..3bdf9466 100644 --- a/src/i18n/strings/fr.json +++ b/src/i18n/strings/fr.json @@ -4,9 +4,9 @@ "powered by Matrix": "propulsé par Matrix", "%(appName)s via %(browserName)s on %(osName)s": "%(appName)s dans %(browserName)s sous %(osName)s", "Riot Desktop on %(platformName)s": "Version bureau de Riot sur %(platformName)s", - "Riot is not supported on mobile web. Install the app?": "Riot n’est pas supporté sur les appareils mobiles. Installer l’application ?", + "Riot is not supported on mobile web. Install the app?": "Riot n’est pas disponible en version web mobile. Installer l’application ?", "Unknown device": "Appareil inconnu", - "You need to be using HTTPS to place a screen-sharing call.": "Vous devez utiliser HTTPS pour effectuer un appel en partage d’écran.", + "You need to be using HTTPS to place a screen-sharing call.": "Vous devez utiliser HTTPS pour effectuer un appel avec partage d’écran.", "Welcome to Riot.im": "Bienvenue sur Riot.im", "Chat with Riot Bot": "Discussion avec Riot Bot", "Search the room directory": "Rechercher dans le répertoire de salons", From 6cd979d8d39723037493842d14ffaef6874c9993 Mon Sep 17 00:00:00 2001 From: Kyf Lee Date: Sat, 14 Jul 2018 00:56:07 +0000 Subject: [PATCH 65/66] Translated using Weblate (Korean) Currently translated at 94.5% (35 of 37 strings) Translation: Riot Web/riot-web Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/ko/ --- src/i18n/strings/ko.json | 46 ++++++++++++++++++++-------------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/src/i18n/strings/ko.json b/src/i18n/strings/ko.json index 318c42bb..e03b2013 100644 --- a/src/i18n/strings/ko.json +++ b/src/i18n/strings/ko.json @@ -1,37 +1,37 @@ { "Custom Server Options": "사용자 지정 서버 설정", "Dismiss": "없애기", - "powered by Matrix": "매트릭스의 지원을 받고 있어요", - "Riot Desktop on %(platformName)s": "%(platformName)s에서 라이엇 컴퓨터판", - "Riot is not supported on mobile web. Install the app?": "라이엇은 모바일 사이트를 지원하지 않아요. 앱을 설치하시겠어요?", + "powered by Matrix": "Matrix의 지원을 받고 있어요", + "Riot Desktop on %(platformName)s": "%(platformName)s PC용 Riot", + "Riot is not supported on mobile web. Install the app?": "”Riot은 모바일 사이트를 지원하지 않습니다. 앱을 설치하시겠어요?", "Unknown device": "알 수 없는 장치", - "Welcome to Riot.im": "라이엇에 오신 걸 환영해요", - "Chat with Riot Bot": "Riot 봇과 이야기하기", + "Welcome to Riot.im": "Riot에 오신 걸 환영해요", + "Chat with Riot Bot": "Riot 봇과 대화하기", "%(appName)s via %(browserName)s on %(osName)s": "%(osName)s의 %(browserName)s을 통한 %(appName)s", - "You need to be using HTTPS to place a screen-sharing call.": "화면 공유를 하려면 HTTPS를 써야만 해요.", + "You need to be using HTTPS to place a screen-sharing call.": "화면 공유 전화를 걸려면 HTTPS를 사용해야 합니다.", "Decentralised, encrypted chat & collaboration powered by [matrix]": "분산되고, 암호화된 대화 & [matrix]의 지원으로 협력", - "Search the room directory": "방 목록을 찾기", + "Search the room directory": "방 목록 찾기", "Get started with some tips from Riot Bot!": "라이엇 봇에게 조언을 받고 시작하세요!", - "General discussion about Matrix and Riot": "매트릭스와 라이엇에 대한 일반 논의", - "Discussion of all things Matrix!": "매트릭스의 모든 것에 대한 토론!", - "Riot/Web & Desktop chat": "라이엇/웹 & 컴퓨터 이야기", - "Riot/iOS & matrix-ios-sdk chat": "라이엇/IOS & matrix-ios-sdk 대화", - "Riot/Android & matrix-android-sdk chat": "매트릭스/안드로이드 & matrix-ios-sdk 대화", - "Matrix technical discussions": "매트릭스 기술 논의", - "Running Matrix services": "매트릭스 서비스 실행", + "General discussion about Matrix and Riot": "Matrix와 Riot에 대한 일반적인 토론", + "Discussion of all things Matrix!": "모든 Matrix에 대한 토론!", + "Riot/Web & Desktop chat": "Riot/웹 & PC 대화", + "Riot/iOS & matrix-ios-sdk chat": "Riot/IOS & matrix-ios-sdk 대화", + "Riot/Android & matrix-android-sdk chat": "Riot/Android & matrix-ios-sdk 대화", + "Matrix technical discussions": "Matrix에 대한 기술적인 토론", + "Running Matrix services": "Matrix 서비스 실행 중", "Community-run support for Synapse": "시냅스 커뮤니티 운영 지원", - "Admin support for Dendrite": "덴드라이트 관리 지원", - "Announcements about Synapse releases": "시냅스 공개 발표", - "Support for those using and running matrix-appservice-irc": "matrix-appservice-irc를 사용하고 운영하는 사람들을 지원", - "Building services on Matrix": "매트릭스에서 서비스 구축", + "Admin support for Dendrite": "Dendrite 관리 지원", + "Announcements about Synapse releases": "Synapse 출시에 대한 발표", + "Support for those using and running matrix-appservice-irc": "matrix-appservice-irc를 사용하고 운영하는 사람들을 위한 지원", + "Building services on Matrix": "Matrix에서 서비스 구축", "Support for those using the Matrix spec": "Matrix spec을 사용하는 사람들을 지원", "Design and implementation of E2E in Matrix": "매트릭스에서 E2E 설계와 구현", "Implementing VR services with Matrix": "매트릭스로 VR 서비스 구현", - "Implementing VoIP services with Matrix": "매트릭스로 인터넷전화 서비스 구현", + "Implementing VoIP services with Matrix": "Matrix로 인터넷전화 서비스 구현", "Discussion of the Identity Service API": "ID 서비스 API에 대한 논의", - "Support for those using, running and writing other bridges": "다른 브릿지를 사용하고, 운영하고, 기록하는 사람들을 지원", - "Contributing code to Matrix and Riot": "매트릭스와 라이엇에 코드 기여하기", - "Dev chat for the Riot/Web dev team": "라이엇/웹 개발 팀을 위한 개발자 대화", + "Support for those using, running and writing other bridges": "다른 브릿지를 사용하고, 운영하고, 기록하는 사람들을 위한 지원", + "Contributing code to Matrix and Riot": "Matrix와 Riot에 코드 기여하기", + "Dev chat for the Riot/Web dev team": "Riot/웹 개발 팀을 위한 개발자 대화", "Dev chat for the Dendrite dev team": "덴드라이트 개발 팀을 위한 개발자 대화", - "Lots of rooms already exist in Matrix, linked to existing networks (Slack, IRC, Gitter etc) or independent. Check out the directory!": "기존 네트워크(Slack, IRC, Gitter 등)에 연결되있거나 독립된 많은 방들이 이미 매트릭스에 있어요. 목록을 확인해보세요!" + "Lots of rooms already exist in Matrix, linked to existing networks (Slack, IRC, Gitter etc) or independent. Check out the directory!": "기존 네트워크(Slack, IRC, Gitter 등)에 연결되있거나 독립된 많은 방이 이미 Matrix에 있습니다. 목록을 확인해보세요!" } From 25c0656106be62a556a61bc65324a285319e57a2 Mon Sep 17 00:00:00 2001 From: David Baker Date: Tue, 24 Jul 2018 18:28:48 +0100 Subject: [PATCH 66/66] Update to electron 2.0.5 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index e82142f5..da014189 100644 --- a/package.json +++ b/package.json @@ -144,7 +144,7 @@ "build": { "appId": "im.riot.app", "category": "Network", - "electronVersion": "2.0.4", + "electronVersion": "2.0.5", "//asar=false": "https://github.com/electron-userland/electron-builder/issues/675", "asar": false, "dereference": true,