diff --git a/CHANGELOG.md b/CHANGELOG.md index 9514356..de04300 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,12 +1,45 @@ +Changes in [1.6.1](https://github.com/vector-im/riot-desktop/releases/tag/v1.6.1) (2020-05-19) +============================================================================================== +[Full Changelog](https://github.com/vector-im/riot-desktop/compare/v1.6.1-rc.1...v1.6.1) + + * No changes since rc.1 + +Changes in [1.6.1-rc.1](https://github.com/vector-im/riot-desktop/releases/tag/v1.6.1-rc.1) (2020-05-14) +======================================================================================================== +[Full Changelog](https://github.com/vector-im/riot-desktop/compare/v1.6.0...v1.6.1-rc.1) + + * Add CI scripts to install and link JS SDK + [\#85](https://github.com/vector-im/riot-desktop/pull/85) + * Use Xenial as the build image's base distribution + [\#84](https://github.com/vector-im/riot-desktop/pull/84) + * Persist GPG keys for Linux builds via Docker + [\#83](https://github.com/vector-im/riot-desktop/pull/83) + * Update README to mention profile support + [\#81](https://github.com/vector-im/riot-desktop/pull/81) + * Remove Conflicts from riot-desktop + [\#82](https://github.com/vector-im/riot-desktop/pull/82) + * Add a default Linux distribution + [\#79](https://github.com/vector-im/riot-desktop/pull/79) + * Remove invite only padlocks feature flag config + [\#77](https://github.com/vector-im/riot-desktop/pull/77) + * package.json: Bump the Seshat dep. + [\#75](https://github.com/vector-im/riot-desktop/pull/75) + * Remove encrypted message search feature flag + [\#74](https://github.com/vector-im/riot-desktop/pull/74) + * Update readme now it's the real source + [\#73](https://github.com/vector-im/riot-desktop/pull/73) + Changes in [1.6.0](https://github.com/vector-im/riot-desktop/releases/tag/v1.6.0) (2020-05-05) ============================================================================================== [Full Changelog](https://github.com/vector-im/riot-desktop/compare/v1.6.0-rc.6...v1.6.0) + * No changes since rc.6 Changes in [1.6.0-rc.6](https://github.com/vector-im/riot-desktop/releases/tag/v1.6.0-rc.6) (2020-05-01) ======================================================================================================== [Full Changelog](https://github.com/vector-im/riot-desktop/compare/v1.6.0-rc.5...v1.6.0-rc.6) + * No changes since rc.5 Changes in [1.6.0-rc.5](https://github.com/vector-im/riot-desktop/releases/tag/v1.6.0-rc.5) (2020-04-30) ======================================================================================================== @@ -21,6 +54,7 @@ Changes in [1.6.0-rc.4](https://github.com/vector-im/riot-desktop/releases/tag/v ======================================================================================================== [Full Changelog](https://github.com/vector-im/riot-desktop/compare/v1.6.0-rc.3...v1.6.0-rc.4) + * No changes since rc.3 Changes in [1.6.0-rc.3](https://github.com/vector-im/riot-desktop/releases/tag/v1.6.0-rc.3) (2020-04-17) ======================================================================================================== @@ -33,6 +67,7 @@ Changes in [1.6.0-rc.2](https://github.com/vector-im/riot-desktop/releases/tag/v ======================================================================================================== [Full Changelog](https://github.com/vector-im/riot-desktop/compare/v1.6.0-rc.1...v1.6.0-rc.2) + * No changes since rc.1 Changes in [1.6.0-rc.1](https://github.com/vector-im/riot-desktop/releases/tag/v1.6.0-rc.1) (2020-04-15) ======================================================================================================== diff --git a/package.json b/package.json index a6ae3ad..cb72b09 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "riot-desktop", "productName": "Riot", "main": "src/electron-main.js", - "version": "1.6.0", + "version": "1.6.1", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "repository": { @@ -47,7 +47,7 @@ "find-npm-prefix": "^1.0.2", "fs-extra": "^8.1.0", "glob": "^7.1.6", - "matrix-js-sdk": "6.0.0", + "matrix-js-sdk": "6.1.0", "mkdirp": "^1.0.3", "needle": "^2.3.2", "node-pre-gyp": "^0.14.0", diff --git a/yarn.lock b/yarn.lock index cc26f65..2d917fa 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2862,10 +2862,10 @@ map-age-cleaner@^0.1.1: dependencies: p-defer "^1.0.0" -matrix-js-sdk@6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-6.0.0.tgz#2374a583878073871a0202dc237691ef15540575" - integrity sha512-NBHb5JIKetCVhOdfETyhUL9lYs2M+v8W/uczTzW6IX9XFOtNaha8X82waXlRt6RJpZRm5aJveODkybvo9VOLtg== +matrix-js-sdk@6.1.0: + version "6.1.0" + resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-6.1.0.tgz#c28ad67c113c4aa9c8bce409c7ba550170bdc2ee" + integrity sha512-N+vCgxWORvhh7AGyWZlU5Z2brojbbnHnWlMkBF6JjWe6a+pfpjmRKp5/jeQpOz6yfe56sIQvU7ikBZl3JjlMiw== dependencies: "@babel/runtime" "^7.8.3" another-json "^0.2.0"