Skip to content

Commit 61f6987

Browse files
Merge tag 'v3.10.0' into AMP.chat
[Full Changelog](matrix-org/matrix-react-sdk@v3.10.0-rc.1...v3.10.0) * Upgrade to JS SDK 9.3.0 Change-Id: I1a948e8434c857ea1129037381f74865528b9611
2 parents fa3ada0 + fefe84d commit 61f6987

File tree

118 files changed

+5166
-1666
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

118 files changed

+5166
-1666
lines changed

CHANGELOG.md

Lines changed: 83 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,86 @@
1+
Changes in [3.10.0](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v3.10.0) (2020-12-07)
2+
=====================================================================================================
3+
[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v3.10.0-rc.1...v3.10.0)
4+
5+
* Upgrade to JS SDK 9.3.0
6+
7+
Changes in [3.10.0-rc.1](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v3.10.0-rc.1) (2020-12-02)
8+
===============================================================================================================
9+
[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v3.9.0...v3.10.0-rc.1)
10+
11+
* Upgrade to JS SDK 9.3.0-rc.1
12+
* Translations update from Weblate
13+
[\#5461](https://github.com/matrix-org/matrix-react-sdk/pull/5461)
14+
* Fix VoIP call plinth on dark theme
15+
[\#5460](https://github.com/matrix-org/matrix-react-sdk/pull/5460)
16+
* Add sanity checking around widget pinning
17+
[\#5459](https://github.com/matrix-org/matrix-react-sdk/pull/5459)
18+
* Update i18n for Appearance User Settings
19+
[\#5457](https://github.com/matrix-org/matrix-react-sdk/pull/5457)
20+
* Only show 'answered elsewhere' if we tried to answer too
21+
[\#5455](https://github.com/matrix-org/matrix-react-sdk/pull/5455)
22+
* Fixed Avatar for 3PID invites
23+
[\#5442](https://github.com/matrix-org/matrix-react-sdk/pull/5442)
24+
* Slightly better error if we can't capture user media
25+
[\#5449](https://github.com/matrix-org/matrix-react-sdk/pull/5449)
26+
* Make it possible in-code to hide rooms from the room list
27+
[\#5445](https://github.com/matrix-org/matrix-react-sdk/pull/5445)
28+
* Fix the stickerpicker
29+
[\#5447](https://github.com/matrix-org/matrix-react-sdk/pull/5447)
30+
* Add live password validation to change password dialog
31+
[\#5436](https://github.com/matrix-org/matrix-react-sdk/pull/5436)
32+
* LaTeX rendering in element-web using KaTeX
33+
[\#5244](https://github.com/matrix-org/matrix-react-sdk/pull/5244)
34+
* Add lifecycle customisation point after logout
35+
[\#5448](https://github.com/matrix-org/matrix-react-sdk/pull/5448)
36+
* Simplify UserMenu for Guests as they can't use most of the options
37+
[\#5421](https://github.com/matrix-org/matrix-react-sdk/pull/5421)
38+
* Fix known issues with modal widgets
39+
[\#5444](https://github.com/matrix-org/matrix-react-sdk/pull/5444)
40+
* Fix existing widgets not having approved capabilities for their function
41+
[\#5443](https://github.com/matrix-org/matrix-react-sdk/pull/5443)
42+
* Use the WidgetDriver to run OIDC requests
43+
[\#5440](https://github.com/matrix-org/matrix-react-sdk/pull/5440)
44+
* Add a customisation point for widget permissions and fix amnesia issues
45+
[\#5439](https://github.com/matrix-org/matrix-react-sdk/pull/5439)
46+
* Fix Widget event notification text including spurious space
47+
[\#5441](https://github.com/matrix-org/matrix-react-sdk/pull/5441)
48+
* Move call listener out of MatrixChat
49+
[\#5438](https://github.com/matrix-org/matrix-react-sdk/pull/5438)
50+
* New Look in-Call View
51+
[\#5432](https://github.com/matrix-org/matrix-react-sdk/pull/5432)
52+
* Support arbitrary widgets sticking to the screen + sending stickers
53+
[\#5435](https://github.com/matrix-org/matrix-react-sdk/pull/5435)
54+
* Auth typescripting and validation tweaks
55+
[\#5433](https://github.com/matrix-org/matrix-react-sdk/pull/5433)
56+
* Add new widget API actions for changing rooms and sending/receiving events
57+
[\#5385](https://github.com/matrix-org/matrix-react-sdk/pull/5385)
58+
* Revert room header click behaviour to opening room settings
59+
[\#5434](https://github.com/matrix-org/matrix-react-sdk/pull/5434)
60+
* Add option to send/edit a message with Ctrl + Enter / Command + Enter
61+
[\#5160](https://github.com/matrix-org/matrix-react-sdk/pull/5160)
62+
* Add Analytics instrumentation to the Homepage
63+
[\#5409](https://github.com/matrix-org/matrix-react-sdk/pull/5409)
64+
* Fix encrypted video playback in Chrome-based browsers
65+
[\#5430](https://github.com/matrix-org/matrix-react-sdk/pull/5430)
66+
* Add border-radius for video
67+
[\#5333](https://github.com/matrix-org/matrix-react-sdk/pull/5333)
68+
* Push name to the end, near text, in IRC layout
69+
[\#5166](https://github.com/matrix-org/matrix-react-sdk/pull/5166)
70+
* Disable notifications for the room you have recently been active in
71+
[\#5325](https://github.com/matrix-org/matrix-react-sdk/pull/5325)
72+
* Search through the list of unfiltered rooms rather than the rooms in the
73+
state which are already filtered by the search text
74+
[\#5331](https://github.com/matrix-org/matrix-react-sdk/pull/5331)
75+
* Lighten blockquote colour in dark mode
76+
[\#5353](https://github.com/matrix-org/matrix-react-sdk/pull/5353)
77+
* Specify community description img must be mxc urls
78+
[\#5364](https://github.com/matrix-org/matrix-react-sdk/pull/5364)
79+
* Add keyboard shortcut to close the current conversation
80+
[\#5253](https://github.com/matrix-org/matrix-react-sdk/pull/5253)
81+
* Redirect user home from auth screens if they are already logged in
82+
[\#5423](https://github.com/matrix-org/matrix-react-sdk/pull/5423)
83+
184
Changes in [3.9.0](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v3.9.0) (2020-11-23)
285
===================================================================================================
386
[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v3.9.0-rc.1...v3.9.0)

package.json

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "matrix-react-sdk",
3-
"version": "3.9.0",
3+
"version": "3.10.0",
44
"description": "SDK for matrix.org using React",
55
"author": "matrix.org",
66
"repository": {
@@ -58,6 +58,7 @@
5858
"blueimp-canvas-to-blob": "^3.27.0",
5959
"browser-encrypt-attachment": "^0.3.0",
6060
"browser-request": "^0.3.3",
61+
"cheerio": "^1.0.0-rc.3",
6162
"classnames": "^2.2.6",
6263
"commonmark": "^0.29.1",
6364
"counterpart": "^0.18.6",
@@ -76,10 +77,11 @@
7677
"highlight.js": "^10.1.2",
7778
"html-entities": "^1.3.1",
7879
"is-ip": "^2.0.0",
80+
"katex": "^0.12.0",
7981
"linkifyjs": "^2.1.9",
8082
"lodash": "^4.17.19",
81-
"matrix-js-sdk": "9.2.0",
82-
"matrix-widget-api": "^0.1.0-beta.8",
83+
"matrix-js-sdk": "9.3.0",
84+
"matrix-widget-api": "^0.1.0-beta.10",
8385
"minimist": "^1.2.5",
8486
"pako": "^1.0.11",
8587
"parse5": "^5.1.1",

res/css/_common.scss

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,10 @@ pre, code {
6060
color: $accent-color;
6161
}
6262

63+
.text-muted {
64+
color: $muted-fg-color;
65+
}
66+
6367
b {
6468
// On Firefox, the default weight for `<b>` is `bolder` which results in no bold
6569
// effect since we only have specific weights of our fonts available.
@@ -364,6 +368,11 @@ input[type=text]:focus, input[type=password]:focus, textarea:focus {
364368
.mx_Dialog_buttons {
365369
margin-top: 20px;
366370
text-align: right;
371+
372+
.mx_Dialog_buttons_additive {
373+
// The consumer is responsible for positioning their elements.
374+
float: left;
375+
}
367376
}
368377

369378
/* XXX: Our button style are a mess: buttons that happen to appear in dialogs get special styles applied

res/css/_components.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,7 @@
9191
@import "./views/dialogs/_TermsDialog.scss";
9292
@import "./views/dialogs/_UploadConfirmDialog.scss";
9393
@import "./views/dialogs/_UserSettingsDialog.scss";
94+
@import "./views/dialogs/_WidgetCapabilitiesPromptDialog.scss";
9495
@import "./views/dialogs/_WidgetOpenIDPermissionsDialog.scss";
9596
@import "./views/dialogs/security/_AccessSecretStorageDialog.scss";
9697
@import "./views/dialogs/security/_CreateCrossSigningDialog.scss";

res/css/structures/_RoomStatusBar.scss

Lines changed: 0 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -19,57 +19,6 @@ limitations under the License.
1919
min-height: 50px;
2020
}
2121

22-
/* position the indicator in the same place horizontally as .mx_EventTile_avatar. */
23-
.mx_RoomStatusBar_indicator {
24-
padding-left: 17px;
25-
padding-right: 12px;
26-
margin-left: -73px;
27-
margin-top: 15px;
28-
float: left;
29-
width: 24px;
30-
text-align: center;
31-
}
32-
33-
.mx_RoomStatusBar_callBar {
34-
height: 50px;
35-
line-height: $font-50px;
36-
}
37-
38-
.mx_RoomStatusBar_placeholderIndicator span {
39-
color: $primary-fg-color;
40-
opacity: 0.5;
41-
position: relative;
42-
top: -4px;
43-
/*
44-
animation-duration: 1s;
45-
animation-name: bounce;
46-
animation-direction: alternate;
47-
animation-iteration-count: infinite;
48-
*/
49-
}
50-
51-
.mx_RoomStatusBar_placeholderIndicator span:nth-child(1) {
52-
animation-delay: 0.3s;
53-
}
54-
.mx_RoomStatusBar_placeholderIndicator span:nth-child(2) {
55-
animation-delay: 0.6s;
56-
}
57-
.mx_RoomStatusBar_placeholderIndicator span:nth-child(3) {
58-
animation-delay: 0.9s;
59-
}
60-
61-
@keyframes bounce {
62-
from {
63-
opacity: 0.5;
64-
top: 0;
65-
}
66-
67-
to {
68-
opacity: 0.2;
69-
top: -3px;
70-
}
71-
}
72-
7322
.mx_RoomStatusBar_typingIndicatorAvatars {
7423
width: 52px;
7524
margin-top: -1px;
@@ -162,11 +111,6 @@ limitations under the License.
162111
margin-top: 10px;
163112
}
164113

165-
.mx_RoomStatusBar_callBar {
166-
height: 40px;
167-
line-height: $font-40px;
168-
}
169-
170114
.mx_RoomStatusBar_typingBar {
171115
height: 40px;
172116
line-height: $font-40px;

res/css/structures/_UserMenu.scss

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -231,9 +231,29 @@ limitations under the License.
231231
justify-content: center;
232232
}
233233

234+
&.mx_UserMenu_contextMenu_guestPrompts,
234235
&.mx_UserMenu_contextMenu_hostingLink {
235236
padding-top: 0;
236237
}
238+
239+
&.mx_UserMenu_contextMenu_guestPrompts {
240+
display: inline-block;
241+
242+
> span {
243+
font-weight: 600;
244+
display: block;
245+
246+
& + span {
247+
margin-top: 8px;
248+
}
249+
}
250+
251+
.mx_AccessibleButton_kind_link {
252+
font-weight: normal;
253+
font-size: inherit;
254+
padding: 0;
255+
}
256+
}
237257
}
238258

239259
.mx_IconizedContextMenu_icon {

res/css/views/avatars/_BaseAvatar.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ limitations under the License.
4141

4242
.mx_BaseAvatar_image {
4343
object-fit: cover;
44-
border-radius: 40px;
44+
border-radius: 125px;
4545
vertical-align: top;
4646
background-color: $avatar-bg-color;
4747
}
Lines changed: 75 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,75 @@
1+
/*
2+
Copyright 2020 The Matrix.org Foundation C.I.C.
3+
4+
Licensed under the Apache License, Version 2.0 (the "License");
5+
you may not use this file except in compliance with the License.
6+
You may obtain a copy of the License at
7+
8+
http://www.apache.org/licenses/LICENSE-2.0
9+
10+
Unless required by applicable law or agreed to in writing, software
11+
distributed under the License is distributed on an "AS IS" BASIS,
12+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
See the License for the specific language governing permissions and
14+
limitations under the License.
15+
*/
16+
17+
18+
.mx_WidgetCapabilitiesPromptDialog {
19+
.text-muted {
20+
font-size: $font-12px;
21+
}
22+
23+
.mx_Dialog_content {
24+
margin-bottom: 16px;
25+
}
26+
27+
.mx_WidgetCapabilitiesPromptDialog_cap {
28+
margin-top: 20px;
29+
font-size: $font-15px;
30+
line-height: $font-15px;
31+
32+
.mx_WidgetCapabilitiesPromptDialog_byline {
33+
color: $muted-fg-color;
34+
margin-left: 26px;
35+
font-size: $font-12px;
36+
line-height: $font-12px;
37+
}
38+
}
39+
40+
.mx_Dialog_buttons {
41+
margin-top: 40px; // double normal
42+
}
43+
44+
.mx_SettingsFlag {
45+
line-height: calc($font-14px + 7px + 7px); // 7px top & bottom padding
46+
color: $muted-fg-color;
47+
font-size: $font-12px;
48+
49+
.mx_ToggleSwitch {
50+
display: inline-block;
51+
vertical-align: middle;
52+
margin-right: 8px;
53+
54+
// downsize the switch + ball
55+
width: $font-32px;
56+
height: $font-15px;
57+
58+
59+
&.mx_ToggleSwitch_on > .mx_ToggleSwitch_ball {
60+
left: calc(100% - $font-15px);
61+
}
62+
63+
.mx_ToggleSwitch_ball {
64+
width: $font-15px;
65+
height: $font-15px;
66+
border-radius: $font-15px;
67+
}
68+
}
69+
70+
.mx_SettingsFlag_label {
71+
display: inline-block;
72+
vertical-align: middle;
73+
}
74+
}
75+
}

res/css/views/messages/_MVideoBody.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,5 +18,6 @@ span.mx_MVideoBody {
1818
video.mx_MVideoBody {
1919
max-width: 100%;
2020
height: auto;
21+
border-radius: 4px;
2122
}
2223
}

res/css/views/rooms/_IRCLayout.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -186,6 +186,7 @@ $irc-line-height: $font-18px;
186186
overflow: hidden;
187187
text-overflow: ellipsis;
188188
min-width: var(--name-width);
189+
text-align: end;
189190
}
190191
}
191192
}

0 commit comments

Comments
 (0)