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

Commit 299467c

Browse files
committed
Merge remote-tracking branch 'origin/develop' into dbkr/attended_transfer
2 parents 989d69b + b68fabb commit 299467c

File tree

116 files changed

+6083
-1608
lines changed

Some content is hidden

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

116 files changed

+6083
-1608
lines changed

CHANGELOG.md

Lines changed: 93 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,96 @@
1+
Changes in [3.17.0](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v3.17.0) (2021-03-29)
2+
=====================================================================================================
3+
[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v3.17.0-rc.1...v3.17.0)
4+
5+
* Upgrade to JS SDK 9.10.0
6+
* [Release] Tweak cross-signing copy
7+
[\#5808](https://github.com/matrix-org/matrix-react-sdk/pull/5808)
8+
* [Release] Fix crash on login when using social login
9+
[\#5809](https://github.com/matrix-org/matrix-react-sdk/pull/5809)
10+
* [Release] Fix edge case with redaction grouper messing up continuations
11+
[\#5799](https://github.com/matrix-org/matrix-react-sdk/pull/5799)
12+
13+
Changes in [3.17.0-rc.1](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v3.17.0-rc.1) (2021-03-25)
14+
===============================================================================================================
15+
[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v3.16.0...v3.17.0-rc.1)
16+
17+
* Upgrade to JS SDK 9.10.0-rc.1
18+
* Translations update from Weblate
19+
[\#5788](https://github.com/matrix-org/matrix-react-sdk/pull/5788)
20+
* Track next event [tile] over group boundaries
21+
[\#5784](https://github.com/matrix-org/matrix-react-sdk/pull/5784)
22+
* Fixing the minor UI issues in the email discovery
23+
[\#5780](https://github.com/matrix-org/matrix-react-sdk/pull/5780)
24+
* Don't overwrite callback with undefined if no customization provided
25+
[\#5783](https://github.com/matrix-org/matrix-react-sdk/pull/5783)
26+
* Fix redaction event list summaries breaking sender profiles
27+
[\#5781](https://github.com/matrix-org/matrix-react-sdk/pull/5781)
28+
* Fix CIDER formatting buttons on Safari
29+
[\#5782](https://github.com/matrix-org/matrix-react-sdk/pull/5782)
30+
* Improve discovery of rooms in a space
31+
[\#5776](https://github.com/matrix-org/matrix-react-sdk/pull/5776)
32+
* Spaces improve creation journeys
33+
[\#5777](https://github.com/matrix-org/matrix-react-sdk/pull/5777)
34+
* Make buttons in verify dialog respect the system font
35+
[\#5778](https://github.com/matrix-org/matrix-react-sdk/pull/5778)
36+
* Collapse redactions into an event list summary
37+
[\#5728](https://github.com/matrix-org/matrix-react-sdk/pull/5728)
38+
* Added invite option to room's context menu
39+
[\#5648](https://github.com/matrix-org/matrix-react-sdk/pull/5648)
40+
* Add an optional config option to make the welcome page the login page
41+
[\#5658](https://github.com/matrix-org/matrix-react-sdk/pull/5658)
42+
* Fix username showing instead of display name in Jitsi widgets
43+
[\#5770](https://github.com/matrix-org/matrix-react-sdk/pull/5770)
44+
* Convert a bunch more js-sdk imports to absolute paths
45+
[\#5774](https://github.com/matrix-org/matrix-react-sdk/pull/5774)
46+
* Remove forgotten rooms from the room list once forgotten
47+
[\#5775](https://github.com/matrix-org/matrix-react-sdk/pull/5775)
48+
* Log error when failing to list usermedia devices
49+
[\#5771](https://github.com/matrix-org/matrix-react-sdk/pull/5771)
50+
* Fix weird timeline jumps
51+
[\#5772](https://github.com/matrix-org/matrix-react-sdk/pull/5772)
52+
* Replace type declaration in Registration.tsx
53+
[\#5773](https://github.com/matrix-org/matrix-react-sdk/pull/5773)
54+
* Add possibility to delay rageshake persistence in app startup
55+
[\#5767](https://github.com/matrix-org/matrix-react-sdk/pull/5767)
56+
* Fix left panel resizing and lower min-width improving flexibility
57+
[\#5764](https://github.com/matrix-org/matrix-react-sdk/pull/5764)
58+
* Work around more cases where a rageshake server might not be present
59+
[\#5766](https://github.com/matrix-org/matrix-react-sdk/pull/5766)
60+
* Iterate space panel visually and functionally
61+
[\#5761](https://github.com/matrix-org/matrix-react-sdk/pull/5761)
62+
* Make some dispatches async
63+
[\#5765](https://github.com/matrix-org/matrix-react-sdk/pull/5765)
64+
* fix: make room directory correct when using a homeserver with explicit port
65+
[\#5762](https://github.com/matrix-org/matrix-react-sdk/pull/5762)
66+
* Hangup all calls on logout
67+
[\#5756](https://github.com/matrix-org/matrix-react-sdk/pull/5756)
68+
* Remove now-unused assets and CSS from CompleteSecurity step
69+
[\#5757](https://github.com/matrix-org/matrix-react-sdk/pull/5757)
70+
* Add details and summary to allowed HTML tags
71+
[\#5760](https://github.com/matrix-org/matrix-react-sdk/pull/5760)
72+
* Support a media handling customisation endpoint
73+
[\#5714](https://github.com/matrix-org/matrix-react-sdk/pull/5714)
74+
* Edit button on View Source dialog that takes you to devtools ->
75+
SendCustomEvent
76+
[\#5718](https://github.com/matrix-org/matrix-react-sdk/pull/5718)
77+
* Show room alias in plain/formatted body
78+
[\#5748](https://github.com/matrix-org/matrix-react-sdk/pull/5748)
79+
* Allow pills on the beginning of a part string
80+
[\#5754](https://github.com/matrix-org/matrix-react-sdk/pull/5754)
81+
* [SK-3] Decorate easy components with replaceableComponent
82+
[\#5734](https://github.com/matrix-org/matrix-react-sdk/pull/5734)
83+
* Use fsync in reskindex to ensure file is written to disk
84+
[\#5753](https://github.com/matrix-org/matrix-react-sdk/pull/5753)
85+
* Remove unused common CSS classes
86+
[\#5752](https://github.com/matrix-org/matrix-react-sdk/pull/5752)
87+
* Rebuild space previews with new designs
88+
[\#5751](https://github.com/matrix-org/matrix-react-sdk/pull/5751)
89+
* Rework cross-signing login flow
90+
[\#5727](https://github.com/matrix-org/matrix-react-sdk/pull/5727)
91+
* Change read receipt drift to be non-fractional
92+
[\#5745](https://github.com/matrix-org/matrix-react-sdk/pull/5745)
93+
194
Changes in [3.16.0](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v3.16.0) (2021-03-15)
295
=====================================================================================================
396
[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v3.16.0-rc.2...v3.16.0)

package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "matrix-react-sdk",
3-
"version": "3.16.0",
3+
"version": "3.17.0",
44
"description": "SDK for matrix.org using React",
55
"author": "matrix.org",
66
"repository": {
@@ -83,6 +83,7 @@
8383
"matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop",
8484
"matrix-widget-api": "^0.1.0-beta.13",
8585
"minimist": "^1.2.5",
86+
"opus-recorder": "^8.0.3",
8687
"pako": "^2.0.3",
8788
"parse5": "^6.0.1",
8889
"png-chunks-extract": "^1.0.0",

res/css/_components.scss

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,12 +111,13 @@
111111
@import "./views/elements/_AddressSelector.scss";
112112
@import "./views/elements/_AddressTile.scss";
113113
@import "./views/elements/_DesktopBuildsNotice.scss";
114-
@import "./views/elements/_DirectorySearchBox.scss";
115114
@import "./views/elements/_DesktopCapturerSourcePicker.scss";
115+
@import "./views/elements/_DirectorySearchBox.scss";
116116
@import "./views/elements/_Dropdown.scss";
117117
@import "./views/elements/_EditableItemList.scss";
118118
@import "./views/elements/_ErrorBoundary.scss";
119119
@import "./views/elements/_EventListSummary.scss";
120+
@import "./views/elements/_FacePile.scss";
120121
@import "./views/elements/_Field.scss";
121122
@import "./views/elements/_FormButton.scss";
122123
@import "./views/elements/_ImageView.scss";
@@ -211,20 +212,21 @@
211212
@import "./views/rooms/_SendMessageComposer.scss";
212213
@import "./views/rooms/_Stickers.scss";
213214
@import "./views/rooms/_TopUnreadMessagesBar.scss";
215+
@import "./views/rooms/_VoiceRecordComposerTile.scss";
214216
@import "./views/rooms/_WhoIsTypingTile.scss";
215217
@import "./views/settings/_AvatarSetting.scss";
216218
@import "./views/settings/_CrossSigningPanel.scss";
217219
@import "./views/settings/_DevicesPanel.scss";
218220
@import "./views/settings/_E2eAdvancedPanel.scss";
219221
@import "./views/settings/_EmailAddresses.scss";
220-
@import "./views/settings/_SpellCheckLanguages.scss";
221222
@import "./views/settings/_IntegrationManager.scss";
222223
@import "./views/settings/_Notifications.scss";
223224
@import "./views/settings/_PhoneNumbers.scss";
224225
@import "./views/settings/_ProfileSettings.scss";
225226
@import "./views/settings/_SecureBackupPanel.scss";
226227
@import "./views/settings/_SetIdServer.scss";
227228
@import "./views/settings/_SetIntegrationManager.scss";
229+
@import "./views/settings/_SpellCheckLanguages.scss";
228230
@import "./views/settings/_UpdateCheckButton.scss";
229231
@import "./views/settings/tabs/_SettingsTab.scss";
230232
@import "./views/settings/tabs/room/_GeneralRoomSettingsTab.scss";
@@ -245,6 +247,7 @@
245247
@import "./views/toasts/_AnalyticsToast.scss";
246248
@import "./views/toasts/_NonUrgentEchoFailureToast.scss";
247249
@import "./views/verification/_VerificationShowSas.scss";
250+
@import "./views/voice_messages/_Waveform.scss";
248251
@import "./views/voip/_CallContainer.scss";
249252
@import "./views/voip/_CallView.scss";
250253
@import "./views/voip/_DialPad.scss";

res/css/structures/_LeftPanel.scss

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,10 @@ $roomListCollapsedWidth: 68px;
130130
mask-repeat: no-repeat;
131131
background: $secondary-fg-color;
132132
}
133+
134+
&.mx_LeftPanel_exploreButton_space::before {
135+
mask-image: url('$(res)/img/element-icons/roomlist/browse.svg');
136+
}
133137
}
134138
}
135139

res/css/structures/_RoomSearch.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ limitations under the License.
2222
// keep border thickness consistent to prevent movement
2323
border: 1px solid transparent;
2424
height: 28px;
25-
padding: 2px;
25+
padding: 1px;
2626

2727
// Create a flexbox for the icons (easier to manage)
2828
display: flex;

res/css/structures/_SpacePanel.scss

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -146,9 +146,6 @@ $activeBorderColor: $secondary-fg-color;
146146

147147
.mx_SpaceButton_toggleCollapse {
148148
width: $gutterSize;
149-
// negative margin to place it correctly even with the complex
150-
// 4px selection border each space button has when active
151-
margin-right: -4px;
152149
height: 20px;
153150
mask-position: center;
154151
mask-size: 20px;
@@ -333,20 +330,20 @@ $activeBorderColor: $secondary-fg-color;
333330
mask-image: url('$(res)/img/element-icons/leave.svg');
334331
}
335332

336-
.mx_SpacePanel_iconHome::before {
337-
mask-image: url('$(res)/img/element-icons/roomlist/home.svg');
338-
}
339-
340333
.mx_SpacePanel_iconMembers::before {
341334
mask-image: url('$(res)/img/element-icons/room/members.svg');
342335
}
343336

344337
.mx_SpacePanel_iconPlus::before {
345-
mask-image: url('$(res)/img/element-icons/plus.svg');
338+
mask-image: url('$(res)/img/element-icons/roomlist/plus-circle.svg');
339+
}
340+
341+
.mx_SpacePanel_iconHash::before {
342+
mask-image: url('$(res)/img/element-icons/roomlist/hash-circle.svg');
346343
}
347344

348345
.mx_SpacePanel_iconExplore::before {
349-
mask-image: url('$(res)/img/element-icons/roomlist/explore.svg');
346+
mask-image: url('$(res)/img/element-icons/roomlist/browse.svg');
350347
}
351348
}
352349

res/css/structures/_SpaceRoomDirectory.scss

Lines changed: 21 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -182,14 +182,15 @@ limitations under the License.
182182

183183
.mx_SpaceRoomDirectory_roomTile {
184184
position: relative;
185-
padding: 6px 16px;
185+
padding: 8px 16px;
186186
border-radius: 8px;
187187
min-height: 56px;
188188
box-sizing: border-box;
189189

190190
display: grid;
191191
grid-template-columns: 20px auto max-content;
192192
grid-column-gap: 8px;
193+
grid-row-gap: 6px;
193194
align-items: center;
194195

195196
.mx_BaseAvatar {
@@ -213,16 +214,28 @@ limitations under the License.
213214

214215
.mx_InfoTooltip_icon {
215216
margin-right: 4px;
217+
position: relative;
218+
vertical-align: text-top;
219+
220+
&::before {
221+
position: absolute;
222+
top: 0;
223+
left: 0;
224+
}
216225
}
217226
}
218227
}
219228

220229
.mx_SpaceRoomDirectory_roomTile_info {
221-
font-size: $font-12px;
222-
line-height: $font-15px;
223-
color: $tertiary-fg-color;
230+
font-size: $font-14px;
231+
line-height: $font-18px;
232+
color: $secondary-fg-color;
224233
grid-row: 2;
225234
grid-column: 1/3;
235+
display: -webkit-box;
236+
-webkit-box-orient: vertical;
237+
-webkit-line-clamp: 2;
238+
overflow: hidden;
226239
}
227240

228241
.mx_SpaceRoomDirectory_actions {
@@ -232,9 +245,9 @@ limitations under the License.
232245
grid-row: 1/3;
233246

234247
.mx_AccessibleButton {
235-
padding: 6px 18px;
236-
237-
display: none;
248+
padding: 8px 18px;
249+
display: inline-block;
250+
visibility: hidden;
238251
}
239252

240253
.mx_Checkbox {
@@ -248,7 +261,7 @@ limitations under the License.
248261
background-color: $groupFilterPanel-bg-color;
249262

250263
.mx_AccessibleButton {
251-
display: inline-block;
264+
visibility: visible;
252265
}
253266
}
254267
}

0 commit comments

Comments
 (0)