Skip to content

Commit c07f2e1

Browse files
committed
Merge branch 'master' into develop
2 parents 8dfc379 + 93e6abe commit c07f2e1

File tree

3 files changed

+40
-10
lines changed

3 files changed

+40
-10
lines changed

CHANGELOG.md

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,31 @@
1+
Changes in [1.7.27](https://github.com/vector-im/element-web/releases/tag/v1.7.27) (2021-05-10)
2+
===============================================================================================
3+
[Full Changelog](https://github.com/vector-im/element-web/compare/v1.7.27-rc.1...v1.7.27)
4+
5+
* Upgrade to React SDK 3.20.0 and JS SDK 10.1.0
6+
7+
Changes in [1.7.27-rc.1](https://github.com/vector-im/element-web/releases/tag/v1.7.27-rc.1) (2021-05-04)
8+
=========================================================================================================
9+
[Full Changelog](https://github.com/vector-im/element-web/compare/v1.7.26...v1.7.27-rc.1)
10+
11+
* Upgrade to React SDK 3.20.0-rc.1 and JS SDK 10.1.0-rc.1
12+
* Translations update from Weblate
13+
[\#17160](https://github.com/vector-im/element-web/pull/17160)
14+
* Document option for obeying asserted identity
15+
[\#17008](https://github.com/vector-im/element-web/pull/17008)
16+
* Implement IPC call to Electron to set language
17+
[\#17052](https://github.com/vector-im/element-web/pull/17052)
18+
* Convert Vector skin react components to Typescript
19+
[\#17061](https://github.com/vector-im/element-web/pull/17061)
20+
* Add code quality review policy
21+
[\#16980](https://github.com/vector-im/element-web/pull/16980)
22+
* Register RecorderWorklet from react-sdk
23+
[\#17013](https://github.com/vector-im/element-web/pull/17013)
24+
* Preload Inter font to avoid FOIT on slow connections
25+
[\#17039](https://github.com/vector-im/element-web/pull/17039)
26+
* Disable `postcss-calc`'s noisy `warnWhenCannotResolve` option
27+
[\#17041](https://github.com/vector-im/element-web/pull/17041)
28+
129
Changes in [1.7.26](https://github.com/vector-im/element-web/releases/tag/v1.7.26) (2021-04-26)
230
===============================================================================================
331
[Full Changelog](https://github.com/vector-im/element-web/compare/v1.7.26-rc.1...v1.7.26)

package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "element-web",
3-
"version": "1.7.26",
3+
"version": "1.7.27",
44
"description": "A feature-rich client for Matrix.org",
55
"author": "New Vector Ltd.",
66
"repository": {
@@ -58,8 +58,8 @@
5858
"highlight.js": "^10.5.0",
5959
"jsrsasign": "^10.1.5",
6060
"katex": "^0.12.0",
61-
"matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop",
62-
"matrix-react-sdk": "github:matrix-org/matrix-react-sdk#develop",
61+
"matrix-js-sdk": "10.1.0",
62+
"matrix-react-sdk": "3.20.0",
6363
"matrix-widget-api": "^0.1.0-beta.13",
6464
"olm": "https://packages.matrix.org/npm/olm/olm-3.2.1.tgz",
6565
"prop-types": "^15.7.2",

yarn.lock

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7630,9 +7630,10 @@ mathml-tag-names@^2.1.3:
76307630
resolved "https://registry.yarnpkg.com/mathml-tag-names/-/mathml-tag-names-2.1.3.tgz#4ddadd67308e780cf16a47685878ee27b736a0a3"
76317631
integrity sha512-APMBEanjybaPzUrfqU0IMU5I0AswKMH7k8OTLs0vvV4KZpExkTkY87nR/zpbuTPj+gARop7aGUbl11pnDfW6xg==
76327632

7633-
"matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop":
7634-
version "10.0.0"
7635-
resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/b911a890cff5ac4d10a4f3a94b43276caeedca83"
7633+
7634+
version "10.1.0"
7635+
resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-10.1.0.tgz#11a78e0330530f78498847c52d390d2a599b029b"
7636+
integrity sha512-VR1bwSKOf7jZa9+0UoAsYvyvLsNGBhT/BdxHMgQKuwx34GwZucp3Tqg/Ng2oTK+0b991xkEk4nRvJoCKK++Ulg==
76367637
dependencies:
76377638
"@babel/runtime" "^7.12.5"
76387639
another-json "^0.2.0"
@@ -7652,9 +7653,10 @@ matrix-mock-request@^1.2.3:
76527653
bluebird "^3.5.0"
76537654
expect "^1.20.2"
76547655

7655-
"matrix-react-sdk@github:matrix-org/matrix-react-sdk#develop":
7656-
version "3.19.0"
7657-
resolved "https://codeload.github.com/matrix-org/matrix-react-sdk/tar.gz/3817aaeaca9622c56894df4092b5ce727b943f64"
7656+
7657+
version "3.20.0"
7658+
resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.20.0.tgz#ac64cb6b769d000a1c076ff87be4c75daa97581a"
7659+
integrity sha512-ZSfmr+VdZwiN7DOXubX0LbnB/TL1OU7W93JndEjKDUIn3jCAdbHQdlAefQRsRmyWIQbfuEKyOlrG6qn+Ua7o6Q==
76587660
dependencies:
76597661
"@babel/runtime" "^7.12.5"
76607662
await-lock "^2.1.0"
@@ -7682,7 +7684,7 @@ matrix-mock-request@^1.2.3:
76827684
katex "^0.12.0"
76837685
linkifyjs "^2.1.9"
76847686
lodash "^4.17.20"
7685-
matrix-js-sdk "github:matrix-org/matrix-js-sdk#develop"
7687+
matrix-js-sdk "10.1.0"
76867688
matrix-widget-api "^0.1.0-beta.13"
76877689
minimist "^1.2.5"
76887690
opus-recorder "^8.0.3"

0 commit comments

Comments
 (0)