Skip to content
This repository was archived by the owner on Sep 11, 2024. It is now read-only.

Commit 1f2ff33

Browse files
committed
Merge branch 'master' into develop
2 parents b10a6a5 + 492f85d commit 1f2ff33

File tree

3 files changed

+106
-5
lines changed

3 files changed

+106
-5
lines changed

CHANGELOG.md

Lines changed: 100 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,103 @@
1+
Changes in [3.7.0](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v3.7.0) (2020-10-26)
2+
===================================================================================================
3+
[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v3.7.0-rc.2...v3.7.0)
4+
5+
* Upgrade JS SDK to 9.0.0
6+
7+
Changes in [3.7.0-rc.2](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v3.7.0-rc.2) (2020-10-21)
8+
=============================================================================================================
9+
[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v3.7.0-rc.1...v3.7.0-rc.2)
10+
11+
* Fix JS SDK dependency to use 9.0.0-rc.1 as intended
12+
13+
Changes in [3.7.0-rc.1](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v3.7.0-rc.1) (2020-10-21)
14+
=============================================================================================================
15+
[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v3.6.1...v3.7.0-rc.1)
16+
17+
* Upgrade JS SDK to 9.0.0-rc.1
18+
* Update Weblate URL
19+
[\#5346](https://github.com/matrix-org/matrix-react-sdk/pull/5346)
20+
* Translations update from Weblate
21+
[\#5347](https://github.com/matrix-org/matrix-react-sdk/pull/5347)
22+
* Left Panel Widget support
23+
[\#5247](https://github.com/matrix-org/matrix-react-sdk/pull/5247)
24+
* Pinned widgets work
25+
[\#5266](https://github.com/matrix-org/matrix-react-sdk/pull/5266)
26+
* Convert resizer to Typescript
27+
[\#5343](https://github.com/matrix-org/matrix-react-sdk/pull/5343)
28+
* Hide filtering microcopy when left panel is minimized
29+
[\#5338](https://github.com/matrix-org/matrix-react-sdk/pull/5338)
30+
* Skip editor confirmation of upgrades
31+
[\#5344](https://github.com/matrix-org/matrix-react-sdk/pull/5344)
32+
* Spec compliance, /search doesn't have to return results
33+
[\#5337](https://github.com/matrix-org/matrix-react-sdk/pull/5337)
34+
* Fix excessive hosting link padding
35+
[\#5336](https://github.com/matrix-org/matrix-react-sdk/pull/5336)
36+
* Adjust for new widget messaging APIs
37+
[\#5341](https://github.com/matrix-org/matrix-react-sdk/pull/5341)
38+
* Fix case where sublist context menu missed an update
39+
[\#5339](https://github.com/matrix-org/matrix-react-sdk/pull/5339)
40+
* Add analytics to VoIP
41+
[\#5340](https://github.com/matrix-org/matrix-react-sdk/pull/5340)
42+
* Fix Jitsi OpenIDC auth
43+
[\#5334](https://github.com/matrix-org/matrix-react-sdk/pull/5334)
44+
* Support rejecting calls
45+
[\#5324](https://github.com/matrix-org/matrix-react-sdk/pull/5324)
46+
* Don't show admin tooling if we're not in the room
47+
[\#5330](https://github.com/matrix-org/matrix-react-sdk/pull/5330)
48+
* Show Integrations error if iframe failed to load too
49+
[\#5328](https://github.com/matrix-org/matrix-react-sdk/pull/5328)
50+
* Add security customisation points
51+
[\#5327](https://github.com/matrix-org/matrix-react-sdk/pull/5327)
52+
* Discard all mx_fadable legacy cruft which is totally useless
53+
[\#5326](https://github.com/matrix-org/matrix-react-sdk/pull/5326)
54+
* Fix background-image: url(null) for backdrop filter
55+
[\#5319](https://github.com/matrix-org/matrix-react-sdk/pull/5319)
56+
* Make the ACL update message less noisy
57+
[\#5316](https://github.com/matrix-org/matrix-react-sdk/pull/5316)
58+
* Fix aspect ratio of avatar before clicking Save
59+
[\#5318](https://github.com/matrix-org/matrix-react-sdk/pull/5318)
60+
* Don't supply popout widgets with widget parameters
61+
[\#5323](https://github.com/matrix-org/matrix-react-sdk/pull/5323)
62+
* Changed rainbow algorithm
63+
[\#5301](https://github.com/matrix-org/matrix-react-sdk/pull/5301)
64+
* Renamed TagPanel and TagOrderStore
65+
[\#5309](https://github.com/matrix-org/matrix-react-sdk/pull/5309)
66+
* Fix/clarify boolean logic for reaction previews
67+
[\#5321](https://github.com/matrix-org/matrix-react-sdk/pull/5321)
68+
* Support glare for VoIP calls
69+
[\#5311](https://github.com/matrix-org/matrix-react-sdk/pull/5311)
70+
* Round of Typescript conversions
71+
[\#5314](https://github.com/matrix-org/matrix-react-sdk/pull/5314)
72+
* Fix broken rendering of Room Create when showHiddenEvents enabled
73+
[\#5317](https://github.com/matrix-org/matrix-react-sdk/pull/5317)
74+
* Improve LHS resize performance and tidy stale props&classes
75+
[\#5313](https://github.com/matrix-org/matrix-react-sdk/pull/5313)
76+
* event-index: Pass the user/device id pair when initializing the event index.
77+
[\#5312](https://github.com/matrix-org/matrix-react-sdk/pull/5312)
78+
* Fix various aspects of (jitsi) widgets
79+
[\#5315](https://github.com/matrix-org/matrix-react-sdk/pull/5315)
80+
* Fix rogue (partial) call bar
81+
[\#5310](https://github.com/matrix-org/matrix-react-sdk/pull/5310)
82+
* Rewrite call state machine
83+
[\#5308](https://github.com/matrix-org/matrix-react-sdk/pull/5308)
84+
* Convert `src/SecurityManager.js` to TypeScript
85+
[\#5307](https://github.com/matrix-org/matrix-react-sdk/pull/5307)
86+
* Fix templating for v1 jitsi widgets
87+
[\#5305](https://github.com/matrix-org/matrix-react-sdk/pull/5305)
88+
* Use new preparing event for widget communications
89+
[\#5303](https://github.com/matrix-org/matrix-react-sdk/pull/5303)
90+
* Fix parsing issue in event tile preview for appearance tab
91+
[\#5302](https://github.com/matrix-org/matrix-react-sdk/pull/5302)
92+
* Track replyToEvent along with Cider state & history
93+
[\#5284](https://github.com/matrix-org/matrix-react-sdk/pull/5284)
94+
* Roving Tab Index should not interfere with inputs
95+
[\#5299](https://github.com/matrix-org/matrix-react-sdk/pull/5299)
96+
* Visual tweaks from 2020-10-06 polishing
97+
[\#5298](https://github.com/matrix-org/matrix-react-sdk/pull/5298)
98+
* Convert auth lifecycle to TS, remove dead ILAG code
99+
[\#5296](https://github.com/matrix-org/matrix-react-sdk/pull/5296)
100+
1101
Changes in [3.6.1](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v3.6.1) (2020-10-20)
2102
===================================================================================================
3103
[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v3.6.0...v3.6.1)

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "matrix-react-sdk",
3-
"version": "3.6.1",
3+
"version": "3.7.0",
44
"description": "SDK for matrix.org using React",
55
"author": "matrix.org",
66
"repository": {
@@ -78,7 +78,7 @@
7878
"is-ip": "^2.0.0",
7979
"linkifyjs": "^2.1.9",
8080
"lodash": "^4.17.19",
81-
"matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop",
81+
"matrix-js-sdk": "9.0.0",
8282
"matrix-widget-api": "^0.1.0-beta.5",
8383
"minimist": "^1.2.5",
8484
"pako": "^1.0.11",

yarn.lock

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6505,9 +6505,10 @@ mathml-tag-names@^2.0.1:
65056505
resolved "https://registry.yarnpkg.com/mathml-tag-names/-/mathml-tag-names-2.1.3.tgz#4ddadd67308e780cf16a47685878ee27b736a0a3"
65066506
integrity sha512-APMBEanjybaPzUrfqU0IMU5I0AswKMH7k8OTLs0vvV4KZpExkTkY87nR/zpbuTPj+gARop7aGUbl11pnDfW6xg==
65076507

6508-
"matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop":
6509-
version "8.5.0"
6510-
resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/9f713781cdfea2349115ffaac2d665e8b07fd5dc"
6508+
6509+
version "9.0.0"
6510+
resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-9.0.0.tgz#97d995fcb4209161a761cf59238caf52ff34882b"
6511+
integrity sha512-GEQ51wxnBfY00m39aMWVa2/sZqUFBsRWrsImr+mkXtPYs1OQVXHVipL2B3/rObOO+A+3bo7tfoaTTxhpQl2CaQ==
65116512
dependencies:
65126513
"@babel/runtime" "^7.11.2"
65136514
another-json "^0.2.0"

0 commit comments

Comments
 (0)