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

Commit b97ff34

Browse files
author
Kerry Archibald
committed
Merge branch 'develop' into psg-682/display-client-info
2 parents ad81d2c + a704a2f commit b97ff34

File tree

74 files changed

+2856
-759
lines changed

Some content is hidden

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

74 files changed

+2856
-759
lines changed

‎CHANGELOG.md

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,52 @@
1+
Changes in [3.57.0](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v3.57.0) (2022-09-28)
2+
=====================================================================================================
3+
4+
## 🐛 Bug Fixes
5+
* Bump IDB crypto store version ([\#2705](https://github.com/matrix-org/matrix-js-sdk/pull/2705)).
6+
7+
Changes in [3.56.0](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v3.56.0) (2022-09-28)
8+
=====================================================================================================
9+
10+
## 🔒 Security
11+
* Fix for [CVE-2022-39249](https://cve.mitre.org/cgi-bin/cvekey.cgi?keyword=CVE%2D2022%2D39249)
12+
* Fix for [CVE-2022-39250](https://cve.mitre.org/cgi-bin/cvekey.cgi?keyword=CVE%2D2022%2D39250)
13+
* Fix for [CVE-2022-39251](https://cve.mitre.org/cgi-bin/cvekey.cgi?keyword=CVE%2D2022%2D39251)
14+
* Fix for [CVE-2022-39236](https://cve.mitre.org/cgi-bin/cvekey.cgi?keyword=CVE%2D2022%2D39236)
15+
16+
Changes in [3.55.0](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v3.55.0) (2022-09-20)
17+
===============================================================================================================
18+
19+
## ✨ Features
20+
* Element Call video rooms ([\#9267](https://github.com/matrix-org/matrix-react-sdk/pull/9267)).
21+
* Device manager - rename session ([\#9282](https://github.com/matrix-org/matrix-react-sdk/pull/9282)).
22+
* Allow widgets to read related events ([\#9210](https://github.com/matrix-org/matrix-react-sdk/pull/9210)). Contributed by @dhenneke.
23+
* Device manager - logout of other session ([\#9280](https://github.com/matrix-org/matrix-react-sdk/pull/9280)).
24+
* Device manager - logout current session ([\#9275](https://github.com/matrix-org/matrix-react-sdk/pull/9275)).
25+
* Device manager - verify other devices ([\#9274](https://github.com/matrix-org/matrix-react-sdk/pull/9274)).
26+
* Allow integration managers to remove users ([\#9211](https://github.com/matrix-org/matrix-react-sdk/pull/9211)).
27+
* Device manager - add verify current session button ([\#9252](https://github.com/matrix-org/matrix-react-sdk/pull/9252)).
28+
* Add NotifPanel dot back. ([\#9242](https://github.com/matrix-org/matrix-react-sdk/pull/9242)). Fixes vector-im/element-web#17641.
29+
* Implement MSC3575: Sliding Sync ([\#8328](https://github.com/matrix-org/matrix-react-sdk/pull/8328)).
30+
* Add the clipboard read permission for widgets ([\#9250](https://github.com/matrix-org/matrix-react-sdk/pull/9250)). Contributed by @stefanmuhle.
31+
32+
## 🐛 Bug Fixes
33+
* Make autocomplete pop-up wider in thread view ([\#9289](https://github.com/matrix-org/matrix-react-sdk/pull/9289)).
34+
* Fix soft crash around inviting invalid MXIDs in start DM on first message flow ([\#9281](https://github.com/matrix-org/matrix-react-sdk/pull/9281)). Fixes matrix-org/element-web-rageshakes#15060 and matrix-org/element-web-rageshakes#15140.
35+
* Fix in-reply-to previews not disappearing when swapping rooms ([\#9278](https://github.com/matrix-org/matrix-react-sdk/pull/9278)).
36+
* Fix invalid instanceof operand window.OffscreenCanvas ([\#9276](https://github.com/matrix-org/matrix-react-sdk/pull/9276)). Fixes vector-im/element-web#23275.
37+
* Fix memory leak caused by unremoved listener ([\#9273](https://github.com/matrix-org/matrix-react-sdk/pull/9273)).
38+
* Fix thumbnail generation when offscreen canvas fails ([\#9272](https://github.com/matrix-org/matrix-react-sdk/pull/9272)). Fixes vector-im/element-web#23265.
39+
* Prevent sliding sync from showing a room under multiple sublists ([\#9266](https://github.com/matrix-org/matrix-react-sdk/pull/9266)).
40+
* Fix tile crash around tooltipify links ([\#9270](https://github.com/matrix-org/matrix-react-sdk/pull/9270)). Fixes vector-im/element-web#23253.
41+
* Device manager - filter out nulled metadatas in device tile properly ([\#9251](https://github.com/matrix-org/matrix-react-sdk/pull/9251)).
42+
* Fix a sliding sync bug which could cause rooms to loop ([\#9268](https://github.com/matrix-org/matrix-react-sdk/pull/9268)).
43+
* Remove the grey gradient on images in bubbles in the timeline ([\#9241](https://github.com/matrix-org/matrix-react-sdk/pull/9241)). Fixes vector-im/element-web#21651.
44+
* Fix html export not including images ([\#9260](https://github.com/matrix-org/matrix-react-sdk/pull/9260)). Fixes vector-im/element-web#22059.
45+
* Fix possible soft crash from a race condition in space hierarchies ([\#9254](https://github.com/matrix-org/matrix-react-sdk/pull/9254)). Fixes matrix-org/element-web-rageshakes#15225.
46+
* Disable all types of autocorrect, -complete, -capitalize, etc on Spotlight's search field ([\#9259](https://github.com/matrix-org/matrix-react-sdk/pull/9259)).
47+
* Handle M_INVALID_USERNAME on /register/available ([\#9237](https://github.com/matrix-org/matrix-react-sdk/pull/9237)). Fixes vector-im/element-web#23161.
48+
* Fix issue with quiet zone around QR code ([\#9243](https://github.com/matrix-org/matrix-react-sdk/pull/9243)). Fixes vector-im/element-web#23199.
49+
150
Changes in [3.54.0](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v3.54.0) (2022-09-13)
251
=====================================================================================================
352

‎cypress/e2e/spotlight/spotlight.spec.ts

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ Cypress.Commands.add("startDM", (name: string) => {
125125
.should("have.focus")
126126
.type("Hey!{enter}");
127127
cy.contains(".mx_EventTile_body", "Hey!");
128-
cy.get(".mx_RoomSublist[aria-label=People]").should("contain", name);
128+
cy.contains(".mx_RoomSublist[aria-label=People]", name);
129129
});
130130

131131
describe("Spotlight", () => {
@@ -365,7 +365,10 @@ describe("Spotlight", () => {
365365
cy.spotlightSearch().clear().type(bot1.getUserId());
366366
cy.wait(1000); // wait for the dialog code to settle
367367
cy.spotlightResults().should("have.length", 2);
368-
cy.spotlightResults().eq(0).should("contain", groupDm.name);
368+
cy.contains(
369+
".mx_SpotlightDialog_section.mx_SpotlightDialog_results .mx_SpotlightDialog_option",
370+
groupDm.name,
371+
);
369372
});
370373

371374
// Search for ByteBot by id, should return group DM and user
@@ -374,7 +377,10 @@ describe("Spotlight", () => {
374377
cy.spotlightSearch().clear().type(bot2.getUserId());
375378
cy.wait(1000); // wait for the dialog code to settle
376379
cy.spotlightResults().should("have.length", 2);
377-
cy.spotlightResults().eq(0).should("contain", groupDm.name);
380+
cy.contains(
381+
".mx_SpotlightDialog_section.mx_SpotlightDialog_results .mx_SpotlightDialog_option",
382+
groupDm.name,
383+
);
378384
});
379385
});
380386
});

‎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.54.0",
3+
"version": "3.57.0",
44
"description": "SDK for matrix.org using React",
55
"author": "matrix.org",
66
"repository": {
@@ -169,7 +169,7 @@
169169
"@typescript-eslint/eslint-plugin": "^5.35.1",
170170
"@typescript-eslint/parser": "^5.6.0",
171171
"@wojtekmaj/enzyme-adapter-react-17": "^0.6.1",
172-
"allchange": "^1.0.6",
172+
"allchange": "^1.1.0",
173173
"axe-core": "^4.4.3",
174174
"babel-jest": "^26.6.3",
175175
"blob-polyfill": "^6.0.20211015",

‎res/css/_components.pcss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@
3636
@import "./components/views/settings/devices/_DeviceTile.pcss";
3737
@import "./components/views/settings/devices/_DeviceType.pcss";
3838
@import "./components/views/settings/devices/_FilteredDeviceList.pcss";
39+
@import "./components/views/settings/devices/_FilteredDeviceListHeader.pcss";
3940
@import "./components/views/settings/devices/_SecurityRecommendations.pcss";
4041
@import "./components/views/settings/devices/_SelectableDeviceTile.pcss";
4142
@import "./components/views/settings/shared/_SettingsSubsection.pcss";
@@ -73,7 +74,6 @@
7374
@import "./structures/_ToastContainer.pcss";
7475
@import "./structures/_UploadBar.pcss";
7576
@import "./structures/_UserMenu.pcss";
76-
@import "./structures/_VideoRoomView.pcss";
7777
@import "./structures/_ViewSource.pcss";
7878
@import "./structures/auth/_CompleteSecurity.pcss";
7979
@import "./structures/auth/_Login.pcss";
@@ -347,7 +347,7 @@
347347
@import "./views/user-onboarding/_UserOnboardingTask.pcss";
348348
@import "./views/verification/_VerificationShowSas.pcss";
349349
@import "./views/voip/LegacyCallView/_LegacyCallViewButtons.pcss";
350-
@import "./views/voip/_CallLobby.pcss";
350+
@import "./views/voip/_CallView.pcss";
351351
@import "./views/voip/_DialPad.pcss";
352352
@import "./views/voip/_DialPadContextMenu.pcss";
353353
@import "./views/voip/_DialPadModal.pcss";

‎res/css/components/views/settings/devices/_DeviceDetails.pcss

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,13 @@ limitations under the License.
4646

4747
.mx_DeviceDetails_sectionHeading {
4848
margin: 0;
49+
50+
.mx_DeviceDetails_sectionSubheading {
51+
display: block;
52+
font-size: $font-12px;
53+
color: $secondary-content;
54+
line-height: $font-14px;
55+
}
4956
}
5057

5158
.mx_DeviceDetails_metadataTable {
@@ -81,3 +88,10 @@ limitations under the License.
8188
align-items: center;
8289
gap: $spacing-4;
8390
}
91+
92+
.mx_DeviceDetails_pushNotifications {
93+
display: block;
94+
.mx_ToggleSwitch {
95+
float: right;
96+
}
97+
}

‎res/css/components/views/settings/devices/_FilteredDeviceList.pcss

Lines changed: 4 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -20,26 +20,6 @@ limitations under the License.
2020
}
2121
}
2222

23-
.mx_FilteredDeviceList_header {
24-
display: flex;
25-
flex-direction: row;
26-
align-items: center;
27-
box-sizing: border-box;
28-
29-
width: 100%;
30-
height: 48px;
31-
padding: 0 $spacing-16;
32-
margin-bottom: $spacing-32;
33-
34-
background-color: $system;
35-
border-radius: 8px;
36-
color: $secondary-content;
37-
}
38-
39-
.mx_FilteredDeviceList_headerLabel {
40-
flex: 1 1 100%;
41-
}
42-
4323
.mx_FilteredDeviceList_list {
4424
list-style-type: none;
4525
display: grid;
@@ -62,3 +42,7 @@ limitations under the License.
6242
text-align: center;
6343
margin-bottom: $spacing-32;
6444
}
45+
46+
.mx_FilteredDeviceList_headerButton {
47+
flex-shrink: 0;
48+
}

‎res/css/structures/_VideoRoomView.pcss renamed to ‎res/css/components/views/settings/devices/_FilteredDeviceListHeader.pcss

Lines changed: 15 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -14,27 +14,23 @@ See the License for the specific language governing permissions and
1414
limitations under the License.
1515
*/
1616

17-
.mx_VideoRoomView {
18-
flex-grow: 1;
19-
min-height: 0;
20-
17+
.mx_FilteredDeviceListHeader {
2118
display: flex;
22-
flex-direction: column;
23-
margin: $container-gap-width;
24-
margin-right: calc($container-gap-width / 2);
19+
flex-direction: row;
20+
align-items: center;
21+
box-sizing: border-box;
22+
gap: $spacing-16;
2523

26-
background-color: $header-panel-bg-color;
27-
padding: 8px;
28-
border-radius: 8px;
24+
width: 100%;
25+
height: 48px;
26+
padding: 0 $spacing-16;
27+
margin-bottom: $spacing-32;
2928

30-
.mx_AppTile {
31-
width: auto;
32-
height: 100%;
33-
border: none;
34-
}
29+
background-color: $system;
30+
border-radius: 8px;
31+
color: $secondary-content;
32+
}
3533

36-
/* While the lobby is shown, the widget needs to stay loaded but hidden in the background */
37-
.mx_CallLobby ~ .mx_AppTile {
38-
display: none;
39-
}
34+
.mx_FilteredDeviceListHeader_label {
35+
flex: 1 1 100%;
4036
}

‎res/css/views/elements/_AccessibleButton.pcss

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,8 @@ limitations under the License.
139139

140140
&.mx_AccessibleButton_kind_link,
141141
&.mx_AccessibleButton_kind_link_inline,
142-
&.mx_AccessibleButton_kind_danger_inline {
142+
&.mx_AccessibleButton_kind_danger_inline,
143+
&.mx_AccessibleButton_kind_content_inline {
143144
font-size: inherit;
144145
font-weight: normal;
145146
line-height: inherit;
@@ -155,8 +156,13 @@ limitations under the License.
155156
color: $alert;
156157
}
157158

159+
&.mx_AccessibleButton_kind_content_inline {
160+
color: $primary-content;
161+
}
162+
158163
&.mx_AccessibleButton_kind_link_inline,
159-
&.mx_AccessibleButton_kind_danger_inline {
164+
&.mx_AccessibleButton_kind_danger_inline,
165+
&.mx_AccessibleButton_kind_content_inline {
160166
display: inline;
161167
}
162168

‎res/css/views/elements/_ToggleSwitch.pcss

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,10 @@ limitations under the License.
2626

2727
background-color: $togglesw-off-color;
2828
opacity: 0.5;
29+
30+
&[aria-disabled="true"] {
31+
cursor: not-allowed;
32+
}
2933
}
3034

3135
.mx_ToggleSwitch_enabled {

0 commit comments

Comments
 (0)