diff --git a/CHANGELOG.md b/CHANGELOG.md index b9a381ce43..9e5516a325 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,35 @@ +Changes in [1.7.26](https://github.com/vector-im/element-web/releases/tag/v1.7.26) (2021-04-26) +=============================================================================================== +[Full Changelog](https://github.com/vector-im/element-web/compare/v1.7.26-rc.1...v1.7.26) + + * Upgrade to React SDK 3.19.0 and JS SDK 10.0.0 + +Changes in [1.7.26-rc.1](https://github.com/vector-im/element-web/releases/tag/v1.7.26-rc.1) (2021-04-21) +========================================================================================================= +[Full Changelog](https://github.com/vector-im/element-web/compare/v1.7.25...v1.7.26-rc.1) + + * Upgrade to React SDK 3.19.0-rc.1 and JS SDK 10.0.0-rc.1 + * Translations update from Weblate + [\#17031](https://github.com/vector-im/element-web/pull/17031) + * Bump ssri from 6.0.1 to 6.0.2 + [\#17010](https://github.com/vector-im/element-web/pull/17010) + * Fix `NODE_ENV` value for CI environments + [\#17003](https://github.com/vector-im/element-web/pull/17003) + * Use React production mode in CI builds + [\#16969](https://github.com/vector-im/element-web/pull/16969) + * Labs documentation for DND mode + [\#16962](https://github.com/vector-im/element-web/pull/16962) + * Rename blackboxing to new option ignore list + [\#16965](https://github.com/vector-im/element-web/pull/16965) + * Remove velocity-animate from lockfile + [\#16963](https://github.com/vector-im/element-web/pull/16963) + * Add mobile download link configuration + [\#16890](https://github.com/vector-im/element-web/pull/16890) + * Switch develop to not-staging Scalar by default + [\#16883](https://github.com/vector-im/element-web/pull/16883) + * Support a config option to skip login/welcome and go to SSO + [\#16880](https://github.com/vector-im/element-web/pull/16880) + Changes in [1.7.25](https://github.com/vector-im/element-web/releases/tag/v1.7.25) (2021-04-12) =============================================================================================== [Full Changelog](https://github.com/vector-im/element-web/compare/v1.7.25-rc.1...v1.7.25) diff --git a/package.json b/package.json index 8e4ea1fd47..b4262f8f5e 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "element-web", - "version": "1.7.25", + "version": "1.7.26", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "repository": { @@ -58,8 +58,8 @@ "highlight.js": "^10.5.0", "jsrsasign": "^10.1.5", "katex": "^0.12.0", - "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop", - "matrix-react-sdk": "github:matrix-org/matrix-react-sdk#develop", + "matrix-js-sdk": "10.0.0", + "matrix-react-sdk": "3.19.0", "matrix-widget-api": "^0.1.0-beta.13", "olm": "https://packages.matrix.org/npm/olm/olm-3.2.1.tgz", "prop-types": "^15.7.2", diff --git a/yarn.lock b/yarn.lock index ae11a3d732..1f0a8a1e07 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7541,9 +7541,10 @@ mathml-tag-names@^2.1.3: resolved "https://registry.yarnpkg.com/mathml-tag-names/-/mathml-tag-names-2.1.3.tgz#4ddadd67308e780cf16a47685878ee27b736a0a3" integrity sha512-APMBEanjybaPzUrfqU0IMU5I0AswKMH7k8OTLs0vvV4KZpExkTkY87nR/zpbuTPj+gARop7aGUbl11pnDfW6xg== -"matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop": - version "9.11.0" - resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/1dddcd49251f750cd2ff44e084c666290ffb17ad" +matrix-js-sdk@10.0.0: + version "10.0.0" + resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-10.0.0.tgz#571e97c8d8351715ac609ccedd38cad79d0b752e" + integrity sha512-40QN9HITqWBSYi/e8QQidDL6UOhWBpst437i+lHIqQ8a7SQtbcquDSRXWR22BjM2qbssR+02zfrLI/Kez7IoBQ== dependencies: "@babel/runtime" "^7.12.5" another-json "^0.2.0" @@ -7563,9 +7564,10 @@ matrix-mock-request@^1.2.3: bluebird "^3.5.0" expect "^1.20.2" -"matrix-react-sdk@github:matrix-org/matrix-react-sdk#develop": - version "3.18.0" - resolved "https://codeload.github.com/matrix-org/matrix-react-sdk/tar.gz/21e7847686a18f90b0b19ac72ca937055d948ba7" +matrix-react-sdk@3.19.0: + version "3.19.0" + resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.19.0.tgz#45e5794f9dae9b8fd6bdc2862ffd6e3a6650e282" + integrity sha512-xCRtq0u+qyYIAU/rUt7oQU0+sQboT1q1RRBzEvKca2usQRFH+EV4ahh97GCgg+u2IDiYb83bcVPcB4lGcCVLjg== dependencies: "@babel/runtime" "^7.12.5" await-lock "^2.1.0" @@ -7593,7 +7595,7 @@ matrix-mock-request@^1.2.3: katex "^0.12.0" linkifyjs "^2.1.9" lodash "^4.17.20" - matrix-js-sdk "github:matrix-org/matrix-js-sdk#develop" + matrix-js-sdk "10.0.0" matrix-widget-api "^0.1.0-beta.13" minimist "^1.2.5" opus-recorder "^8.0.3"