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

Commit 532b2e5

Browse files
t3chguyt3chguy
committed
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/home-page-analytics
� Conflicts: � src/components/structures/HomePage.tsx
2 parents 453c956 + 44649ca commit 532b2e5

File tree

105 files changed

+5813
-1616
lines changed

Some content is hidden

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

105 files changed

+5813
-1616
lines changed

‎CHANGELOG.md‎

Lines changed: 76 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,79 @@
1+
Changes in [3.8.0](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v3.8.0) (2020-11-09)
2+
===================================================================================================
3+
[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v3.8.0-rc.1...v3.8.0)
4+
5+
* Upgrade JS SDK to 9.1.0
6+
7+
Changes in [3.8.0-rc.1](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v3.8.0-rc.1) (2020-11-04)
8+
=============================================================================================================
9+
[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v3.7.1...v3.8.0-rc.1)
10+
11+
* Upgrade JS SDK to 9.1.0-rc.1
12+
* Log when saving profile
13+
[\#5394](https://github.com/matrix-org/matrix-react-sdk/pull/5394)
14+
* Translations update from Weblate
15+
[\#5395](https://github.com/matrix-org/matrix-react-sdk/pull/5395)
16+
* Hide prompt to add email for notifications if 3pid ui feature is off
17+
[\#5392](https://github.com/matrix-org/matrix-react-sdk/pull/5392)
18+
* Fix room list message preview copy for hangup events
19+
[\#5388](https://github.com/matrix-org/matrix-react-sdk/pull/5388)
20+
* Track UISIs as Countly Events
21+
[\#5382](https://github.com/matrix-org/matrix-react-sdk/pull/5382)
22+
* Don't let users accidentally redact ACL events
23+
[\#5384](https://github.com/matrix-org/matrix-react-sdk/pull/5384)
24+
* Two more easy files to remove from eslintignore
25+
[\#5378](https://github.com/matrix-org/matrix-react-sdk/pull/5378)
26+
* Fix Widget OpenID Permissions for realsies
27+
[\#5381](https://github.com/matrix-org/matrix-react-sdk/pull/5381)
28+
* Fix regression with OpenID permissions on widgets
29+
[\#5380](https://github.com/matrix-org/matrix-react-sdk/pull/5380)
30+
* Fix room directory events happening in the wrong order for Funnels
31+
[\#5379](https://github.com/matrix-org/matrix-react-sdk/pull/5379)
32+
* Remove a couple more files from eslintignore
33+
[\#5377](https://github.com/matrix-org/matrix-react-sdk/pull/5377)
34+
* Fix countly method bindings and errors
35+
[\#5376](https://github.com/matrix-org/matrix-react-sdk/pull/5376)
36+
* Fix a bunch of silly lint errors
37+
[\#5375](https://github.com/matrix-org/matrix-react-sdk/pull/5375)
38+
* Typescript: ImageUtils
39+
[\#5374](https://github.com/matrix-org/matrix-react-sdk/pull/5374)
40+
* Convert AuxPanel to TypeScript
41+
[\#5373](https://github.com/matrix-org/matrix-react-sdk/pull/5373)
42+
* Only pass metrics if they exist otherwise Countly will be unhappy!
43+
[\#5372](https://github.com/matrix-org/matrix-react-sdk/pull/5372)
44+
* Fix CountlyAnalytics NPE on MatrixClientPeg
45+
[\#5370](https://github.com/matrix-org/matrix-react-sdk/pull/5370)
46+
* fix CountlyAnalytics canEnable on wrong target
47+
[\#5369](https://github.com/matrix-org/matrix-react-sdk/pull/5369)
48+
* Initial Countly work
49+
[\#5365](https://github.com/matrix-org/matrix-react-sdk/pull/5365)
50+
* Fix videos not playing in non-encrypted rooms
51+
[\#5368](https://github.com/matrix-org/matrix-react-sdk/pull/5368)
52+
* Fix custom tag layout which regressed in #5309
53+
[\#5367](https://github.com/matrix-org/matrix-react-sdk/pull/5367)
54+
* Watch replyToEvent at RoomView to prevent races
55+
[\#5360](https://github.com/matrix-org/matrix-react-sdk/pull/5360)
56+
* Add a UI Feature flag for room history settings
57+
[\#5362](https://github.com/matrix-org/matrix-react-sdk/pull/5362)
58+
* Hide inline images when preference disabled
59+
[\#5361](https://github.com/matrix-org/matrix-react-sdk/pull/5361)
60+
* Fix React warning by moving handler to each button
61+
[\#5359](https://github.com/matrix-org/matrix-react-sdk/pull/5359)
62+
* Do not preload encrypted videos|images unless autoplay or thumbnailing is on
63+
[\#5352](https://github.com/matrix-org/matrix-react-sdk/pull/5352)
64+
* Fix theme variable passed to Jitsi
65+
[\#5357](https://github.com/matrix-org/matrix-react-sdk/pull/5357)
66+
* docs: added comment explanation
67+
[\#5349](https://github.com/matrix-org/matrix-react-sdk/pull/5349)
68+
* Modal Widgets - MSC2790
69+
[\#5252](https://github.com/matrix-org/matrix-react-sdk/pull/5252)
70+
* Widgets fixes
71+
[\#5350](https://github.com/matrix-org/matrix-react-sdk/pull/5350)
72+
* Fix User Menu avatar colouring being based on wrong string
73+
[\#5348](https://github.com/matrix-org/matrix-react-sdk/pull/5348)
74+
* Support 'answered elsewhere'
75+
[\#5345](https://github.com/matrix-org/matrix-react-sdk/pull/5345)
76+
177
Changes in [3.7.1](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v3.7.1) (2020-10-28)
278
===================================================================================================
379
[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v3.7.0...v3.7.1)

‎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.7.1",
3+
"version": "3.8.0",
44
"description": "SDK for matrix.org using React",
55
"author": "matrix.org",
66
"repository": {
@@ -79,7 +79,7 @@
7979
"linkifyjs": "^2.1.9",
8080
"lodash": "^4.17.19",
8181
"matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop",
82-
"matrix-widget-api": "^0.1.0-beta.5",
82+
"matrix-widget-api": "^0.1.0-beta.8",
8383
"minimist": "^1.2.5",
8484
"pako": "^1.0.11",
8585
"parse5": "^5.1.1",

‎res/css/_components.scss‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -110,11 +110,11 @@
110110
@import "./views/elements/_EventListSummary.scss";
111111
@import "./views/elements/_Field.scss";
112112
@import "./views/elements/_FormButton.scss";
113-
@import "./views/elements/_IconButton.scss";
114113
@import "./views/elements/_ImageView.scss";
115114
@import "./views/elements/_InfoTooltip.scss";
116115
@import "./views/elements/_InlineSpinner.scss";
117116
@import "./views/elements/_ManageIntegsButton.scss";
117+
@import "./views/elements/_MiniAvatarUploader.scss";
118118
@import "./views/elements/_PowerSelector.scss";
119119
@import "./views/elements/_ProgressBar.scss";
120120
@import "./views/elements/_QRCode.scss";
@@ -139,6 +139,7 @@
139139
@import "./views/groups/_GroupUserSettings.scss";
140140
@import "./views/messages/_CreateEvent.scss";
141141
@import "./views/messages/_DateSeparator.scss";
142+
@import "./views/messages/_EventTileBubble.scss";
142143
@import "./views/messages/_MEmoteBody.scss";
143144
@import "./views/messages/_MFileBody.scss";
144145
@import "./views/messages/_MImageBody.scss";
@@ -182,6 +183,7 @@
182183
@import "./views/rooms/_MemberList.scss";
183184
@import "./views/rooms/_MessageComposer.scss";
184185
@import "./views/rooms/_MessageComposerFormatBar.scss";
186+
@import "./views/rooms/_NewRoomIntro.scss";
185187
@import "./views/rooms/_NotificationBadge.scss";
186188
@import "./views/rooms/_PinnedEventTile.scss";
187189
@import "./views/rooms/_PinnedEventsPanel.scss";
@@ -225,8 +227,9 @@
225227
@import "./views/settings/tabs/user/_SecurityUserSettingsTab.scss";
226228
@import "./views/settings/tabs/user/_VoiceUserSettingsTab.scss";
227229
@import "./views/terms/_InlineTermsAgreement.scss";
230+
@import "./views/toasts/_AnalyticsToast.scss";
228231
@import "./views/toasts/_NonUrgentEchoFailureToast.scss";
229232
@import "./views/verification/_VerificationShowSas.scss";
230233
@import "./views/voip/_CallContainer.scss";
231234
@import "./views/voip/_CallView.scss";
232-
@import "./views/voip/_VideoView.scss";
235+
@import "./views/voip/_VideoFeed.scss";

‎res/css/structures/_HomePage.scss‎

Lines changed: 5 additions & 38 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 {
@@ -50,54 +51,20 @@ limitations under the License.
5051
color: $muted-fg-color;
5152
}
5253

53-
.mx_HomePage_userAvatar {
54-
position: relative;
55-
width: min-content;
54+
.mx_MiniAvatarUploader {
5655
margin: 0 auto;
57-
58-
&::before, &::after {
59-
content: '';
60-
position: absolute;
61-
62-
height: 26px;
63-
width: 26px;
64-
65-
right: -6px;
66-
bottom: -6px;
67-
}
68-
69-
&::before {
70-
background-color: $primary-bg-color;
71-
border-radius: 50%;
72-
z-index: 1;
73-
}
74-
75-
&::after {
76-
background-color: $secondary-fg-color;
77-
mask-position: center;
78-
mask-repeat: no-repeat;
79-
mask-image: url('$(res)/img/element-icons/camera.svg');
80-
mask-size: 16px;
81-
z-index: 2;
82-
}
83-
84-
&.mx_HomePage_userAvatar_busy::after {
85-
background: url("$(res)/img/spinner.gif") no-repeat center;
86-
background-size: 80%;
87-
mask: unset;
88-
}
8956
}
9057

9158
.mx_HomePage_default_buttons {
92-
margin: 80px auto 0;
59+
margin: 60px auto 0;
9360
width: fit-content;
9461

9562
.mx_AccessibleButton {
9663
padding: 73px 8px 15px; // top: 20px top padding + 40px icon + 13px margin
9764

9865
width: 160px;
9966
height: 132px;
100-
margin: 0 20px;
67+
margin: 20px;
10168
position: relative;
10269
display: inline-block;
10370
border-radius: 8px;

‎res/css/structures/_RoomStatusBar.scss‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -153,16 +153,6 @@ limitations under the License.
153153
display: block;
154154
}
155155

156-
.mx_RoomStatusBar_isAlone {
157-
height: 50px;
158-
line-height: $font-50px;
159-
160-
color: $primary-fg-color;
161-
opacity: 0.5;
162-
overflow-y: hidden;
163-
display: block;
164-
}
165-
166156
.mx_MatrixChat_useCompactLayout {
167157
.mx_RoomStatusBar {
168158
min-height: 40px;

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

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

17+
.mx_InteractiveAuthEntryComponents_emailWrapper {
18+
padding-right: 60px;
19+
position: relative;
20+
margin-top: 32px;
21+
margin-bottom: 32px;
22+
23+
&::before, &::after {
24+
position: absolute;
25+
width: 116px;
26+
height: 116px;
27+
content: "";
28+
right: -10px;
29+
}
30+
31+
&::before {
32+
background-color: rgba(244, 246, 250, 0.91);
33+
border-radius: 50%;
34+
top: -20px;
35+
}
36+
37+
&::after {
38+
background-image: url('$(res)/img/element-icons/email-prompt.svg');
39+
background-repeat: no-repeat;
40+
background-position: center;
41+
background-size: contain;
42+
top: -25px;
43+
}
44+
}
45+
1746
.mx_InteractiveAuthEntryComponents_msisdnWrapper {
1847
text-align: center;
1948
}

‎res/css/views/elements/_IconButton.scss‎

Lines changed: 0 additions & 55 deletions
This file was deleted.

‎res/css/views/elements/_MiniAvatarUploader.scss‎

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
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+
.mx_MiniAvatarUploader {
18+
position: relative;
19+
width: min-content;
20+
21+
&::before, &::after {
22+
content: '';
23+
position: absolute;
24+
25+
height: 26px;
26+
width: 26px;
27+
28+
right: -6px;
29+
bottom: -6px;
30+
}
31+
32+
&::before {
33+
background-color: $primary-bg-color;
34+
border-radius: 50%;
35+
z-index: 1;
36+
}
37+
38+
&::after {
39+
background-color: $secondary-fg-color;
40+
mask-position: center;
41+
mask-repeat: no-repeat;
42+
mask-image: url('$(res)/img/element-icons/camera.svg');
43+
mask-size: 16px;
44+
z-index: 2;
45+
}
46+
47+
&.mx_MiniAvatarUploader_busy::after {
48+
background: url("$(res)/img/spinner.gif") no-repeat center;
49+
background-size: 80%;
50+
mask: unset;
51+
}
52+
}
53+
54+
.mx_MiniAvatarUploader_input {
55+
display: none;
56+
}

0 commit comments

Comments
 (0)