Skip to content

Commit b81c084

Browse files
committed
Merge branch 'master' into develop
2 parents 6b9c878 + 2f4f15d commit b81c084

File tree

3 files changed

+98
-5
lines changed

3 files changed

+98
-5
lines changed

CHANGELOG.md

Lines changed: 92 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,95 @@
1+
Changes in [1.7.1](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v1.7.1) (2019-11-04)
2+
===================================================================================================
3+
[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v1.7.1-rc.2...v1.7.1)
4+
5+
* No changes since rc.2
6+
7+
Changes in [1.7.1-rc.2](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v1.7.1-rc.2) (2019-11-01)
8+
=============================================================================================================
9+
[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v1.7.1-rc.1...v1.7.1-rc.2)
10+
11+
* Fix bug where rooms would not appear when filtering
12+
[\#3586](https://github.com/matrix-org/matrix-react-sdk/pull/3586)
13+
14+
Changes in [1.7.1-rc.1](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v1.7.1-rc.1) (2019-10-30)
15+
=============================================================================================================
16+
[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v1.7.0...v1.7.1-rc.1)
17+
18+
* Add ability to hide tray icon on non-Mac
19+
[\#3573](https://github.com/matrix-org/matrix-react-sdk/pull/3573)
20+
* Update from Weblate
21+
[\#3579](https://github.com/matrix-org/matrix-react-sdk/pull/3579)
22+
* Fix call state logging
23+
[\#3578](https://github.com/matrix-org/matrix-react-sdk/pull/3578)
24+
* Match widgets up with their integration manager
25+
[\#3576](https://github.com/matrix-org/matrix-react-sdk/pull/3576)
26+
* Add diagnostic log to catch events without an ID
27+
[\#3575](https://github.com/matrix-org/matrix-react-sdk/pull/3575)
28+
* Fix missing i18n for RoomTile ARIA labels and add a case for notif-off bold
29+
[\#3574](https://github.com/matrix-org/matrix-react-sdk/pull/3574)
30+
* LifeCycle onLoggedOut unmount before stopping client
31+
[\#3566](https://github.com/matrix-org/matrix-react-sdk/pull/3566)
32+
* Remove unneeded help about identity servers
33+
[\#3572](https://github.com/matrix-org/matrix-react-sdk/pull/3572)
34+
* Remove messages implying you need an identity server for email recovery
35+
[\#3571](https://github.com/matrix-org/matrix-react-sdk/pull/3571)
36+
* Fix quick reactions to be aligned with other emoji
37+
[\#3570](https://github.com/matrix-org/matrix-react-sdk/pull/3570)
38+
* If ToS gets rejected/any Scalar error then don't make Jitsi widget
39+
[\#3569](https://github.com/matrix-org/matrix-react-sdk/pull/3569)
40+
* Update from Weblate
41+
[\#3568](https://github.com/matrix-org/matrix-react-sdk/pull/3568)
42+
* Fix Room Create ELS using MXID instead of newly set Displayname/Avatar
43+
[\#3567](https://github.com/matrix-org/matrix-react-sdk/pull/3567)
44+
* Improve opening emoji picker performance
45+
[\#3565](https://github.com/matrix-org/matrix-react-sdk/pull/3565)
46+
* Update ServerTypeSelector for new matrix.org CS API URL
47+
[\#3564](https://github.com/matrix-org/matrix-react-sdk/pull/3564)
48+
* Accessibility Improvements
49+
[\#3563](https://github.com/matrix-org/matrix-react-sdk/pull/3563)
50+
* A11Y fixes in the Left Panel
51+
[\#3562](https://github.com/matrix-org/matrix-react-sdk/pull/3562)
52+
* Fix lint and i18n test failures
53+
[\#3560](https://github.com/matrix-org/matrix-react-sdk/pull/3560)
54+
* Fix: editor tests
55+
[\#3561](https://github.com/matrix-org/matrix-react-sdk/pull/3561)
56+
* Use Navigation Treeview pattern for RoomList Accessibility
57+
[\#3556](https://github.com/matrix-org/matrix-react-sdk/pull/3556)
58+
* Abort scroll updates when already unmounted
59+
[\#3557](https://github.com/matrix-org/matrix-react-sdk/pull/3557)
60+
* UserInfo consolidation of GroupMemberInfo and MemberInfo panels
61+
[\#3465](https://github.com/matrix-org/matrix-react-sdk/pull/3465)
62+
* Fix some things in the edit HTML parser
63+
[\#3552](https://github.com/matrix-org/matrix-react-sdk/pull/3552)
64+
* Update from Weblate
65+
[\#3559](https://github.com/matrix-org/matrix-react-sdk/pull/3559)
66+
* Merge end-to-end tests
67+
[\#3537](https://github.com/matrix-org/matrix-react-sdk/pull/3537)
68+
* Add full emoji picker for reactions
69+
[\#3554](https://github.com/matrix-org/matrix-react-sdk/pull/3554)
70+
* Accessibility fixes to autocomplete and tabpanels
71+
[\#3555](https://github.com/matrix-org/matrix-react-sdk/pull/3555)
72+
* Show warning dialog when changing unreachable IS
73+
[\#3549](https://github.com/matrix-org/matrix-react-sdk/pull/3549)
74+
* Fix reply fallback being included in edit m.new_content
75+
[\#3551](https://github.com/matrix-org/matrix-react-sdk/pull/3551)
76+
* Document composer features
77+
[\#3548](https://github.com/matrix-org/matrix-react-sdk/pull/3548)
78+
* Correctly update the banned users list when a user is unbanned
79+
[\#3547](https://github.com/matrix-org/matrix-react-sdk/pull/3547)
80+
* Summarise state events after room creation
81+
[\#3433](https://github.com/matrix-org/matrix-react-sdk/pull/3433)
82+
* Don't intercept TAB on the app outside of the composer, fix tabIndex > 0
83+
[\#3543](https://github.com/matrix-org/matrix-react-sdk/pull/3543)
84+
* Add some type checking on event body
85+
[\#3546](https://github.com/matrix-org/matrix-react-sdk/pull/3546)
86+
* Fix: crash while canceling editing an event when no selection
87+
[\#3544](https://github.com/matrix-org/matrix-react-sdk/pull/3544)
88+
* SettingsFlag always run ToggleSwitch fully-controlled
89+
[\#3541](https://github.com/matrix-org/matrix-react-sdk/pull/3541)
90+
* Use Keyboard Key consts instead of hardcoded strings
91+
[\#3540](https://github.com/matrix-org/matrix-react-sdk/pull/3540)
92+
193
Changes in [1.7.0](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v1.7.0) (2019-10-18)
294
===================================================================================================
395
[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v1.7.0-rc.1...v1.7.0)

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": "1.7.0",
3+
"version": "1.7.1",
44
"description": "SDK for matrix.org using React",
55
"author": "matrix.org",
66
"repository": {
@@ -87,7 +87,7 @@
8787
"linkifyjs": "^2.1.6",
8888
"lodash": "^4.17.14",
8989
"lolex": "4.2",
90-
"matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop",
90+
"matrix-js-sdk": "2.4.3",
9191
"optimist": "^0.6.1",
9292
"pako": "^1.0.5",
9393
"png-chunks-extract": "^1.0.0",

yarn.lock

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5192,9 +5192,10 @@ mathml-tag-names@^2.0.1:
51925192
resolved "https://registry.yarnpkg.com/mathml-tag-names/-/mathml-tag-names-2.1.1.tgz#6dff66c99d55ecf739ca53c492e626f1d12a33cc"
51935193
integrity sha512-pWB896KPGSGkp1XtyzRBftpTzwSOL0Gfk0wLvxt4f2mgzjY19o0LxJ3U25vNWTzsh7da+KTbuXQoQ3lOJZ8WHw==
51945194

5195-
"matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop":
5196-
version "2.4.2"
5197-
resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/46d7e4c7075386f1330d6a49941e9979fc26be0a"
5195+
matrix-js-sdk@2.4.3:
5196+
version "2.4.3"
5197+
resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-2.4.3.tgz#23b78cc707a02eb0ce7eecb3aa50129e46dd5b6e"
5198+
integrity sha512-8qTqILd/NmTWF24tpaxmDIzkTk/bZhPD5N8h69PlvJ5Y6kMFctpRj+Tud5zZjl5/yhO07+g+JCyDzg+AagiM/A==
51985199
dependencies:
51995200
another-json "^0.2.0"
52005201
babel-runtime "^6.26.0"

0 commit comments

Comments
 (0)