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

Commit 6798bf4

Browse files
turt2liveturt2live
authored
Merge branch 'develop' into bigger-emojis
2 parents 2456c52 + 0154c5a commit 6798bf4

File tree

206 files changed

+10999
-3979
lines changed

Some content is hidden

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

206 files changed

+10999
-3979
lines changed

‎.eslintignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
src/component-index.js
22
test/end-to-end-tests/node_modules/
3-
test/end-to-end-tests/riot/
3+
test/end-to-end-tests/element/
44
test/end-to-end-tests/synapse/

‎.eslintignore.errorfiles

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,5 @@ test/components/views/dialogs/InteractiveAuthDialog-test.js
1212
test/mock-clock.js
1313
src/component-index.js
1414
test/end-to-end-tests/node_modules/
15-
test/end-to-end-tests/riot/
15+
test/end-to-end-tests/element/
1616
test/end-to-end-tests/synapse/

‎CHANGELOG.md

Lines changed: 70 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,73 @@
1+
Changes in [3.9.0](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v3.9.0) (2020-11-23)
2+
===================================================================================================
3+
[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v3.9.0-rc.1...v3.9.0)
4+
5+
* Upgrade JS SDK to 9.2.0
6+
* [Release] Fix encrypted video playback in Chrome-based browsers
7+
[\#5431](https://github.com/matrix-org/matrix-react-sdk/pull/5431)
8+
9+
Changes in [3.9.0-rc.1](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v3.9.0-rc.1) (2020-11-18)
10+
=============================================================================================================
11+
[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v3.8.0...v3.9.0-rc.1)
12+
13+
* Upgrade JS SDK to 9.2.0-rc.1
14+
* Translations update from Weblate
15+
[\#5429](https://github.com/matrix-org/matrix-react-sdk/pull/5429)
16+
* Fix message search summary text
17+
[\#5428](https://github.com/matrix-org/matrix-react-sdk/pull/5428)
18+
* Shrink new room intro top margin to half for encryption bubble tile
19+
[\#5427](https://github.com/matrix-org/matrix-react-sdk/pull/5427)
20+
* Small delight tweaks to improve rough corners in the app
21+
[\#5418](https://github.com/matrix-org/matrix-react-sdk/pull/5418)
22+
* Fix DM logic to always pick a more reliable DM room
23+
[\#5424](https://github.com/matrix-org/matrix-react-sdk/pull/5424)
24+
* Update styling of the Analytics toast
25+
[\#5408](https://github.com/matrix-org/matrix-react-sdk/pull/5408)
26+
* Fix vertical centering of the Homepage and button layout
27+
[\#5420](https://github.com/matrix-org/matrix-react-sdk/pull/5420)
28+
* Fix BaseAvatar sometimes messing up and duplicating the url
29+
[\#5422](https://github.com/matrix-org/matrix-react-sdk/pull/5422)
30+
* Disable buttons when required by MSC2790
31+
[\#5412](https://github.com/matrix-org/matrix-react-sdk/pull/5412)
32+
* Fix drag drop file to upload for Safari
33+
[\#5414](https://github.com/matrix-org/matrix-react-sdk/pull/5414)
34+
* Fix poorly i18n'd string
35+
[\#5416](https://github.com/matrix-org/matrix-react-sdk/pull/5416)
36+
* Fix the feedback not closing without feedback/countly
37+
[\#5417](https://github.com/matrix-org/matrix-react-sdk/pull/5417)
38+
* Fix New Room Intro invite to this room button
39+
[\#5419](https://github.com/matrix-org/matrix-react-sdk/pull/5419)
40+
* Change how we expose Role in User Info and hide in DMs
41+
[\#5413](https://github.com/matrix-org/matrix-react-sdk/pull/5413)
42+
* Disallow sending of empty messages
43+
[\#5390](https://github.com/matrix-org/matrix-react-sdk/pull/5390)
44+
* hide some validation tooltips if fields are valid.
45+
[\#5403](https://github.com/matrix-org/matrix-react-sdk/pull/5403)
46+
* Improvements around new room empty space interactions
47+
[\#5398](https://github.com/matrix-org/matrix-react-sdk/pull/5398)
48+
* Implement call hold
49+
[\#5366](https://github.com/matrix-org/matrix-react-sdk/pull/5366)
50+
* Fix Skeleton UI showing up when not intended.
51+
[\#5407](https://github.com/matrix-org/matrix-react-sdk/pull/5407)
52+
* Close context menu when user clicks the Home button
53+
[\#5406](https://github.com/matrix-org/matrix-react-sdk/pull/5406)
54+
* Skip e2ee warn logout prompt if user has no megolm sessions to lose
55+
[\#5410](https://github.com/matrix-org/matrix-react-sdk/pull/5410)
56+
* Allow country names to be translated
57+
[\#5405](https://github.com/matrix-org/matrix-react-sdk/pull/5405)
58+
* Support thirdparty lookup for phone numbers
59+
[\#5396](https://github.com/matrix-org/matrix-react-sdk/pull/5396)
60+
* Change "Password" to "New Password"
61+
[\#5371](https://github.com/matrix-org/matrix-react-sdk/pull/5371)
62+
* Add customisation point for dehydration key
63+
[\#5397](https://github.com/matrix-org/matrix-react-sdk/pull/5397)
64+
* Rebrand Riot -> Element in the permalink classes
65+
[\#5386](https://github.com/matrix-org/matrix-react-sdk/pull/5386)
66+
* Invite / Create DM UX tweaks
67+
[\#5387](https://github.com/matrix-org/matrix-react-sdk/pull/5387)
68+
* Tweaks to toasts and post-registration landing
69+
[\#5383](https://github.com/matrix-org/matrix-react-sdk/pull/5383)
70+
171
Changes in [3.8.0](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v3.8.0) (2020-11-09)
272
===================================================================================================
373
[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v3.8.0-rc.1...v3.8.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.8.0",
3+
"version": "3.9.0",
44
"description": "SDK for matrix.org using React",
55
"author": "matrix.org",
66
"repository": {
@@ -50,7 +50,7 @@
5050
"lint:types": "tsc --noEmit --jsx react",
5151
"lint:style": "stylelint 'res/css/**/*.scss'",
5252
"test": "jest",
53-
"test:e2e": "./test/end-to-end-tests/run.sh --riot-url http://localhost:8080"
53+
"test:e2e": "./test/end-to-end-tests/run.sh --app-url http://localhost:8080"
5454
},
5555
"dependencies": {
5656
"@babel/runtime": "^7.10.5",
@@ -76,10 +76,12 @@
7676
"highlight.js": "^10.1.2",
7777
"html-entities": "^1.3.1",
7878
"is-ip": "^2.0.0",
79+
"katex": "^0.12.0",
80+
"cheerio": "^1.0.0-rc.3",
7981
"linkifyjs": "^2.1.9",
8082
"lodash": "^4.17.19",
8183
"matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop",
82-
"matrix-widget-api": "^0.1.0-beta.5",
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: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,6 @@
4545
@import "./views/auth/_InteractiveAuthEntryComponents.scss";
4646
@import "./views/auth/_LanguageSelector.scss";
4747
@import "./views/auth/_PassphraseField.scss";
48-
@import "./views/auth/_ServerConfig.scss";
49-
@import "./views/auth/_ServerTypeSelector.scss";
5048
@import "./views/auth/_Welcome.scss";
5149
@import "./views/avatars/_BaseAvatar.scss";
5250
@import "./views/avatars/_DecoratedRoomAvatar.scss";
@@ -78,11 +76,13 @@
7876
@import "./views/dialogs/_MessageEditHistoryDialog.scss";
7977
@import "./views/dialogs/_ModalWidgetDialog.scss";
8078
@import "./views/dialogs/_NewSessionReviewDialog.scss";
79+
@import "./views/dialogs/_RegistrationEmailPromptDialog.scss";
8180
@import "./views/dialogs/_RoomSettingsDialog.scss";
8281
@import "./views/dialogs/_RoomSettingsDialogBridges.scss";
8382
@import "./views/dialogs/_RoomUpgradeDialog.scss";
8483
@import "./views/dialogs/_RoomUpgradeWarningDialog.scss";
8584
@import "./views/dialogs/_ServerOfflineDialog.scss";
85+
@import "./views/dialogs/_ServerPickerDialog.scss";
8686
@import "./views/dialogs/_SetEmailDialog.scss";
8787
@import "./views/dialogs/_SettingsDialog.scss";
8888
@import "./views/dialogs/_ShareDialog.scss";
@@ -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";
@@ -110,7 +111,6 @@
110111
@import "./views/elements/_EventListSummary.scss";
111112
@import "./views/elements/_Field.scss";
112113
@import "./views/elements/_FormButton.scss";
113-
@import "./views/elements/_IconButton.scss";
114114
@import "./views/elements/_ImageView.scss";
115115
@import "./views/elements/_InfoTooltip.scss";
116116
@import "./views/elements/_InlineSpinner.scss";
@@ -124,6 +124,8 @@
124124
@import "./views/elements/_RichText.scss";
125125
@import "./views/elements/_RoleButton.scss";
126126
@import "./views/elements/_RoomAliasField.scss";
127+
@import "./views/elements/_SSOButtons.scss";
128+
@import "./views/elements/_ServerPicker.scss";
127129
@import "./views/elements/_Slider.scss";
128130
@import "./views/elements/_Spinner.scss";
129131
@import "./views/elements/_StyledCheckbox.scss";
@@ -228,6 +230,7 @@
228230
@import "./views/settings/tabs/user/_SecurityUserSettingsTab.scss";
229231
@import "./views/settings/tabs/user/_VoiceUserSettingsTab.scss";
230232
@import "./views/terms/_InlineTermsAgreement.scss";
233+
@import "./views/toasts/_AnalyticsToast.scss";
231234
@import "./views/toasts/_NonUrgentEchoFailureToast.scss";
232235
@import "./views/verification/_VerificationShowSas.scss";
233236
@import "./views/voip/_CallContainer.scss";

‎res/css/structures/_HomePage.scss

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

2727
.mx_HomePage_default {
2828
text-align: center;
29+
display: flex;
2930

3031
.mx_HomePage_default_wrapper {
31-
padding: 25vh 0 12px;
32+
margin: auto;
3233
}
3334

3435
img {
@@ -55,15 +56,15 @@ limitations under the License.
5556
}
5657

5758
.mx_HomePage_default_buttons {
58-
margin: 80px auto 0;
59+
margin: 60px auto 0;
5960
width: fit-content;
6061

6162
.mx_AccessibleButton {
6263
padding: 73px 8px 15px; // top: 20px top padding + 40px icon + 13px margin
6364

6465
width: 160px;
6566
height: 132px;
66-
margin: 0 20px;
67+
margin: 20px;
6768
position: relative;
6869
display: inline-block;
6970
border-radius: 8px;

‎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/structures/auth/_Login.scss

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ limitations under the License.
1818
.mx_Login_submit {
1919
@mixin mx_DialogButton;
2020
width: 100%;
21-
margin-top: 35px;
21+
margin-top: 24px;
2222
margin-bottom: 24px;
2323
box-sizing: border-box;
2424
text-align: center;
@@ -33,12 +33,6 @@ limitations under the License.
3333
cursor: default;
3434
}
3535

36-
.mx_AuthBody a.mx_Login_sso_link:link,
37-
.mx_AuthBody a.mx_Login_sso_link:hover,
38-
.mx_AuthBody a.mx_Login_sso_link:visited {
39-
color: $button-primary-fg-color;
40-
}
41-
4236
.mx_Login_loader {
4337
display: inline;
4438
position: relative;
@@ -91,6 +85,8 @@ limitations under the License.
9185
}
9286

9387
div.mx_AccessibleButton_kind_link.mx_Login_forgot {
88+
display: block;
89+
margin: 0 auto;
9490
// style it as a link
9591
font-size: inherit;
9692
padding: 0;

‎res/css/views/auth/_AuthBody.scss

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,10 @@ limitations under the License.
3737
color: $authpage-primary-color;
3838
}
3939

40+
h3.mx_AuthBody_centered {
41+
text-align: center;
42+
}
43+
4044
a:link,
4145
a:hover,
4246
a:visited {
@@ -96,12 +100,6 @@ limitations under the License.
96100
}
97101
}
98102

99-
.mx_AuthBody_editServerDetails {
100-
padding-left: 1em;
101-
font-size: $font-12px;
102-
font-weight: normal;
103-
}
104-
105103
.mx_AuthBody_fieldRow {
106104
display: flex;
107105
margin-bottom: 10px;
@@ -146,6 +144,14 @@ limitations under the License.
146144
display: block;
147145
text-align: center;
148146
width: 100%;
147+
148+
> a {
149+
font-weight: $font-semi-bold;
150+
}
151+
}
152+
153+
.mx_SSOButtons + .mx_AuthBody_changeFlow {
154+
margin-top: 24px;
149155
}
150156

151157
.mx_AuthBody_spinner {

0 commit comments

Comments
 (0)