diff --git a/CHANGELOG.md b/CHANGELOG.md index 03ea686932..5441e8b4df 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,11 @@ +Changes in [1.7.12](https://github.com/vector-im/element-web/releases/tag/v1.7.12) (2020-10-28) +=============================================================================================== +[Full Changelog](https://github.com/vector-im/element-web/compare/v1.7.11...v1.7.12) + + * Upgrade to React SDK 3.7.1 and JS SDK 9.0.1 + * [Release] Fix Jitsi regressions with custom themes + [\#15577](https://github.com/vector-im/element-web/pull/15577) + Changes in [1.7.11](https://github.com/vector-im/element-web/releases/tag/v1.7.11) (2020-10-26) =============================================================================================== [Full Changelog](https://github.com/vector-im/element-web/compare/v1.7.11-rc.1...v1.7.11) diff --git a/package.json b/package.json index c5abb10f35..fea84b01e9 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "riot-web", "productName": "Riot", - "version": "1.7.11", + "version": "1.7.12", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "repository": { @@ -60,8 +60,8 @@ "gfm.css": "^1.1.2", "highlight.js": "^9.13.1", "jsrsasign": "^9.1.5", - "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop", - "matrix-react-sdk": "github:matrix-org/matrix-react-sdk#develop", + "matrix-js-sdk": "9.0.1", + "matrix-react-sdk": "3.7.1", "matrix-widget-api": "^0.1.0-beta.5", "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 ebd7209dee..731d02269d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7898,9 +7898,10 @@ mathml-tag-names@^2.1.1: 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.0.0" - resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/c416dd01a7edcca11c5224d29916a0f123dec8e6" +matrix-js-sdk@9.0.1: + version "9.0.1" + resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-9.0.1.tgz#bb84a80db0dec1c21b6867c38bb2aa3f63811d6d" + integrity sha512-D2b/pf1/0FTnJoroZhhFCo9WFv+iXELqDgEozo0mBSTbQolIXjHLDQfmhi3p7nDZxxtjWvJjVaiKiVQPjwHCrg== dependencies: "@babel/runtime" "^7.11.2" another-json "^0.2.0" @@ -7920,9 +7921,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.7.0" - resolved "https://codeload.github.com/matrix-org/matrix-react-sdk/tar.gz/6f37875d38ed4309324d5290424508540ed1383f" +matrix-react-sdk@3.7.1: + version "3.7.1" + resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.7.1.tgz#0a2d9c2c7d224297277532bcf78f60984f6bc49e" + integrity sha512-JwCURRs0WBuqVQ5/0fYg19SEb2Dg8y1F93GiiCssAoMW/bbTiMA6B/moLeZDO2mQPlhqwRtAH1aeLvdKrA/q6w== dependencies: "@babel/runtime" "^7.10.5" await-lock "^2.0.1" @@ -7949,7 +7951,7 @@ matrix-mock-request@^1.2.3: is-ip "^2.0.0" linkifyjs "^2.1.9" lodash "^4.17.19" - matrix-js-sdk "github:matrix-org/matrix-js-sdk#develop" + matrix-js-sdk "9.0.1" matrix-widget-api "^0.1.0-beta.5" minimist "^1.2.5" pako "^1.0.11"