Travis Ralston
9377306b81
Fix the screenshot button on the right panel card
2020-09-30 20:11:27 -06:00
Travis Ralston
b46f58274e
Fix the hangup button and other custom actions
2020-09-30 20:09:23 -06:00
Travis Ralston
9b984a35e0
Remove dead AppTile2
2020-09-30 19:58:16 -06:00
Travis Ralston
b710d42832
Fix stickerpicker to use new messaging
2020-09-30 16:12:00 -06:00
Michael Telatynski
23d95df30b
Rebuild the room summary card's widgets section
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-09-30 17:08:41 +01:00
Michael Telatynski
ed30750f63
Extract RoomWidgetContextMenu
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-09-30 15:38:35 +01:00
Travis Ralston
555bcc6010
Document remaining (known) cases to fix
2020-09-29 15:32:18 -06:00
Travis Ralston
fc1cbc668c
Get the widget loading again
2020-09-29 14:33:46 -06:00
Travis Ralston
cd93b2c22a
First rough cut of cutting AppTile over to the ClientWidgetApi
2020-09-29 14:14:51 -06:00
Travis Ralston
14766e24b8
Merge branch 'develop' into travis/widget-api
2020-09-29 13:18:18 -06:00
Travis Ralston
5534206e77
Merge pull request #5223 from matrix-org/travis/ft-sep1620/04-jitsi-hangup
...
Make the hangup button do things for conference calls
2020-09-29 11:06:21 -06:00
Travis Ralston
36882b85d7
Merge pull request #5222 from matrix-org/travis/ft-sep1620/03-jitsi-obvious
...
Render Jitsi widget state events in a more obvious way
2020-09-29 11:05:40 -06:00
Travis Ralston
a5569303d1
Merge branch 'develop' into travis/ft-sep1620/04-jitsi-hangup
2020-09-29 10:20:02 -06:00
Travis Ralston
c75628844d
Merge pull request #5226 from matrix-org/travis/ft-sep1620/10-pip
...
Make the PIP Jitsi look and feel like the 1:1 PIP
2020-09-29 10:18:30 -06:00
Michael Telatynski
e51136f902
Merge pull request #5263 from matrix-org/t3chguy/fix/15310
...
Trim range when formatting so that it excludes leading/trailing spaces
2020-09-29 17:07:49 +01:00
Michael Telatynski
76a9803c6c
Fix button label on the Set Password Dialog
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-09-29 14:24:01 +01:00
Michael Telatynski
ffa7ceb70e
Trim range when formatting so that it excludes leading/trailing spaces
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-09-29 14:15:20 +01:00
Michael Telatynski
0f10ffa3c5
fix sequence sorting
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-09-29 11:09:17 +01:00
Michael Telatynski
48d9aa2c3e
MELS use latest avatar rather than the first avatar
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-09-29 10:53:04 +01:00
Michael Telatynski
8a9d38b702
convert MemberEventListSummary and ELS to Typescript
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-09-29 10:51:48 +01:00
Michael Telatynski
c4ee8e4a6c
Fix Encryption Panel close button clashing with Base Card
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-09-29 10:11:04 +01:00
Michael Telatynski
f945155d04
Convert UserInfo to Typescript
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-09-29 10:10:32 +01:00
Travis Ralston
78a04a6106
Remove unused prop
2020-09-28 21:23:55 -06:00
Travis Ralston
6b2e34dc00
Fix export
2020-09-28 21:14:50 -06:00
Travis Ralston
3e8d7b172f
Merge branch 'develop' into travis/widget-api
2020-09-28 21:08:08 -06:00
Travis Ralston
9df175212e
Merge branch 'develop' into travis/ft-sep1620/04-jitsi-hangup
2020-09-28 13:43:47 -06:00
Travis Ralston
42955856d5
Merge branch 'develop' into travis/ft-sep1620/03-jitsi-obvious
2020-09-28 13:41:48 -06:00
Travis Ralston
4ea3376abf
WIP on AppTile2 transformation
2020-09-28 13:34:13 -06:00
Michael Telatynski
330337c993
Disable autocompletion on security key input during login
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-09-28 16:25:23 +01:00
Michael Telatynski
abd7bf37f4
Choose first result on enter in the emoji picker
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-09-28 15:56:22 +01:00
Michael Telatynski
6873402666
Convert emojipicker to typescript
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-09-28 15:48:05 +01:00
Matthew Hodgson
45e5903226
fix uninitialised state and eventlistener leak
2020-09-27 21:48:36 +01:00
David Baker
585c7637d6
Merge pull request #5248 from matrix-org/dbkr/callhandler_to_ts
...
Convert CallHandler to typescript
2020-09-25 15:52:21 +01:00
David Baker
8962f7ae9e
Convert CallHandler to typescript
...
and remove the old conference call stuff while we're at it: enough
time should have passed since those mistakes that we can move on.
The old conference call rooms will still appear for anyone whose
account dates back to that time, but they've presumably been appearing
in any other matrix client they used too.
2020-09-24 16:16:20 +01:00
Travis Ralston
2d46ca1d15
Merge pull request #5243 from matrix-org/travis/workflow/design/sep2120
...
Rework profile area for user and room settings to be more clear
2020-09-24 08:39:01 -06:00
Travis Ralston
a2860e698a
Clean up other unlinted lint issues
2020-09-24 08:26:59 -06:00
Michael Telatynski
1fb4d22233
Merge pull request #5241 from matrix-org/t3chguy/fix/14724
...
Validation improve pattern for derived data
2020-09-23 17:03:32 +01:00
Travis Ralston
09dd3cea08
Merge pull request #5225 from matrix-org/travis/ft-sep1620/09-enc-files
...
Add a note to use the desktop builds when seshat isn't available
2020-09-22 10:25:34 -06:00
Travis Ralston
3e0cbd7bfe
Appease the linters
2020-09-21 21:09:46 -06:00
Travis Ralston
4f983ad9a1
Rework profile sections of user and room settings
...
Mostly by design request. Some is freehand, to be reviewed.
2020-09-21 21:00:51 -06:00
Michael Telatynski
c1d9d96702
Merge pull request #5234 from matrix-org/t3chguy/fix/15192
...
Only show User Info verify button if the other user has e2ee devices
2020-09-21 17:09:29 +01:00
Michael Telatynski
ed0e188b4f
Validation improve pattern for derived data
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-09-21 14:35:35 +01:00
Michael Telatynski
42cdf4b7c9
fix undefined devices case
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-09-21 13:57:33 +01:00
Travis Ralston
07f46fa3ec
Merge pull request #5238 from matrix-org/travis/uifeat/paranoia
...
Add a UI feature to disable advanced encryption options
2020-09-18 15:06:20 -06:00
Michael Telatynski
02f58edd74
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/15182
2020-09-18 19:30:42 +01:00
Michael Telatynski
2492041ee4
Merge pull request #5236 from matrix-org/t3chguy/fix/15237
...
Rename apps back to widgets
2020-09-18 19:04:34 +01:00
Travis Ralston
5630f35715
Add a UI feature to disable advanced encryption options
2020-09-18 11:33:02 -06:00
Michael Telatynski
6f7d6f27f1
move the check
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-09-18 18:15:05 +01:00
Travis Ralston
4ef4e67642
Merge pull request #5229 from matrix-org/travis/workflow/design/sep1720
...
Adjust layout and formatting of notifications / files cards
2020-09-18 11:11:35 -06:00
Travis Ralston
189233447b
Merge branch 'develop' into t3chguy/fix/15182
2020-09-18 11:06:32 -06:00
Michael Telatynski
84f0a610a9
Merge pull request #5232 from matrix-org/t3chguy/fix/15229
...
Fix Search Results Tile undefined variable access regression
2020-09-18 18:03:08 +01:00
Travis Ralston
8838bd724b
Update copy for files
2020-09-18 10:58:17 -06:00
Travis Ralston
870c35be6f
Merge branch 'develop' into travis/ft-sep1620/09-enc-files
2020-09-18 10:56:20 -06:00
Michael Telatynski
949b8d9afe
Rename apps back to widgets
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-09-18 16:35:42 +01:00
Travis Ralston
46f6c140e6
Merge pull request #5231 from matrix-org/travis/e2e-default-serverside
...
Disable the e2ee toggle when creating a room on a server with forced e2e
2020-09-18 07:50:45 -06:00
Michael Telatynski
adcb75facb
Only show User Info verify button if the other user has e2ee devices
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-09-18 14:34:51 +01:00
Michael Telatynski
5a6ab95f84
Merge pull request #5215 from matrix-org/t3chguy/fix/15179
...
UI Feature Flag: Disable advanced options and tidy up some copy
2020-09-18 12:34:38 +01:00
Michael Telatynski
de1d9e0e09
Fix Search Results Tile undefined variable access regression
2020-09-18 12:15:56 +01:00
Michael Telatynski
9dbc1dbc85
Hide Advanced Appearance Settings
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-09-18 11:34:35 +01:00
Michael Telatynski
687a2e56b2
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/15179
...
Conflicts:
src/components/views/settings/tabs/user/SecurityUserSettingsTab.js
src/settings/Settings.ts
src/settings/UIFeature.ts
2020-09-18 11:29:38 +01:00
Michael Telatynski
598c982f02
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/15187
...
Conflicts:
src/settings/Settings.ts
src/settings/UIFeature.ts
2020-09-18 11:14:36 +01:00
J. Ryan Stinnett
ec4bf0c057
Merge pull request #5219 from matrix-org/jryans/defer-cross-signing-setup
...
Defer encryption setup until first E2EE room
2020-09-18 10:28:33 +01:00
Travis Ralston
38f8c0a835
Disable the e2ee toggle when creating a room on a server with forced e2e
...
Fixes https://github.com/vector-im/element-web/issues/15186
Requires https://github.com/matrix-org/matrix-js-sdk/pull/1470
2020-09-17 22:46:01 -06:00
Travis Ralston
14a7b83988
Don't show a bottom border ahead of the date separator
2020-09-17 10:40:48 -06:00
Travis Ralston
24d0950b7e
Adjust layout and formatting of notifications / file cards
...
This follows some polish time with a designer.
The placeholder text on the two panels was tracking up/down when the width was changed. This is fixed by adjusting some of the flexbox properties to center it more safely.
We also spent some time making the notifications panel more legible while we wait for the overhaul to land.
2020-09-17 09:23:06 -06:00
Michael Telatynski
c904b4f416
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/15178
...
Conflicts:
src/settings/Settings.ts
src/settings/UIFeature.ts
2020-09-17 14:10:51 +01:00
Michael Telatynski
c1cf8db78f
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/15181
...
Conflicts:
src/components/views/settings/tabs/user/GeneralUserSettingsTab.js
src/i18n/strings/en_EN.json
src/settings/Settings.ts
src/settings/UIFeature.ts
2020-09-17 13:55:11 +01:00
Michael Telatynski
ae44a6d1fa
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/15180
...
Conflicts:
src/settings/Settings.ts
src/settings/UIFeature.ts
2020-09-17 13:42:27 +01:00
Michael Telatynski
1e9e0dee87
Merge pull request #5227 from matrix-org/t3chguy/fix/15188
...
UI Feature Flag: Registration, Password Reset, Deactivate
2020-09-17 13:40:06 +01:00
Michael Telatynski
5bf6697e48
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/15178
...
Conflicts:
src/settings/Settings.ts
src/settings/UIFeature.ts
2020-09-17 13:31:00 +01:00
Michael Telatynski
eda2dee63f
UI Feature Flag: 3PIDs
2020-09-17 13:25:18 +01:00
Michael Telatynski
4213a557f2
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/15175
...
Conflicts:
src/settings/Settings.ts
src/settings/UIFeature.ts
2020-09-17 11:58:26 +01:00
Michael Telatynski
d340dd58d1
UI Feature Flag: Registration, Password Reset, Deactivate
2020-09-17 11:55:10 +01:00
Travis Ralston
8129333dcc
Make the PIP Jitsi look and feel like the 1:1 PIP
...
* Similar sizing
* Fix pointers so the jitsi widget doesn't feel clickable when it's not
* We might want to introduce click-to-visit-room for the Jitsi widget (like the 1:1 call), however the Jitsi widget has many more controls to worry about
* Remove the menu bar from the widget to avoid accidents
2020-09-16 22:38:12 -06:00
Travis Ralston
c3a3754432
Appease the linter
2020-09-16 17:27:45 -06:00
Travis Ralston
e52a02d733
Appease the linter
2020-09-16 17:26:00 -06:00
Travis Ralston
bfbbf44dfc
Add a note to use the desktop builds when seshat isn't available
...
Fixes https://github.com/vector-im/element-web/issues/15184
This is currently temporary design for https://github.com/vector-im/element-web/issues/12896 but does not fix it.
2020-09-16 17:23:37 -06:00
Travis Ralston
dca48b984f
Be more sane
2020-09-16 15:47:06 -06:00
Travis Ralston
959b8dd314
de-state
2020-09-16 14:59:40 -06:00
Travis Ralston
f412f8defe
Change copy if the widget is unpinned
2020-09-16 14:59:15 -06:00
Travis Ralston
1ffc6d5bd3
Make the hangup button do things for conference calls
...
Behaviour constraints:
* If you're not in the conference, use a grey button that does nothing.
* If you're in the conference, show a button:
* If you're able to modify widgets in the room, annotate it in the context of ending the call for everyone and remove the widget. Use a confirmation dialog.
* If you're not able to modify widgets in the room, hang up.
For this we know that persistent Jitsi widgets will mean that the user is in the call, so we use that to determine if they are actually participating.
2020-09-16 14:35:55 -06:00
Travis Ralston
b4af0140d4
Render Jitsi widget state events in a more obvious way
...
A clear improvement to this would be to include join/leave buttons in the tiles, however this is currently deferred.
2020-09-16 12:38:47 -06:00
Michael Telatynski
4db9ac16b5
Merge pull request #5211 from matrix-org/t3chguy/fix/15173
...
Hide Analytics sections if piwik config is not provided
2020-09-16 16:34:55 +01:00
Michael Telatynski
93323febcb
undo change
2020-09-16 16:10:24 +01:00
Michael Telatynski
c11abb74e0
UI Feature Flag: Share dialog QR code and social icons
2020-09-16 16:06:17 +01:00
Michael Telatynski
4d15a44d61
Merge pull request #5220 from matrix-org/t3chguy/fix/15202
...
Clean up UserInfo to not show a blank Power Selector for users not in room
2020-09-16 16:04:15 +01:00
Michael Telatynski
4e2b6c2a30
Merge pull request #5212 from matrix-org/t3chguy/fix/15172
...
Also hide bug reporting prompts from the Error Boundaries
2020-09-16 15:59:07 +01:00
Michael Telatynski
06c4abd65e
Clean up UserInfo to not show a blank Power Selector for users not in room
2020-09-16 15:23:08 +01:00
Michael Telatynski
feb37878d8
tidy
2020-09-16 15:04:13 +01:00
J. Ryan Stinnett
550a53e49c
Check cross-signing cached keys when showing setup button
2020-09-16 15:03:06 +01:00
J. Ryan Stinnett
0d25f62a9a
Tweak diagnostics for session backup key
2020-09-16 15:03:06 +01:00
J. Ryan Stinnett
26b465f1fd
Remove room recovery reminder
...
The Secure Backup toast replaces this with better UX.
Part of https://github.com/vector-im/element-web/issues/13895
2020-09-16 15:03:06 +01:00
J. Ryan Stinnett
46f37fb969
Create cross-signing keys during authentication
...
With this change, Element now creates cross-signing keys during auth flows for
password login. For other auth flows like token / SSO, it will not happen until
a cross-signing / secret storage dialog flow as before.
2020-09-16 15:03:06 +01:00
J. Ryan Stinnett
7be27e70c9
Add component key to actions array
2020-09-16 15:03:06 +01:00
J. Ryan Stinnett
685878a101
Clarify diagnostic about keys in storage
...
Part of https://github.com/vector-im/element-web/issues/13895
2020-09-16 15:03:06 +01:00
J. Ryan Stinnett
3259ab1f25
Place cross-signing action buttons on a single row
...
Part of https://github.com/vector-im/element-web/issues/13895
2020-09-16 15:03:06 +01:00
J. Ryan Stinnett
7bd5e3fa31
Move security-related dialogs to a common directory
2020-09-16 15:03:06 +01:00
Michael Telatynski
aa25bad689
tidy
2020-09-16 14:57:46 +01:00
Michael Telatynski
1c44f15d2d
i18n
2020-09-16 14:54:30 +01:00
Michael Telatynski
d3c84e25f5
UI Feature Flag: Identity server
2020-09-16 14:45:34 +01:00
Michael Telatynski
d1070c05dd
UI Feature Flag: Disable VoIP
2020-09-16 13:40:27 +01:00
Michael Telatynski
2bea8457e9
UI Feature Flag: Communities
2020-09-16 12:56:40 +01:00
Michael Telatynski
7a448be1dc
UI Feature Flag: Disable advanced options and tidy up some copy
2020-09-16 12:14:33 +01:00
Michael Telatynski
f4f94e31d1
UI Feature Flag: Disable integrations entry UI
2020-09-16 11:38:50 +01:00
Michael Telatynski
9cc789756b
UI Feature Flag: Hide flair
2020-09-16 11:26:15 +01:00
Michael Telatynski
caef9b27a0
Also hide bug reporting prompts from the Error Boundaries
2020-09-16 10:50:53 +01:00
Michael Telatynski
d990986407
Also hide Privacy heading in settings and fix React Key warning
2020-09-16 10:37:15 +01:00
Michael Telatynski
771ab82598
Hide Analytics sections if piwik config is not provided
2020-09-16 10:29:21 +01:00
Travis Ralston
3d9c520af8
Merge pull request #5201 from matrix-org/travis/3pid-invites
...
Tactical improvements to 3PID invites
2020-09-15 10:42:55 -06:00
Michael Telatynski
6f0f427ef4
Merge pull request #5210 from matrix-org/t3chguy/fix/15172
...
If no bug_report_endpoint_url, hide rageshaking from the App
2020-09-15 16:23:48 +01:00
Travis Ralston
88115b4f46
Merge pull request #5208 from matrix-org/travis/ui-func/base
...
Introduce a concept of UI features, using it for URL previews at first
2020-09-15 08:53:48 -06:00
Travis Ralston
246b802206
Merge branch 'develop' into travis/3pid-invites
2020-09-15 08:53:32 -06:00
Michael Telatynski
6c166f0560
If no bug_report_endpoint_url, hide rageshaking from the App
2020-09-15 15:49:25 +01:00
Travis Ralston
f4f30a3274
Introduce a concept of UI features, using it for URL previews at first
...
Fixes https://github.com/vector-im/element-web/issues/15176
This is effectively the base for all of https://github.com/vector-im/element-web/issues/15185
2020-09-14 22:28:02 -06:00
Travis Ralston
b177843e45
Remove defunct "always show encryption icons" setting
...
It doesn't do anything in practice.
Fixes https://github.com/vector-im/element-web/issues/8725
2020-09-14 22:03:54 -06:00
Travis Ralston
61e8d3e3d7
Merge branch 'develop' into travis/3pid-invites
2020-09-14 11:50:08 -06:00
Michael Telatynski
e32cb175cb
Fix Bridges tab crashing when the room does not have bridges
2020-09-14 15:44:00 +01:00
Travis Ralston
763309ae80
Show a spinner when processing a registration email confirmation
...
See comment enclosed
2020-09-11 20:58:10 -06:00
Travis Ralston
77f8c48dc4
Merge pull request #5195 from matrix-org/travis/iconography-update
...
Show verification status in the room summary card
2020-09-11 09:12:46 -06:00
Travis Ralston
8862b8298c
Use hooks better
2020-09-11 09:04:06 -06:00
David Baker
07693b71b1
Merge pull request #5194 from matrix-org/dbkr/dont_unpin_persistent_widgets
...
Don't show 'unpin' for persistent widgets
2020-09-11 09:53:09 +01:00
J. Ryan Stinnett
e7e6bc93ec
Merge pull request #5182 from matrix-org/jryans/defer-cross-signing-setup
...
Split up cross-signing and secure backup settings
2020-09-11 09:41:40 +01:00
Travis Ralston
4cb7381d03
Show verification status in the room summary card
...
Fixes https://github.com/vector-im/element-web/issues/15143
Colours are the same for both light and dark theme.
2020-09-10 13:53:42 -06:00
David Baker
b7058a33ad
lint
2020-09-10 14:37:44 +01:00
David Baker
eeb4c5696f
Don't show 'unpin' for persistent widgets
...
This will mostly fix https://github.com/vector-im/element-web/issues/15139
although it could still break in a race condition.
2020-09-10 14:30:35 +01:00
Matthew Hodgson
89d05ac952
bring back 1.2M style badge counts rather than 99+
2020-09-10 13:51:34 +01:00
Travis Ralston
a765db8977
Merge pull request #5189 from matrix-org/travis/rageshake-fix
...
Run the rageshake command through the bug report dialog
2020-09-09 15:08:43 -06:00
Travis Ralston
9b5823cccb
Run the rageshake command through the bug report dialog
...
Ideally we encourage users to give us information like a github issue or options to download their logs.
2020-09-09 14:53:38 -06:00
Travis Ralston
0a7090dd64
Account for via in pill matching regex
...
Fixes https://github.com/vector-im/element-web/issues/15133
Regression first appeared in a80bcaa292
This also affects room IDs.
2020-09-09 14:36:35 -06:00
David Baker
62556c2afe
Merge pull request #5184 from matrix-org/dbkr/always_allow_local_widgets
...
Always allow widgets when using the local version
2020-09-09 15:52:31 +01:00
David Baker
f9079975a1
write correct jsdoc
2020-09-09 15:42:25 +01:00
David Baker
99b0a0a78e
Always allow widgets when using the local version
...
Since we're not loading the widget URL, there's no need to ask
for permission to load it: it's just another part of the app.
2020-09-09 15:35:05 +01:00
J. Ryan Stinnett
0219824d6f
Merge remote-tracking branch 'origin/develop' into jryans/defer-cross-signing-setup
2020-09-09 14:13:23 +01:00
J. Ryan Stinnett
6d1b1d9460
Fix linting error
2020-09-09 14:12:36 +01:00
Michael Telatynski
0e58eb6d56
Update initial widget height
2020-09-09 13:15:07 +01:00
Michael Telatynski
8d66dce68d
Update copy and use svg for ellipsis
2020-09-09 12:50:48 +01:00
Michael Telatynski
b635598bc3
Attempt to fix tests and fix RoomSummaryCard having wrong member count
2020-09-09 12:28:12 +01:00
Michael Telatynski
37c0d524bc
re-order top right buttons
2020-09-09 11:06:15 +01:00
Michael Telatynski
517b594edc
Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into t3chguy/dpsah/6785.1
...
Conflicts:
src/components/structures/RightPanel.js
2020-09-08 18:04:24 +01:00
J. Ryan Stinnett
bbe2084f66
Add independent set up / reset actions in Settings
...
This adds set up and reset actions to each of cross-signing and secure backup
that do separate things, rather than mixing concerns together. (It's temporarily
still a bit of lie for backup, as more changes are needed to stop resetting
cross-signing as well.)
2020-09-08 18:01:56 +01:00
Michael Telatynski
12a6bc8231
update copy
2020-09-08 18:00:21 +01:00
Michael Telatynski
596060c506
fix alignments and iterate PR
2020-09-08 17:57:08 +01:00
Michael Telatynski
27a65fff2b
null-guard roomId in RightPanel and pass Room to UserView
2020-09-08 17:34:32 +01:00
Michael Telatynski
b982bf87b5
delint
2020-09-08 16:33:55 +01:00
Michael Telatynski
8d14d26e2b
do the todos
2020-09-08 16:27:09 +01:00
Michael Telatynski
4a4a8cd611
styling and fix i
button behaviour
2020-09-08 15:43:40 +01:00
Michael Telatynski
ef0843d4ad
Iterate to match design
2020-09-08 15:43:40 +01:00
Michael Telatynski
98b59fb217
Consolidate all the work thus far
2020-09-08 15:43:38 +01:00
Michael Telatynski
31cca5e0f2
Create new right panel cards
2020-09-08 15:42:31 +01:00
Michael Telatynski
2527344294
Create name/title Widget utils
2020-09-08 15:42:31 +01:00