diff --git a/CHANGELOG.md b/CHANGELOG.md index e74228e435..36ab269cc9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,42 @@ +Changes in [1.3.2](https://github.com/vector-im/riot-web/releases/tag/v1.3.2) (2019-08-05) +========================================================================================== +[Full Changelog](https://github.com/vector-im/riot-web/compare/v1.3.1...v1.3.2) + + * Updated react-sdk for deactivated account error message on login + +Changes in [1.3.1](https://github.com/vector-im/riot-web/releases/tag/v1.3.1) (2019-08-05) +========================================================================================== +[Full Changelog](https://github.com/vector-im/riot-web/compare/v1.3.1-rc.1...v1.3.1) + + * Updated js-sdk for notifications fix and react-sdk for registration fix + +Changes in [1.3.1-rc.1](https://github.com/vector-im/riot-web/releases/tag/v1.3.1-rc.1) (2019-07-31) +==================================================================================================== +[Full Changelog](https://github.com/vector-im/riot-web/compare/v1.3.0...v1.3.1-rc.1) + + * Upgrade to JS SDK 2.3.0-rc.1 and React SDK 1.5.0-rc.1 + * Update from Weblate + [\#10436](https://github.com/vector-im/riot-web/pull/10436) + * Describe our existing features better in documentation + [\#10418](https://github.com/vector-im/riot-web/pull/10418) + * Upgrade to Electron 5 + [\#10392](https://github.com/vector-im/riot-web/pull/10392) + * Remove edits and reactions feature flags from docs and config + [\#10363](https://github.com/vector-im/riot-web/pull/10363) + * Cachebust config file requests + [\#10349](https://github.com/vector-im/riot-web/pull/10349) + * Convert install-app-deps to subcommand + [\#10334](https://github.com/vector-im/riot-web/pull/10334) + * Add riot.im configuration files + [\#10327](https://github.com/vector-im/riot-web/pull/10327) + * Require descriptions in mxSendRageshake and remove infinite loop in issue + templates + [\#10321](https://github.com/vector-im/riot-web/pull/10321) + * Remove unused disable_identity_server config flag + [\#10322](https://github.com/vector-im/riot-web/pull/10322) + * Verify i18n in CI + [\#10320](https://github.com/vector-im/riot-web/pull/10320) + Changes in [1.3.0](https://github.com/vector-im/riot-web/releases/tag/v1.3.0) (2019-07-18) ========================================================================================== [Full Changelog](https://github.com/vector-im/riot-web/compare/v1.3.0-rc.3...v1.3.0) diff --git a/electron_app/package.json b/electron_app/package.json index edf10ed2cb..c4fe2954fb 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": "1.3.0", + "version": "1.3.2", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "dependencies": { diff --git a/electron_app/src/electron-main.js b/electron_app/src/electron-main.js index 6da972fd6c..f061acd5f9 100644 --- a/electron_app/src/electron-main.js +++ b/electron_app/src/electron-main.js @@ -23,7 +23,10 @@ limitations under the License. const checkSquirrelHooks = require('./squirrelhooks'); if (checkSquirrelHooks()) return; -const argv = require('minimist')(process.argv); +const argv = require('minimist')(process.argv, { + alias: {help: "h"}, +}); + const {app, ipcMain, powerSaveBlocker, BrowserWindow, Menu, autoUpdater, protocol} = require('electron'); const AutoLaunch = require('auto-launch'); const path = require('path'); @@ -37,6 +40,19 @@ const { migrateFromOldOrigin } = require('./originMigrator'); const windowStateKeeper = require('electron-window-state'); const Store = require('electron-store'); +if (argv["help"]) { + console.log("Options:"); + console.log(" --profile-dir {path}: Path to where to store the profile."); + console.log(" --profile {name}: Name of alternate profile to use, allows for running multiple accounts."); + console.log(" --devtools: Install and use react-devtools and react-perf."); + console.log(" --no-update: Disable automatic updating."); + console.log(" --hidden: Start the application hidden in the system tray."); + console.log(" --help: Displays this help message."); + console.log("And more such as --proxy, see:" + + "https://github.com/electron/electron/blob/master/docs/api/chrome-command-line-switches.md"); + app.exit(); +} + // boolean flag set whilst we are doing one-time origin migration // We only serve the origin migration script while we're actually // migrating to mitigate any risk of it being used maliciously. @@ -156,6 +172,14 @@ ipcMain.on('ipcCall', async function(ev, payload) { case 'setMinimizeToTrayEnabled': store.set('minimizeToTray', global.minimizeToTray = args[0]); break; + case 'getAutoHideMenuBarEnabled': + ret = global.mainWindow.isMenuBarAutoHide(); + break; + case 'setAutoHideMenuBarEnabled': + store.set('autoHideMenuBar', args[0]); + global.mainWindow.setAutoHideMenuBar(args[0]); + global.mainWindow.setMenuBarVisibility(!args[0]); + break; case 'getAppVersion': ret = app.getVersion(); break; @@ -320,7 +344,7 @@ app.on('ready', () => { mainWindow = global.mainWindow = new BrowserWindow({ icon: iconPath, show: false, - autoHideMenuBar: true, + autoHideMenuBar: store.get('autoHideMenuBar', true), x: mainWindowState.x, y: mainWindowState.y, diff --git a/package.json b/package.json index 63d34d88e6..fd6f05bcd7 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "riot-web", "productName": "Riot", "main": "electron_app/src/electron-main.js", - "version": "1.3.0", + "version": "1.3.2", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "repository": { @@ -74,8 +74,8 @@ "gemini-scrollbar": "github:matrix-org/gemini-scrollbar#b302279", "gfm.css": "^1.1.2", "highlight.js": "^9.13.1", - "matrix-js-sdk": "2.2.0", - "matrix-react-sdk": "1.4.0", + "matrix-js-sdk": "2.3.0", + "matrix-react-sdk": "1.5.1", "modernizr": "^3.6.0", "olm": "https://packages.matrix.org/npm/olm/olm-3.1.0.tgz", "prop-types": "^15.7.2", diff --git a/src/vector/platform/ElectronPlatform.js b/src/vector/platform/ElectronPlatform.js index 387403a600..8700ae249b 100644 --- a/src/vector/platform/ElectronPlatform.js +++ b/src/vector/platform/ElectronPlatform.js @@ -174,7 +174,7 @@ export default class ElectronPlatform extends VectorBasePlatform { } async getAppVersion(): Promise { - return await this._ipcCall('getAppVersion'); + return this._ipcCall('getAppVersion'); } supportsAutoLaunch(): boolean { @@ -182,11 +182,23 @@ export default class ElectronPlatform extends VectorBasePlatform { } async getAutoLaunchEnabled(): boolean { - return await this._ipcCall('getAutoLaunchEnabled'); + return this._ipcCall('getAutoLaunchEnabled'); } async setAutoLaunchEnabled(enabled: boolean): void { - return await this._ipcCall('setAutoLaunchEnabled', enabled); + return this._ipcCall('setAutoLaunchEnabled', enabled); + } + + supportsAutoHideMenuBar(): boolean { + return true; + } + + async getAutoHideMenuBarEnabled(): boolean { + return this._ipcCall('getAutoHideMenuBarEnabled'); + } + + async setAutoHideMenuBarEnabled(enabled: boolean): void { + return this._ipcCall('setAutoHideMenuBarEnabled', enabled); } supportsMinimizeToTray(): boolean { @@ -194,11 +206,11 @@ export default class ElectronPlatform extends VectorBasePlatform { } async getMinimizeToTrayEnabled(): boolean { - return await this._ipcCall('getMinimizeToTrayEnabled'); + return this._ipcCall('getMinimizeToTrayEnabled'); } async setMinimizeToTrayEnabled(enabled: boolean): void { - return await this._ipcCall('setMinimizeToTrayEnabled', enabled); + return this._ipcCall('setMinimizeToTrayEnabled', enabled); } async canSelfUpdate(): boolean { diff --git a/yarn.lock b/yarn.lock index 30cb7f3633..9dd14d4410 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2279,7 +2279,7 @@ commander@2.17.x: resolved "https://registry.yarnpkg.com/commander/-/commander-2.17.1.tgz#bd77ab7de6de94205ceacc72f1716d29f20a77bf" integrity sha512-wPMUt6FnH2yzG95SA6mzjQOEKUU3aLaDEmzs1ti+1E9h+CsrZghRlqEM/EJ4KscsQVG8uNN4uVreUeT8+drlgg== -commander@^2.11.0, commander@^2.20.0: +commander@^2.11.0, commander@^2.19.0, commander@^2.20.0: version "2.20.0" resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.0.tgz#d58bb2b5c1ee8f87b0d340027e9e94e222c5a422" integrity sha512-7j2y+40w61zy6YC2iRNpUe/NwhNyoXrYpHMrSunaMG64nRnaf96zO/KMQR4OyN/UnE5KLyEBnKHd4aG3rskjpQ== @@ -2896,6 +2896,18 @@ di@^0.0.1: resolved "https://registry.yarnpkg.com/di/-/di-0.0.1.tgz#806649326ceaa7caa3306d75d985ea2748ba913c" integrity sha1-gGZJMmzqp8qjMG112YXqJ0i6kTw= +diff-dom@^4.1.3: + version "4.1.3" + resolved "https://registry.yarnpkg.com/diff-dom/-/diff-dom-4.1.3.tgz#5572dab5c549c7da05a7662303b471d7ea4b0963" + integrity sha512-wiM06O2BN3THf9Ge86IYuTek+OlKLSwwuwjm3XfSr7SGp7Ls9XXztpr4tp9S54RhX/rXqq94LdeBG+MMpDPDig== + dependencies: + rollup-plugin-terser "^4.0.3" + +diff-match-patch@^1.0.4: + version "1.0.4" + resolved "https://registry.yarnpkg.com/diff-match-patch/-/diff-match-patch-1.0.4.tgz#6ac4b55237463761c4daf0dc603eb869124744b1" + integrity sha512-Uv3SW8bmH9nAtHKaKSanOQmj2DnlH65fUpcrMdfdaOxUG02QQ4YGZ8AE7kKOMisF7UqvOlGKVYWRvezdncW9lg== + diff@3.5.0: version "3.5.0" resolved "https://registry.yarnpkg.com/diff/-/diff-3.5.0.tgz#800c0dd1e0a8bfbc95835c202ad220fe317e5a12" @@ -3183,7 +3195,7 @@ emoji-regex@^7.0.1: resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-7.0.3.tgz#933a04052860c85e83c122479c4748a8e4c72156" integrity sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA== -emojibase-data@^4.0.0: +emojibase-data@^4.0.1: version "4.0.1" resolved "https://registry.yarnpkg.com/emojibase-data/-/emojibase-data-4.0.1.tgz#7ff28250a9b753f058de313ac4654b37bbf7081b" integrity sha512-U20Xg5TzdJ1pQnfJUT3rf9vqA9jL0GLALP8YsypyNdud2h5CWXUwpRRicRl8y0lOnABQbheLv3ohwt1+Mn8iTw== @@ -5308,6 +5320,14 @@ isstream@~0.1.2: resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a" integrity sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo= +jest-worker@^24.0.0: + version "24.6.0" + resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-24.6.0.tgz#7f81ceae34b7cde0c9827a6980c35b7cdc0161b3" + integrity sha512-jDwgW5W9qGNvpI1tNnvajh0a5IE/PuGLFmHk6aR/BZFz8tSgGw17GsDPXAJ6p91IvYDjOw8GpFbvvZGAK+DPQQ== + dependencies: + merge-stream "^1.0.1" + supports-color "^6.1.0" + jquery@^3.3.1: version "3.4.1" resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.4.1.tgz#714f1f8d9dde4bdfa55764ba37ef214630d80ef2" @@ -5852,10 +5872,10 @@ math-random@^1.0.1: resolved "https://registry.yarnpkg.com/math-random/-/math-random-1.0.4.tgz#5dd6943c938548267016d4e34f057583080c514c" integrity sha512-rUxjysqif/BZQH2yhd5Aaq7vXMSx9NdEsQcyA07uEzIvxgI7zIr33gGsh+RU0/XjmQpCW7RsVof1vlkvQVCK5A== -matrix-js-sdk@2.2.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-2.2.0.tgz#c96a2caa4c92e5998443027579d7e76d4bcd4d21" - integrity sha512-gab7wuscgTKbXY5x136t9qSnDbOuq785ezd++NoFLEau0YjDos0YKolAm0TValUC9LY30CoVqqMfyPJ68CMezQ== +matrix-js-sdk@2.3.0: + version "2.3.0" + resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-2.3.0.tgz#ed04172add2e31c532dc87e2f38c26c2a63191c6" + integrity sha512-jeswie7cWK7+XxcD+pQ7LplWnWkOQDa+x6y7FUUnxCdEvaj38cE5Obo9bPMjFgOln2hISlLdR8fzMNE9F4oUJA== dependencies: another-json "^0.2.0" babel-runtime "^6.26.0" @@ -5876,10 +5896,10 @@ matrix-mock-request@^1.2.3: bluebird "^3.5.0" expect "^1.20.2" -matrix-react-sdk@1.4.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-1.4.0.tgz#dd7a6b9f73355174eeba37ce4ae4eb8bba98d57d" - integrity sha512-kZIkTU4tYNzOJX0hcWRWiyswuHJBP2svnbDg+GvCXFsDKZM566G3Hg5gU11QFVFAmQokO3DVazpQi6nlKt5dCg== +matrix-react-sdk@1.5.0: + version "1.5.0" + resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-1.5.0.tgz#4db5dacd8b7db54b6abcdb115466944f525a7943" + integrity sha512-qhQRXCOCYfsqvASVlqhGNLwJWTEWUWh6igSFvMH/0XvurMQukEASzSKTvEeyrI4m+xXCwaA6u4Psd9nSLWwSUQ== dependencies: babel-plugin-syntax-dynamic-import "^6.18.0" babel-runtime "^6.26.0" @@ -5890,7 +5910,9 @@ matrix-react-sdk@1.4.0: classnames "^2.1.2" commonmark "^0.28.1" counterpart "^0.18.0" - emojibase-data "^4.0.0" + diff-dom "^4.1.3" + diff-match-patch "^1.0.4" + emojibase-data "^4.0.1" emojibase-regex "^3.0.0" file-saver "^1.3.3" filesize "3.5.6" @@ -5906,7 +5928,7 @@ matrix-react-sdk@1.4.0: linkifyjs "^2.1.6" lodash "^4.17.14" lolex "2.3.2" - matrix-js-sdk "2.2.0" + matrix-js-sdk "2.3.0" optimist "^0.6.1" pako "^1.0.5" png-chunks-extract "^1.0.0" @@ -5990,6 +6012,13 @@ merge-descriptors@1.0.1: resolved "https://registry.yarnpkg.com/merge-descriptors/-/merge-descriptors-1.0.1.tgz#b00aaa556dd8b44568150ec9d1b953f3f90cbb61" integrity sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E= +merge-stream@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/merge-stream/-/merge-stream-1.0.1.tgz#4041202d508a342ba00174008df0c251b8c135e1" + integrity sha1-QEEgLVCKNCugAXQAjfDCUbjBNeE= + dependencies: + readable-stream "^2.0.1" + merge2@^1.2.3: version "1.2.4" resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.2.4.tgz#c9269589e6885a60cf80605d9522d4b67ca646e3" @@ -7844,6 +7873,16 @@ ripemd160@^2.0.0, ripemd160@^2.0.1: hash-base "^3.0.0" inherits "^2.0.1" +rollup-plugin-terser@^4.0.3: + version "4.0.4" + resolved "https://registry.yarnpkg.com/rollup-plugin-terser/-/rollup-plugin-terser-4.0.4.tgz#6f661ef284fa7c27963d242601691dc3d23f994e" + integrity sha512-wPANT5XKVJJ8RDUN0+wIr7UPd0lIXBo4UdJ59VmlPCtlFsE20AM+14pe+tk7YunCsWEiuzkDBY3QIkSCjtrPXg== + dependencies: + "@babel/code-frame" "^7.0.0" + jest-worker "^24.0.0" + serialize-javascript "^1.6.1" + terser "^3.14.1" + run-async@^2.2.0: version "2.3.0" resolved "https://registry.yarnpkg.com/run-async/-/run-async-2.3.0.tgz#0371ab4ae0bdd720d4166d7dfda64ff7a445a6c0" @@ -7993,7 +8032,7 @@ send@0.17.1: range-parser "~1.2.1" statuses "~1.5.0" -serialize-javascript@^1.7.0: +serialize-javascript@^1.6.1, serialize-javascript@^1.7.0: version "1.7.0" resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-1.7.0.tgz#d6e0dfb2a3832a8c94468e6eb1db97e55a192a65" integrity sha512-ke8UG8ulpFOxO8f8gRYabHQe/ZntKlcig2Mp+8+URDP1D8vJZ0KUt7LYo07q25Z/+JVSgpr/cui9PIp5H6/+nA== @@ -8322,6 +8361,14 @@ source-map-support@^0.5.12, source-map-support@^0.5.13, source-map-support@~0.5. buffer-from "^1.0.0" source-map "^0.6.0" +source-map-support@~0.5.10: + version "0.5.13" + resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.13.tgz#31b24a9c2e73c2de85066c0feb7d44767ed52932" + integrity sha512-SHSKFHadjVA5oR4PPqhtAVdcBWwRYVd6g6cAXnIbRiIwc2EhPrTuKUBdSLvlEKyIP3GCf89fltvcZiP9MMFA1w== + dependencies: + buffer-from "^1.0.0" + source-map "^0.6.0" + source-map-url@^0.4.0: version "0.4.0" resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.0.tgz#3e935d7ddd73631b97659956d55128e87b5084a3" @@ -8707,7 +8754,16 @@ terser-webpack-plugin@^1.1.0: webpack-sources "^1.4.0" worker-farm "^1.7.0" -terser@^4.1.2: +terser@^3.14.1: + version "3.17.0" + resolved "https://registry.yarnpkg.com/terser/-/terser-3.17.0.tgz#f88ffbeda0deb5637f9d24b0da66f4e15ab10cb2" + integrity sha512-/FQzzPJmCpjAH9Xvk2paiWrFq+5M6aVOf+2KRbwhByISDX/EujxsK+BAvrhb6H+2rtrLCHK9N01wO014vrIwVQ== + dependencies: + commander "^2.19.0" + source-map "~0.6.1" + source-map-support "~0.5.10" + +terser@^4.0.0: version "4.1.2" resolved "https://registry.yarnpkg.com/terser/-/terser-4.1.2.tgz#b2656c8a506f7ce805a3f300a2ff48db022fa391" integrity sha512-jvNoEQSPXJdssFwqPSgWjsOrb+ELoE+ILpHPKXC83tIxOlh2U75F1KuB2luLD/3a6/7K3Vw5pDn+hvu0C4AzSw==