Travis Ralston
d3541b78eb
Merge pull request #5714 from matrix-org/travis/media-customization
...
Support a media handling customisation endpoint
2021-03-12 11:01:59 -07:00
Travis Ralston
a9a4bd50ca
Merge branch 'develop' into travis/media-customization
2021-03-11 08:37:49 -07:00
Panagiotis
be7fb33a67
Merge branch 'develop' into edit-view-source
2021-03-11 17:07:56 +02:00
Travis Ralston
229a95f190
Merge pull request #5734 from matrix-org/travis/skinning/pt3-easy-comps
...
[SK-3] Decorate easy components with replaceableComponent
2021-03-11 07:26:20 -07:00
J. Ryan Stinnett
6a939c4de8
Merge pull request #5727 from matrix-org/matthew/rework-cross-signing-login
...
Rework cross-signing login flow
2021-03-11 12:53:55 +00:00
Travis Ralston
fa5d98c319
Convert cases of getHttpUriForMxc to new media customisation
2021-03-10 12:32:18 -07:00
Travis Ralston
1ac12479ca
Convert cases of mxcUrlToHttp to new media customisation
2021-03-10 12:32:18 -07:00
Travis Ralston
e5180a472f
Merge branch 'develop' into travis/skinning/pt3-easy-comps
2021-03-10 12:30:06 -07:00
Michael Telatynski
98338f1505
Merge pull request #5736 from matrix-org/t3chguy/spaces4.5
...
Spaces suggested rooms support
2021-03-10 10:56:17 +00:00
Travis Ralston
5b3367d44e
Merge remote-tracking branch 'origin/develop' into travis/skinning/pt3-easy-comps
2021-03-09 09:33:19 -07:00
Michael Telatynski
dd0b0834e6
Fix React warning
2021-03-09 13:40:48 +00:00
Travis Ralston
c359dff738
Batch of views getting replaceableComponent decorators
2021-03-08 20:23:34 -07:00
Travis Ralston
3e189d2728
Batch of views getting replaceableComponent decorators
2021-03-08 20:23:29 -07:00
Matthew Hodgson
c02d03cc5b
Merge branch 'develop' of git+ssh://github.com/matrix-org/matrix-react-sdk into develop
2021-03-08 04:57:10 +00:00
Matthew Hodgson
6df8157a40
cancel VRD at the Modal level, so clicking in the bg cancels it
2021-03-08 04:45:44 +00:00
Panagiotis
288d98daed
chore: format, lint
2021-03-05 00:07:59 +02:00
Panagiotis
af5cfff51d
feat: edit button on View Source dialog
...
reuse component SendCustomEvent
swap it in place in the View Source dialog
the Back button takes you to the View Source dialog, not the DevTools dialog
do not display the flip toggle box for changing between State Event and Normal Event
2021-03-04 23:17:29 +02:00
Panagiotis
ae08f74336
feat: improve "view source"
...
display encrypted and decrypted event source on the same dialog
keep only one "View Source" action on event context menu
2021-03-03 22:38:30 +02:00
Michael Telatynski
d9a801910a
Tweak spaces copy
2021-03-03 11:34:29 +00:00
Michael Telatynski
716268b2f9
Add context menu to spaces in the space panel
2021-03-02 14:35:29 +00:00
Michael Telatynski
e479edd47a
Add an add existing room to space CTA to Space View
2021-03-02 13:34:53 +00:00
Michael Telatynski
a687b9883c
Add a create room in space CTA to Space View
2021-03-02 13:29:34 +00:00
Michael Telatynski
ab4b7b73ea
Add a basic Space Settings view
2021-03-02 13:26:00 +00:00
Michael Telatynski
c10512fd56
Initial SpaceRoomView work
2021-03-01 18:53:11 +00:00
Travis Ralston
10b0051c02
Appease the linter
2021-02-18 15:30:03 -07:00
Travis Ralston
52c73a7a58
Add developer tool to explore and edit settings
2021-02-18 14:56:19 -07:00
Michael Telatynski
da6f1e559b
Merge pull request #5634 from jaiwanth-v/add-loading-TextInputDialog
...
Added loading and disabled the button while searching for server
2021-02-11 12:22:27 +00:00
Jaiwanth
20dc8dbb32
Update src/components/views/dialogs/TextInputDialog.js
...
Co-authored-by: Michael Telatynski <7t3chguy@googlemail.com>
2021-02-11 17:39:12 +05:30
Jaiwanth
61c6033de7
Update src/components/views/dialogs/TextInputDialog.js
...
Co-authored-by: Michael Telatynski <7t3chguy@googlemail.com>
2021-02-11 17:38:58 +05:30
Jaiwanth
6c252a87a1
Update src/components/views/dialogs/TextInputDialog.js
...
Co-authored-by: Michael Telatynski <7t3chguy@googlemail.com>
2021-02-11 17:38:46 +05:30
Jaiwanth
3fc6d73158
Added loading and disabled the button while searching for server
...
Signed-off-by: Jaiwanth <jaiwanth2011@gmail.com>
2021-02-11 17:28:02 +05:30
Jason Robinson
23140a84ff
Remove host signup config strings, make translatable instead
...
Also replace the icon in the UserMenu and change the text, requested from design.
2021-02-10 13:38:32 +02:00
Jason Robinson
dc549a9e4b
Address some more pr feedback
2021-02-09 22:41:40 +02:00
Jason Robinson
2197c1e519
Address some of the PR feedback
2021-02-09 20:13:58 +02:00
Jason Robinson
c92a930d0a
Fix positioning of minimize action and add titles
2021-02-09 12:40:12 +02:00
Jason Robinson
ad5b40b5ba
Allow popups from host signup dialog
2021-02-09 12:29:23 +02:00
Jason Robinson
e31b89b952
Restructure host signup terms dialog documents config and dialog
2021-02-09 12:23:27 +02:00
Jason Robinson
2aa4fce1c5
Remove unused types
2021-02-09 11:42:58 +02:00
Jason Robinson
f5f8050172
Add minimize button to HostSignupDialog.tsx
2021-02-04 23:09:58 +02:00
Jason Robinson
fd55b99a26
Remove a comment that is not true anymore
2021-02-04 23:05:24 +02:00
Jason Robinson
987ee702d3
Ensure iframe gets maximize/minimize events
2021-02-04 18:30:12 +02:00
Jason Robinson
6ccce7142c
Merge branch 'develop' into jaywink/hosting-provider-iframe-minimize-wip
2021-02-03 22:35:22 +02:00
J. Ryan Stinnett
ecc3dbbd80
Merge pull request #5607 from matrix-org/jryans/tally-ho
...
Lock widget room ID when added
2021-02-02 15:03:09 +00:00
J. Ryan Stinnett
e4629878bc
Lock widget room ID when added
...
This changes the widget room ID available to widget URL templates so that it's
locked to the room the widget was added in.
Fixes https://github.com/vector-im/element-web/issues/16337
2021-02-02 14:36:44 +00:00
Michael Telatynski
5d86c2f8e0
Better errors for SSO failures
2021-02-01 16:42:58 +00:00
Jason Robinson
4ee6016084
Some cleanup
2021-01-29 15:55:14 +02:00
Michael Telatynski
62712159f6
Merge pull request #5578 from matrix-org/t3chguy/sso_fixes
...
Improve SSO auth flow
2021-01-29 13:28:53 +00:00
Travis Ralston
db346d129b
Run a UI refresh over the OIDC Exchange confirmation dialog
2021-01-27 13:13:44 -07:00
Michael Telatynski
e6673bca1b
Improve SSO auth flow
...
Use replaceState instead of a redirect to strip the loginToken
Put user into the same post-auth flows of E2ESetup
Skip UIA prompt in this post-auth flow, happy path is a server grace period
2021-01-27 12:50:12 +00:00
Ayush Kumar
593171bb79
Continuing without email' dialog bug fixes
2021-01-23 15:31:59 +05:30
Dan
591b50b1fb
fix issue 16226 to allow switching back to default HS. Signed-off-by: Dan Gwynne dangwynne1@gmail.com
2021-01-21 21:51:22 +00:00
J. Ryan Stinnett
e49a931588
Merge pull request #5533 from aaronraimist/security-key
...
Change a bunch of strings from Recovery Key/Phrase to Security Key/Phrase
2021-01-21 17:46:02 +00:00
Ayush Kumar
530a242aae
Fixed continue button while selecting home server
2021-01-18 21:41:10 +05:30
Jason Robinson
39984c9a34
WIP
2021-01-15 17:14:55 +02:00
Jason Robinson
3901cd9c72
WIP
2021-01-15 17:02:28 +02:00
Jason Robinson
158036ccf9
Merge remote-tracking branch 'origin/develop' into jaywink/hosting-provider-iframe-minimize-wip
2021-01-15 16:12:53 +02:00
Jason Robinson
90a1c5a267
WIP
2021-01-15 15:57:14 +02:00
Jason Robinson
e80dba9414
WIP
2021-01-15 15:32:30 +02:00
Jason Robinson
d6af5b3bbd
WIP minimize
2021-01-14 12:20:42 +02:00
Jason Robinson
d4a58bdb2a
WIP minimize
2021-01-14 11:53:20 +02:00
Jason Robinson
3da5049dc7
WIP minimize
2021-01-12 17:08:42 +02:00
Jason Robinson
e6605441aa
WIP minimize
2021-01-12 14:08:09 +02:00
Travis Ralston
a8d878dc48
Merge pull request #5528 from matrix-org/travis/widget-devtools
...
Add a basic widget explorer to devtools (per-room)
2021-01-11 11:00:08 -07:00
J. Ryan Stinnett
77f79e599f
Merge pull request #5534 from SimonBrandner/fix-16071
...
Add <input type="password"> to security key field
2021-01-11 17:13:35 +00:00
Jason Robinson
e8c716f33e
First stage of host signup flow now sits here
...
Need to make things configurable, image and text for the first step should be configurable.
Also missing privacy related words, though they should be configurable too.
2021-01-11 15:47:21 +02:00
Jason Robinson
2b98f14242
Merge branch 'develop' into jaywink/hosting-provider-iframe
2021-01-11 11:16:03 +02:00
Jason Robinson
325447d9fa
Remove the dedicated host signup dialogs, use QuestionDialog
2021-01-05 14:47:39 +02:00
Jason Robinson
5f84371038
Update some copyrights
2021-01-05 14:29:48 +02:00
SimonBrandner
247bd09312
Fixed 16071
...
Signed-off-by: SimonBrandner <simon.bra.ag@gmail.com>
2021-01-05 13:20:59 +01:00
Aaron Raimist
4f96d5dee5
Change a bunch of strings from Recovery Key/Phrase to Security Key/Phrase
...
Signed-off-by: Aaron Raimist <aaron@raim.ist>
2021-01-04 19:17:17 -06:00
Jason Robinson
bb53ae8038
Rename Element Pro -> Host Signup
2021-01-04 16:05:49 +02:00
Travis Ralston
5773d78464
Maybe this will appease the linter.
2020-12-29 15:40:44 -07:00
Travis Ralston
64b056d689
Appease the linter
2020-12-29 15:34:40 -07:00
Travis Ralston
254e0b9a94
Add a basic widget explorer to devtools (per-room)
2020-12-29 15:30:22 -07:00
Jason Robinson
7a358b1ca3
Rename components to be less EMS specific
2020-12-28 11:21:42 +02:00
Jason Robinson
129795c2ec
Add allow-same-origin to Element Pro dialog
...
Seems to be required after all.
2020-12-21 17:20:51 +02:00
Jason Robinson
1b6e90dcb8
More sandboxing
2020-12-18 16:09:11 +02:00
Jason Robinson
0ae28d584b
Typing and other PR feedback fixes
2020-12-18 16:05:57 +02:00
Jason Robinson
f0e93c6929
Mark remaining strings to be translated
2020-12-17 12:06:42 +02:00
Jason Robinson
5aa24b97cd
Merge remote-tracking branch 'origin/develop' into jaywink/elementPro
2020-12-16 14:45:16 +02:00
David Baker
a33be00c08
Basic call transfer initiation support
...
Adapt the InviteDialog to select a transfer target
Doesn't support supplying a roo mID fr the transfer: just leaves
the transferee to work out how to contact the target themselves.
MSC2747 (matrix-org/matrix-doc#2747 )
Requires https://github.com/matrix-org/matrix-js-sdk/pull/1558
2020-12-15 14:59:06 +00:00
Jason Robinson
cd836be809
Rename everything HostingSignup -> EMSElementPro
...
This setup flow ended up quite specific due to all the various moving parts.
2020-12-15 10:50:38 +02:00
David Baker
2d36910577
Add comment
...
Co-authored-by: Travis Ralston <travpc@gmail.com>
2020-12-14 22:52:30 +00:00
David Baker
df825792bc
These can just all be Members
2020-12-14 22:51:40 +00:00
David Baker
32f693e3b0
Convert InviteDialog to TypeScript
...
Before I start using it to select VoIP transfer targets
2020-12-14 22:28:21 +00:00
Jason Robinson
04bd5f648f
Add confirmation dialog before transferring account data
2020-12-11 16:25:22 +02:00
Jason Robinson
518c4c5dc9
HostingSignupDialog now returns requested data in one message
2020-12-11 16:03:18 +02:00
Travis Ralston
af69ba9c79
Merge pull request #5451 from iokiwi/new/room-alias-in-permalink
...
Use room alias in generated permalink for rooms
2020-12-09 12:07:44 -07:00
Michael Telatynski
5be65a525d
Improve identifiers and code readability
2020-12-09 11:14:06 +00:00
Michael Telatynski
e896b009f1
Handle manual hs urls better
2020-12-08 10:58:16 +00:00
Michael Telatynski
499f7e8af7
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/socials
2020-12-07 16:08:11 +00:00
Michael Telatynski
d06a00bcce
Improve usability of the Server Picker Dialog
2020-12-07 16:05:41 +00:00
Simon Merrick
b365d3b27e
Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into new/room-alias-in-permalink
2020-12-07 10:30:50 +13:00
Simon Merrick
5544ee6408
extract alias handling to separate function
2020-12-06 23:29:11 +13:00
Lukas
a856484139
Fix typos in some strings
...
This commit fixes some typos that I've stumbled upon.
2020-12-06 10:32:52 +01:00
J. Ryan Stinnett
c13891c670
Merge pull request #5260 from orangecms/redact-with-reason
...
add support for giving reason when redacting
2020-12-04 15:13:40 +00:00
Michael Telatynski
e4b929c6f9
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/15882
2020-12-03 11:42:47 +00:00
Michael Telatynski
3223b00028
Jump to home page when leaving a room
...
so that you don't get thrown into a room you may be ignoring on purpose
2020-12-03 11:15:55 +00:00
Jason Robinson
31c7c05f2e
Convert ConfirmCloseHostingSignupDialog to typescript
2020-12-02 11:12:45 +02:00
Michael Telatynski
eb25c39318
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/socials
...
Conflicts:
src/i18n/strings/en_EN.json
2020-12-01 16:33:29 +00:00
Jason Robinson
c03a50e34b
Semiclon
...
Co-authored-by: Travis Ralston <travpc@gmail.com>
2020-12-01 13:51:46 +02:00
Jason Robinson
8f7b012ec1
Interface syntax
...
Co-authored-by: Travis Ralston <travpc@gmail.com>
2020-12-01 13:50:58 +02:00
Jason Robinson
85ce95e066
Interface syntax
...
Co-authored-by: Travis Ralston <travpc@gmail.com>
2020-12-01 13:50:42 +02:00
Jason Robinson
f112f4fcef
Method scoping
...
Co-authored-by: Travis Ralston <travpc@gmail.com>
2020-12-01 13:49:47 +02:00
Jason Robinson
835e417333
Translate all the strings
2020-11-27 15:10:35 +02:00
Jason Robinson
5ad9b83870
Fix copyright strings
2020-11-27 15:10:35 +02:00
Jason Robinson
c818a719bf
Try a slightly larger HostingSignupDialog
...
Make HostingSignupBaseDialog larger
2020-11-27 15:10:35 +02:00
Jason Robinson
2aa36acae0
Change some messageHandler actions
...
setup_complete does not close the dialog but
just allows marking the setup as completed.
close_dialog closes the dialog immediately.
2020-11-27 15:10:35 +02:00
Jason Robinson
d607999cff
Send also domain and user localpart to HostingSignupDialog iframe
2020-11-27 15:10:35 +02:00
Jason Robinson
b3b3f5ebeb
Fix HostingSignupDialog layouting inside dialog
2020-11-27 15:10:35 +02:00
Jason Robinson
1e699b7ef3
Enable token request for HostingSignupDialog
...
Needed for the last part of setup which is triggering
a migration process to the new host.
2020-11-27 15:10:35 +02:00
Jason Robinson
a37e0db3e1
Move HostingSignupDialog to the dialogs folder
2020-11-27 15:10:35 +02:00
Jason Robinson
e6582c140f
Dont' allow HostingSignupDialog to close
...
Except via confirmed cancel action or host setup success postmessage.
2020-11-27 15:10:35 +02:00
Michael Telatynski
86025459f4
Remove unused dialog, todo comments and other tiny tweaks
2020-11-26 15:01:12 +00:00
Travis Ralston
fc820c4b1a
Construct modal widgets in the same way we do any other widget
...
Fixes https://github.com/vector-im/element-web/issues/15800
2020-11-25 18:51:27 -07:00
Travis Ralston
51f6205258
Fix modal buttons not being disabled by disabling them
...
Looks like this was just a missed block of code, but also the important bit.
Fixes https://github.com/vector-im/element-web/issues/15801
2020-11-25 18:48:18 -07:00
Travis Ralston
5da27aed94
Replace the concept of a Widget Security Key with an OIDC state
...
The security key naming/practice was misguided, so let's call it what it is (a settings key) and abstract away the complexity to a new store.
Fixes https://github.com/vector-im/element-web/issues/15820 while we're here.
2020-11-25 18:39:11 -07:00
Michael Telatynski
c4084196d1
delint
2020-11-25 10:39:44 +00:00
Michael Telatynski
758b47c64d
Replace *ServerConfig and SignInToText with ServerPicker
2020-11-25 09:46:56 +00:00
Michael Telatynski
225d541487
Extend Field and InfoDialog with more configurability
2020-11-25 09:19:08 +00:00
Michael Telatynski
b1ca1eb3f5
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/socials
2020-11-24 11:30:51 +00:00
Michael Telatynski
2263280035
Improve no email warning during registration
2020-11-23 10:25:46 +00:00
Travis Ralston
dec47a260c
Appease the linter
2020-11-19 12:12:00 -07:00
Travis Ralston
0104164d51
Approximate the design as proposed
2020-11-19 12:06:24 -07:00
Travis Ralston
21663314ee
Minor touchups to the dialog
2020-11-19 11:24:17 -07:00
Travis Ralston
ddd8bdc00e
Move all the capability copy to its own class
2020-11-19 11:15:42 -07:00
Travis Ralston
55592d365c
Merge branch 'develop' into travis/msc-send-widget-events
2020-11-18 15:57:53 -07:00
Michael Telatynski
9b2143742a
Merge pull request #5418 from matrix-org/t3chguy/fix/muggle-hustle
...
Small delight tweaks to improve rough corners in the app
2020-11-18 10:07:31 +00:00
Travis Ralston
a212dab84c
Developer design a permissions dialog
2020-11-17 20:38:59 -07:00
Travis Ralston
94550546eb
Merge branch 'develop' into travis/msc-send-widget-events
2020-11-16 15:08:52 -07:00
Travis Ralston
91b1c8b817
Fix DM logic to always pick a more reliable DM room
...
Fixes https://github.com/vector-im/element-web/issues/15605
2020-11-16 15:07:09 -07:00
Travis Ralston
962b964c07
Merge pull request #5412 from matrix-org/travis/msc2790-disabled-buttons
...
Disable buttons when required by MSC2790
2020-11-12 12:02:20 -07:00
Michael Telatynski
d0513406ee
Pass filter text when clicking explore/dm prompt
2020-11-11 17:04:09 +00:00
Michael Telatynski
b2366c38ba
Fix the feedback not closing without feedback/countly
2020-11-11 16:54:11 +00:00
Travis Ralston
65b8f27b26
Disable buttons when required by MSC2790
2020-11-09 21:14:20 -07:00
Michael Telatynski
3b7b66c856
Change out caption for email invite suggestions and stack vertically
2020-11-03 14:56:06 +00:00
Michael Telatynski
66377eb731
Invite UX tweaks:
...
+ re-focus input field after all interactions
+ change textarea to text input
+ fix margins between things
+ improve keyboard usage with enter/space autofilling
2020-11-03 13:14:35 +00:00
Michael Telatynski
db8cd68d8b
Rearrange copy
2020-11-03 12:47:13 +00:00
Travis Ralston
e15041bd53
Add a custom widget API action for viewing a different room
2020-11-02 15:21:18 -07:00
Michael Telatynski
997679e648
Fix Widget OpenID Permissions for realsies
2020-10-30 22:12:46 +00:00
Michael Telatynski
c3a355097d
Initial Countly work
2020-10-29 15:57:16 +00:00
Michael Telatynski
cf93f75d09
fix sandbox flags
2020-10-22 22:09:16 +01:00
Michael Telatynski
12bc3ea9dc
remove stale comments
2020-10-22 21:34:48 +01:00
Michael Telatynski
b6fd2a0691
Iterate the Modal Widget Dialog paddings and phishing warning
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-10-20 15:05:22 +01:00
Michael Telatynski
16362440b3
Iterate Modal Widgets
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-10-19 20:39:43 +01:00
Michael Telatynski
00b1a03a3e
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/feat/modal-widgets
...
Conflicts:
src/@types/global.d.ts
src/FromWidgetPostMessageApi.js
src/WidgetMessaging.js
src/widgets/WidgetApi.ts
2020-10-19 19:46:07 +01:00
J. Ryan Stinnett
f2b72efe39
Remove various remaining bits of ILAG flows
...
TypeScript helpfully pointed me towards this dead code, which has been floating
around unused for a while. If we want to bring back ILAG in the future, we can
always revive it from history.
2020-10-07 12:53:59 +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
Daniel Maslowski
43ff97c178
Add support for giving reason when redacting
...
Signed-off-by: Daniel Maslowski <info@orangecms.org>
2020-09-28 23:29:33 +02: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
13d09df7d7
tidy
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-09-28 11:59:39 +01:00
Michael Telatynski
30d2e61a0d
Continuation
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-09-28 10:50:31 +01:00
Michael Telatynski
e3b0bf1915
Fix url encoding issue for modal widgets widgetId
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-09-25 15:03:54 +01:00
Michael Telatynski
44bc8fc67e
Initial Modal Widget work tweaks MSC2790
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-09-25 14:08:27 +01:00
Travis Ralston
342f1d5b43
Extremely bad support for "temporary widgets"
2020-09-21 14:36:24 -06: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
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
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
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
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
c11abb74e0
UI Feature Flag: Share dialog QR code and social icons
2020-09-16 16:06:17 +01:00
Michael Telatynski
feb37878d8
tidy
2020-09-16 15:04:13 +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
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
7a448be1dc
UI Feature Flag: Disable advanced options and tidy up some copy
2020-09-16 12:14:33 +01:00
Michael Telatynski
9cc789756b
UI Feature Flag: Hide flair
2020-09-16 11:26:15 +01: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
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
J. Ryan Stinnett
7b1031d6a6
Merge pull request #5169 from matrix-org/jryans/defer-cross-signing-setup
...
Prep work for Settings changes with cross-signing deferral
2020-09-04 12:51:25 +01:00
Michael Telatynski
e624ce11b4
Merge pull request #5157 from matrix-org/t3chguy/crc1
...
Remove create-react-class
2020-09-03 17:21:58 +01:00
Michael Telatynski
97ebfa02c3
Merge pull request #5162 from matrix-org/t3chguy/lodash
...
Consolidate Lodash files in bundle
2020-09-03 15:54:43 +01:00
J. Ryan Stinnett
fb2bde94fa
Rename CrossSigningManager to SecurityManager
...
The file encompasses bits of cross-signing and also secret storage / secure
backup.
2020-09-03 14:50:49 +01:00
Travis Ralston
9b12355b2a
Appease the linter
2020-09-02 08:59:24 -06:00
Travis Ralston
92c184385c
Merge branch 'develop' into travis/communities/proto/userinfo
2020-09-01 10:51:42 -06:00
Michael Telatynski
d668f8018b
undo some delint
2020-09-01 15:59:19 +01:00
Michael Telatynski
842821b038
Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into t3chguy/lodash
2020-09-01 09:09:50 +01:00
Michael Telatynski
656a815991
delint some more
2020-09-01 09:07:46 +01:00
Travis Ralston
fdbaddbace
Add a simple edit dialog for communities
2020-08-31 10:52:08 -06:00
Travis Ralston
724e3f6905
Run all selected prototype community logic through one store
2020-08-31 10:19:05 -06:00
Michael Telatynski
517dee413e
Delint
2020-08-29 12:57:11 +01:00
Michael Telatynski
72498df28f
Remove create-react-class
2020-08-29 12:14:16 +01:00
Michael Telatynski
9ba33c7f80
Fix eslint ts override tsx matching and delint
2020-08-29 01:11:08 +01:00
Travis Ralston
90d9d7128d
Use FlairStore's cache for group naming
...
Turns out GroupStore doesn't really know much.
2020-08-28 14:56:59 -06:00
Travis Ralston
6f237161fd
Appease the linter
2020-08-28 13:28:54 -06:00
Travis Ralston
e58b514803
Add clarifying text to DM dialog about what is about to happen
2020-08-28 13:22:20 -06:00
Michael Telatynski
1fc55b33c1
Stash lodash import optimization
2020-08-28 18:53:43 +01:00
Travis Ralston
cc2fc911af
Minor copy addition to DM dialog for communities prototype
2020-08-28 10:03:27 -06:00
Travis Ralston
f038103f97
Fix copy
2020-08-28 09:47:36 -06:00
Travis Ralston
be1de1d295
Update create room dialog copy
2020-08-27 13:49:40 -06:00
resynth1943
2c20afc047
Fix lodash imports
...
Signed-off-by: resynth1943 <resynth1943@tutanota.com>
2020-08-26 23:23:18 +01:00
Travis Ralston
4f29770adb
Force the GroupStore to update after creating a prototype community
2020-08-26 11:02:14 -06:00
Travis Ralston
027f263589
Remove prototype code from CreateGroupDialog
...
The prototype code paths prevent users from ending up here, so we don't need custom code.
2020-08-26 11:01:58 -06:00
Travis Ralston
c28134eb11
Associate created rooms with the selected community
2020-08-26 10:53:06 -06:00
Travis Ralston
82b015bd5f
Rename components to match prior convention
2020-08-26 08:52:39 -06:00
Travis Ralston
3e7d82b421
Change tip copy
2020-08-26 08:48:01 -06:00
Travis Ralston
56c7f86983
Add an invite users to community step to dialog flow
2020-08-25 21:08:31 -06:00
Travis Ralston
7c1a9993e3
Add new create group dialog
2020-08-25 21:08:24 -06:00
Travis Ralston
65fe562cbf
Select new tag after creating the group
2020-08-25 21:08:12 -06:00
Travis Ralston
f0bd4d3625
Show the group's room if one is returned
2020-08-21 18:19:34 -06:00
Travis Ralston
c9d98a1d19
Merge pull request #5124 from matrix-org/travis/settings-v3
...
Settings v3: Feature flag changes
2020-08-19 12:00:48 -06:00
Travis Ralston
3659115921
Followup on some SettingsStore removals
2020-08-17 13:37:16 -06:00
Travis Ralston
96087d61f6
Convert feature setting usages to regular settings
2020-08-17 13:12:18 -06:00
Michael Telatynski
8aa50ecb59
Iterate rageshake download styling
2020-08-13 13:08:07 +01:00
Michael Telatynski
df980dbf92
Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into travis/download-logs
2020-08-12 22:48:03 +01:00
Jorik Schellekens
0060acbb33
Merge pull request #5056 from matrix-org/joriks/style-fighting
...
Quick win session 24/07/2020
2020-08-12 15:21:06 +01:00
J. Ryan Stinnett
9e429ee669
Remove rebranding toast
...
It's time to remove the rebranding toast, as we believe people have had
sufficient warning now.
Fixes https://github.com/vector-im/element-web/issues/14931
2020-08-11 14:27:53 +01:00
J. Ryan Stinnett
7748e3ae1a
Merge pull request #5083 from matrix-org/jryans/riot-to-element
...
Replace Riot with Element in docs and comments
2020-08-05 12:25:45 +01:00
Jorik Schellekens
271eeeabee
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into joriks/style-fighting
2020-08-04 15:04:56 +01:00
Bruno Windels
c1ec41715c
Merge pull request #5082 from matrix-org/bwindels/fixinvitedialogcrash
...
Add null guard in InviteDialog
2020-08-04 08:35:20 +00:00
Jorik Schellekens
5426d9f105
Use accessible button for copy icon.
2020-08-03 19:21:24 +01:00
J. Ryan Stinnett
ce226ab534
Replace Riot with Element in docs and comments
...
This only covers the simple cases of references to issues and repos. More
complex areas, such as deployment scripts, will be handled separately.
Part of https://github.com/vector-im/element-web/issues/14864
2020-08-03 18:33:36 +01:00
Bruno Windels
71a9fef491
fix InviteDialog crash
2020-08-03 17:42:54 +02:00
Michael Telatynski
0a700bc8e4
Iterate copy on download logs button
2020-08-03 13:21:04 +01:00
Michael Telatynski
cbcac9dd49
Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into travis/download-logs
...
Conflicts:
package.json
2020-08-03 12:54:06 +01:00
Travis Ralston
e8d1024c45
Merge pull request #5076 from matrix-org/travis/cleanup/1
...
Clean up documentation of Whenable + fix other code concerns
2020-07-31 11:27:19 -06:00
Travis Ralston
3443761007
Merge pull request #5062 from matrix-org/travis/settings/ts
...
Convert SettingsStore to TypeScript
2020-07-31 11:07:07 -06:00
Travis Ralston
7645fe6b23
Update context transaction states
2020-07-31 10:00:02 -06:00
Travis Ralston
7522380763
Update copy
2020-07-30 10:17:47 -06:00
Travis Ralston
c5574219bb
Implement dialog for resending local echo transactions
2020-07-29 20:36:04 -06:00
Travis Ralston
1f7f40736b
Fix imports for SettingLevel to point at new file
2020-07-28 11:53:43 -06:00
Jorik Schellekens
d55699211e
Update copy icon on pre block and share dialogues
2020-07-27 15:13:02 +01:00
Travis Ralston
2abec8b100
Disable lint in InviteDialog
2020-07-23 15:58:06 -06:00
Michael Telatynski
70c81cc377
Merge branches 'develop' and 'travis/download-logs' of github.com:matrix-org/matrix-react-sdk into travis/download-logs
...
Conflicts:
src/i18n/strings/en_EN.json
src/rageshake/submit-rageshake.ts
2020-07-21 22:22:28 +01:00
Travis Ralston
2b15ba21dd
Rename RoomListStore file
2020-07-17 15:11:34 -06:00
Travis Ralston
1810711380
Dismantle usage of the proxy store class
2020-07-17 14:25:09 -06:00
Travis Ralston
87743fe0e8
Fix size call for devtools state events
...
Fixes https://github.com/vector-im/riot-web/issues/14565
It's not a function
2020-07-16 18:34:19 -06:00
Travis Ralston
8b65b19e60
Merge pull request #4936 from matrix-org/travis/general/perf/js-roomstate-map
...
Convert devtools dialog to use new room state format
2020-07-16 13:01:45 -06:00
Travis Ralston
9c9ff281e7
Use .entries()
2020-07-16 13:00:02 -06:00
David Baker
fad5edf794
Fix TS lint errors
2020-07-15 10:56:50 +01:00
J. Ryan Stinnett
9085627a28
Use brand name from config in all strings
2020-07-10 19:57:01 +01:00
J. Ryan Stinnett
063e6e3e9c
Fix a few types
2020-07-10 18:23:27 +01:00
David Baker
8701e9293e
Add in-app rebranding toasts & prompts
...
Either shows an informational dialog telling you the name has changed,
or a more naggy one if the user needs to log in on a different URL.
The new URL (if any) is hardcoded based on the current URL, and also
with a bonus config param in case other deployments need to do similar.
2020-07-10 15:32:34 +01:00
Travis Ralston
545f11d742
Convert devtools dialog to use new room state format
2020-07-08 22:23:51 -06:00
David Baker
7caf2d5459
remove rogue blank line
2020-06-30 17:56:50 +01:00
David Baker
0579c9f748
Fix tests
2020-06-26 20:25:38 +01:00
David Baker
916f606872
Apparently we need to null check here
2020-06-26 19:07:39 +01:00
David Baker
5f2127ddf5
Disable spellcheck on the recovery key entry
2020-06-26 18:55:23 +01:00
David Baker
24baf19d65
Set field validity (ie. border colour) correctly
...
Changes flagInvalid to forceValidity which can force valid as well
as invalid.
2020-06-26 18:50:05 +01:00
David Baker
b74674ced8
Right name for security key and fix cancel button
2020-06-26 18:04:06 +01:00
David Baker
15ebaa1470
Port recovery key upload button to new designs
2020-06-26 15:22:04 +01:00
David Baker
178cbca934
Use mask images in key entry dialogs
2020-06-26 12:56:41 +01:00
David Baker
e18ea55d20
Convert icons to masks
...
so they're a sensible colour in other themes
2020-06-26 12:41:24 +01:00
David Baker
78f750265c
Remove unused code
...
No reset option here anymore
2020-06-25 16:33:07 +01:00
David Baker
648c0c28c2
Add placeholder to security phrase input
2020-06-25 15:36:06 +01:00
David Baker
2b144a846a
Apply some of the newer styling to passphrase / recovery key entry
2020-06-25 12:44:15 +01:00
David Baker
e0a34d9dea
Revert "Use recovery keys over passphrases"
2020-06-18 09:35:11 +01:00
David Baker
8ebae4c3b6
Merge pull request #4686 from matrix-org/dbkr/recovery_keys_over_passphrases
...
Use recovery keys over passphrases
2020-06-15 11:30:30 +01:00
Travis Ralston
de18af35ff
Support minimum to open user settings to a particular tab
...
Tabs now have IDs, and we use those IDs to open things. This doesn't do any conversion to typescript, and doesn't add the same feature to the room settings out of concern for the size of diff.
2020-06-08 08:20:15 -06:00
David Baker
b82a893a79
Merge remote-tracking branch 'origin/develop' into dbkr/recovery_keys_over_passphrases
2020-06-05 16:00:43 +01:00
Bruno Windels
07e0cab4a8
When trying to restore a keyback that has its key in 4S, check if 4S will be readable
...
If the account data for the 4S key is cleared or lost somehow, don't attempt to
read the key and ask for the passphrase/recovery key instead, as doing so would trigger another
bootstrap from the restore key backup dialog, overwriting the existing key backup.
2020-06-04 12:52:20 +02:00
Michael Telatynski
bde327e1e6
Merge pull request #4695 from aaronraimist/center-headerbuttons
...
Center HeaderButtons
2020-06-04 00:36:23 +01:00
Aaron Raimist
a4c9a67325
Delete files.png and change UploadConfirmDialog to use svg used elsewhere
...
Signed-off-by: Aaron Raimist <aaron@raim.ist>
2020-06-03 17:23:37 -05:00
David Baker
6f3bfc96ca
Merge remote-tracking branch 'origin/develop' into dbkr/recovery_keys_over_passphrases
2020-06-03 11:01:43 +01:00
Michael Telatynski
eb536ff2f7
Merge branches 'develop' and 't3chguy/e2eedefault' of github.com:matrix-org/matrix-react-sdk into t3chguy/e2eedefault
...
Conflicts:
src/components/views/dialogs/CreateRoomDialog.js
src/components/views/dialogs/InviteDialog.js
src/components/views/right_panel/UserInfo.js
src/createRoom.js
2020-06-03 10:51:17 +01:00
Michael Telatynski
936445ab2d
Merge pull request #4660 from matrix-org/t3chguy/kill_UDE_and_UDD
...
Remove legacy codepaths for Unknown Device Error (UDE/UDD) handling
2020-06-03 10:45:47 +01:00
Michael Telatynski
653b2ff060
Merge pull request #4655 from matrix-org/t3chguy/remove_cross_signing
...
Remove feature_cross_signing
2020-06-03 10:42:13 +01:00
David Baker
b83ecb1781
Merge remote-tracking branch 'origin/develop' into dbkr/recovery_keys_over_passphrases
2020-06-02 18:53:54 +01:00
David Baker
e06ba2003b
Prompt for recovery key on login rather than passphrase
...
Only show passphrase options at all if the user has a passphrase on
their SSSS key.
2020-06-02 16:32:15 +01:00
Michael Telatynski
2dda93bf1a
delint
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-06-01 23:09:57 +01:00
Michael Telatynski
a2fb96eb8f
Update Create Room Dialog microcopy for e2ee-default:false
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-06-01 22:59:14 +01:00
Michael Telatynski
8848a2ea64
Merge branches 'develop' and 't3chguy/e2eedefault' of github.com:matrix-org/matrix-react-sdk into t3chguy/e2eedefault
...
Conflicts:
src/components/views/dialogs/InviteDialog.js
2020-06-01 21:42:31 +01:00
Jorik Schellekens
69747b6114
Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into joriks/appearance-tab
2020-06-01 14:32:31 +01:00
Jorik Schellekens
66c0d53f3e
Create and use stylised checkboxes
2020-05-28 22:33:00 +01:00
Michael Telatynski
8aaa7825ef
Also kill off things that these kept behind
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-05-28 17:12:19 +01:00
Michael Telatynski
f0cabd55c0
Remove legacy codepaths for Unknown Device Error (UDE/UDD) handling
...
as we now always `setGlobalErrorOnUnknownDevices(false)`
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-05-28 17:01:22 +01:00
Michael Telatynski
03058bacbd
Dialog wrap title instead of taking same space as the close/cancel button
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-05-28 16:48:50 +01:00
Michael Telatynski
cc68f53fc2
tidy up and delint
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-05-27 10:47:01 +01:00
Michael Telatynski
2b432b0d82
Remove feature_cross_signing
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-05-27 10:28:25 +01:00
David Baker
a496dafd41
Remove the keyshare dialog
...
Fixes https://github.com/vector-im/riot-web/issues/11908
2020-05-26 16:51:20 +01:00
Michael Telatynski
0713139dc5
Merge branches 'develop' and 't3chguy/confusing_copy' of github.com:matrix-org/matrix-react-sdk into t3chguy/confusing_copy
2020-05-26 13:35:18 +01:00
Michael Telatynski
707e22ad09
Merge pull request #4402 from matrix-org/t3chguy/alias
...
Replace `alias` with `address` in copy for consistency
2020-05-26 09:36:58 +01:00
Michael Telatynski
1f52b5e203
Update Crypto Store Too New copy
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-05-25 10:59:31 +01:00
Travis Ralston
7ff850deea
Merge pull request #4253 from matrix-org/travis/room-list-2
...
Rewrite the room list store
2020-05-21 13:30:32 -06:00
David Baker
5d1c01fd6f
Fix key backup restore with SSSS
...
The room / session ID params come after the backupInfo for restoring
from SSSS so the options object was being passed into the wrong param.
Roll on TypeScript.
This meant restoring backups worked fine when the key was cached but
failed when it wasn't.
Regressed in https://github.com/matrix-org/matrix-react-sdk/pull/4507
2020-05-21 12:26:27 +01:00
Jorik Schellekens
6d9d4ee547
Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into joriks/font-scaling-slider
2020-05-20 13:46:17 +01:00
Michael Telatynski
0016d8e744
Add e2ee_default_for_private_rooms to control default e2ee behaviour
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-05-19 11:36:44 +01:00
Travis Ralston
798e7a1f86
Merge branch 'develop' into travis/dispatcher-types
2020-05-15 09:56:02 -06:00
Travis Ralston
2b4c19e9ba
Merge branch 'travis/dispatcher-types' into travis/room-list-2
2020-05-14 13:40:37 -06:00
Travis Ralston
08419d195e
Initial breakout for room list rewrite
...
This does a number of things (sorry):
* Estimates the type changes needed to the dispatcher (later to be replaced by https://github.com/matrix-org/matrix-react-sdk/pull/4593 )
* Sets up the stack for a whole new room list store, and later components for usage.
* Create a proxy class to ensure the app still functions as expected when the various stores are enabled/disabled
* Demonstrates a possible structure for algorithms
2020-05-14 12:44:29 -06:00
Michael Telatynski
239197a3cb
Merge pull request #4394 from matrix-org/t3chguy/qrcode
...
wrap node-qrcode in a React FC and use it for ShareDialog
2020-05-14 17:31:26 +01:00
Travis Ralston
acc17e6026
Merge pull request #4584 from matrix-org/travis/deactivate-fix
...
Acquire a new session before enacting deactivation
2020-05-14 07:52:17 -06:00
Michael Telatynski
4c7d703275
Reuse QRCode for VerificationQRCode and specify widths
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-05-14 11:20:27 +01:00
Michael Telatynski
1ba19e78f8
Merge branches 'develop' and 't3chguy/qrcode' of github.com:matrix-org/matrix-react-sdk into t3chguy/qrcode
...
Conflicts:
package.json
2020-05-14 10:50:42 +01:00
Travis Ralston
e4835c4b03
Demonstrate dis.fire() with view_user_settings
...
Like a5f3318f3b
, this proves that the new dispatcher conversion works for fire-and-forget style dispatches too. This is another obvious-if-broken and generally safe conversion to make.
Other actions which can be dispatched this way have been excluded for reasons mentioned in the Action enum's comments.
2020-05-13 21:08:08 -06:00
Travis Ralston
90a898d03f
Move dispatcher into a subdirectory
...
We're expecting to have a whole bunch of types for the dispatched payloads, so pull the thing into a directory we can throw them in.
2020-05-13 21:07:50 -06:00
Travis Ralston
9dd93f14ba
Merge pull request #4555 from matrix-org/travis/sso-xsigning
...
Add copy to SSO prompts during cross-signing setup
2020-05-13 15:33:09 -06:00
Michael Telatynski
77e32977dc
Merge pull request #4579 from matrix-org/t3chguy/create_room_public
...
Default to public room when creating room from room directory
2020-05-13 10:50:38 +01:00
Travis Ralston
6d90a9d1a3
Appease the linter
2020-05-12 17:20:26 -06:00
Travis Ralston
c0632d0195
Acquire a new session before enacting deactivation
...
Fixes https://github.com/vector-im/riot-web/issues/13645
Every time the checkbox value changes we acquire a new session now. This avoids us asking the server to change its direction partway through the request.
This causes a bit of UI jerk as the dialog goes from auth -> loading -> auth, however it's better than the alternative of reworking the entire UIA structure to support the `authData` dict changing. Originally this commit consisted of a `disabled` flag on the `InteractiveAuth` component which carried through to the stage's component, however it turns out that stack doesn't respect changes to the `authData` prop, which means the session ID we eventually send down is wrong (`erase: false` instead of the one with `erase: true`). Therefore, we do some logic to ensure we remount `InteractiveAuth` completely.
Further work in this area is described in https://github.com/vector-im/riot-web/issues/13646
2020-05-12 17:17:17 -06:00
Michael Telatynski
7fe40a0470
Default to public room when creating room from room directory
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-05-12 10:55:46 +01:00
David Baker
6486c74909
Fix passphrase reset in key backup restore dialog
...
We prompt to restore the key backup when bootstrapping if it's not
trusted, but the 'set up new recovery options' in this dialog just
sets up a new key backup which just goes back to trying to access
SSSS if cross-signing is enabled. This makes it reset the SSSS
passphase instead.
Fixes https://github.com/vector-im/riot-web/issues/13578
2020-05-11 14:21:59 +01:00
Jorik Schellekens
33a5b5142d
Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into joriks/font-scaling-slider
2020-05-07 18:01:20 +01:00
Travis Ralston
b8fd50c5e3
Appease the linter
2020-05-06 14:27:32 -06:00