diff --git a/CHANGELOG.md b/CHANGELOG.md index 434d21b..4324947 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,22 @@ +Changes in [1.6.6](https://github.com/vector-im/riot-desktop/releases/tag/v1.6.6) (2020-06-23) +============================================================================================== +[Full Changelog](https://github.com/vector-im/riot-desktop/compare/v1.6.6-rc.1...v1.6.6) + + * No changes since rc.1 + +Changes in [1.6.6-rc.1](https://github.com/vector-im/riot-desktop/releases/tag/v1.6.6-rc.1) (2020-06-17) +======================================================================================================== +[Full Changelog](https://github.com/vector-im/riot-desktop/compare/v1.6.5...v1.6.6-rc.1) + + * Upgrade needle to avoid bugs with modern Node + [\#101](https://github.com/vector-im/riot-desktop/pull/101) + * Fix riot-desktop manual update check getting stuck on Downloading... + [\#99](https://github.com/vector-im/riot-desktop/pull/99) + * Electron recall latest downloaded update for when the user manually asks + [\#98](https://github.com/vector-im/riot-desktop/pull/98) + * use keytar to store pickle keys + [\#95](https://github.com/vector-im/riot-desktop/pull/95) + Changes in [1.6.5](https://github.com/vector-im/riot-desktop/releases/tag/v1.6.5) (2020-06-16) ============================================================================================== [Full Changelog](https://github.com/vector-im/riot-desktop/compare/v1.6.4...v1.6.5) diff --git a/package.json b/package.json index 75bf5b6..aa84a69 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "riot-desktop", "productName": "Riot", "main": "src/electron-main.js", - "version": "1.6.5", + "version": "1.6.6", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "repository": { @@ -48,7 +48,7 @@ "find-npm-prefix": "^1.0.2", "fs-extra": "^8.1.0", "glob": "^7.1.6", - "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop", + "matrix-js-sdk": "7.0.0", "mkdirp": "^1.0.3", "needle": "^2.5.0", "node-pre-gyp": "^0.15.0", diff --git a/yarn.lock b/yarn.lock index bf02308..38d808c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2906,9 +2906,10 @@ map-age-cleaner@^0.1.1: dependencies: p-defer "^1.0.0" -"matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop": - version "6.2.2" - resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/1c194e81637fb07fe6ad67cda33be0d5d4c10115" +matrix-js-sdk@7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-7.0.0.tgz#da2b24e57574379c3d8f7065eb68ea6c479d9806" + integrity sha512-0i1NmfwS5HzEPPjqUAXpw81o+8DImBS67QQBemJiM6D/imU3KFBacdhkmgjMLKXnAfTy6a+aCGfYBfVolfmNQw== dependencies: "@babel/runtime" "^7.8.3" another-json "^0.2.0"