Commit graph

1299 commits

Author SHA1 Message Date
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
Travis Ralston
d31a0199bc Add default dialog aesthetics to avoid empty SSO dialogs in future 2020-05-06 14:24:16 -06:00
Michael Telatynski
62bbf15efe
Merge pull request #4497 from matrix-org/t3chguy/invite_copy
Update Invite Dialog copy to include email addresses
2020-05-06 18:16:36 +01:00
Zoe
3acb952d9a
Merge pull request #4507 from matrix-org/foldleft/13167-spinner-progress
Show progress when loading keys
2020-04-30 14:09:47 +01:00
J. Ryan Stinnett
65bdaa20b0 Allow resetting storage from the access dialog
This adds a path to reset secret storage from the access dialog instead of
throwing an error.

Fixes https://github.com/vector-im/riot-web/issues/13436
2020-04-29 15:19:09 +01:00
Zoe
465442c31e fragments and i18n don't play nice together 2020-04-29 15:13:24 +01:00
Zoe
326d567468 Fixed the dialog height 2020-04-29 14:29:36 +01:00
Zoe
62c73146dc copy changes 2020-04-29 14:14:39 +01:00
Bruno Windels
bb6d13781c enable encryption when NOT inviting 3pids 2020-04-29 11:40:04 +02:00
Michael Telatynski
41dece38a4 iterate copy
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-29 10:35:35 +01:00
Bruno Windels
f06a69d8cc targets can also contain RoomMember, so take the positive case rather 2020-04-29 11:05:35 +02:00
Bruno Windels
4e98b5b4b6 dont enable e2ee when inviting a 3pid 2020-04-29 11:05:35 +02:00
Jorik Schellekens
1b83faaa8d Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into joriks/font-scaling-slider 2020-04-28 15:38:46 +01:00
Zoe
9d1c73348c Show progress when loading keys 2020-04-28 11:32:51 +01:00
Michael Telatynski
a58fd6c475 delint
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-27 14:27:41 +01:00
David Baker
ca0cede1aa Add a link from settings / devices to your user profile
Temporarily until you can verify devices in settings

Fixes https://github.com/vector-im/riot-web/issues/13401
2020-04-27 14:25:47 +01:00
Michael Telatynski
606940bd77 Update Invite Dialog copy to include email addresses
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-27 14:07:39 +01:00
David Baker
6460f6303c Move store subscribe to didmount 2020-04-24 17:36:02 +01:00
David Baker
bbce37b92f Make icon change in SetupEncryptionDialog
Fixes https://github.com/vector-im/riot-web/issues/13368
2020-04-24 15:39:54 +01:00
Jorik Schellekens
600a812227 Add brush icon for appearance setting tab 2020-04-23 12:20:10 +01:00
Jorik Schellekens
7c9df04d42 Use "Appearance" instead of "Style" 2020-04-23 10:45:47 +01:00
Jorik Schellekens
c1827925da Use new style tab 2020-04-23 10:45:47 +01:00
Michael Telatynski
b10a386675 Fix i18n of SSO UIA copy in Deactivate Account Dialog
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-22 21:37:52 +01:00
Zoe
61c6c8de45 Add a back button to the devtools verifications panel 2020-04-21 16:27:31 +01:00
Michael Telatynski
29028844f9
Merge pull request #4435 from matrix-org/t3chguy/typo1
Fix typo
2020-04-17 16:47:27 +01:00
Michael Telatynski
518639e8b1 Fix typo
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-17 16:04:38 +01:00
Michael Telatynski
66de06c7b9
Merge pull request #4381 from matrix-org/t3chguy/rageshake_incompatible_browser
Rageshake: remind user of unsupported browser and send modernizr report
2020-04-17 13:14:40 +01:00
Michael Telatynski
81c7660bf5 Iterate copy
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-17 12:25:16 +01:00
Travis Ralston
a5f5f759cb Create unencrypted rooms by default in e2e-tests
Otherwise the lazy loading test will try to join the room after the encrypted messages have already been sent, making them invisible. 

See https://github.com/vector-im/riot-web/issues/13226#issuecomment-614928362
2020-04-16 16:27:43 -06:00
Travis Ralston
db749519e7 Merge branch 'develop' into travis/cross-sign-setting 2020-04-16 11:06:26 -06:00
Michael Telatynski
e942a35525 Fixxy
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-16 14:09:41 +01:00
Michael Telatynski
ce78e3b8d8 further tweaks by Matthew
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-16 13:28:12 +01:00
Michael Telatynski
1fb0f39c84 Replace Verify this session and Complete security
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-16 13:23:01 +01:00
Michael Telatynski
f65c31383d Copy tweaks with Nad
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-16 12:52:35 +01:00
Michael Telatynski
a9a2999ccc Use recovery passphrase and recovery key everywhere
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-16 12:26:12 +01:00
Travis Ralston
b4e2daaf46 Convert cross-signing feature flag to setting
This is intended as a temporary measure until we're comfortable with removing the flag entirely.
2020-04-15 13:18:42 -06:00
Michael Telatynski
276b5b874c Convert ShareDialog to Typescript
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-15 00:22:19 +01:00
Michael Telatynski
89bc3bdd5b consolidate and extract copyPlaintext, copyNode and selectText
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-15 00:16:11 +01:00
Michael Telatynski
09d56e7bbc Fix create room dialog e2ee private room setting
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-14 13:05:23 +01:00
Michael Telatynski
384336e8f1 s/alias/address/ in copy
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-14 10:06:57 +01:00
Michael Telatynski
237084da78 wrap node-qrcode in a React FC and use it for ShareDialog instead of qrcode-react
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-11 23:46:58 +01:00
Michael Telatynski
0153f39c10 Rageshake, remind user of unsupported browser and report missing features in report
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-09 22:55:28 +01:00
Michael Telatynski
a9a253f27f
Merge pull request #4362 from matrix-org/t3chguy/private_room_e2ee
Add toggle for e2ee when creating private room
2020-04-09 17:22:58 +01:00
Michael Telatynski
4041c030a5 Apply changes from Figma
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-08 14:44:34 +01:00
Michael Telatynski
eec28ce38a Update styling and copy to match Figma
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-08 13:47:15 +01:00
J. Ryan Stinnett
8ffc206358
Merge pull request #4356 from matrix-org/travis/deactivate-sso
Support deactivating your account with SSO
2020-04-08 12:19:53 +01:00
Michael Telatynski
ada860f163 Add toggle for e2ee when creating private room in x-signing world
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-08 10:50:22 +01:00
Michael Telatynski
f61c888f0c
Merge pull request #4358 from matrix-org/t3chguy/fix_complete_security
Fix sas verification buttons to match figma
2020-04-08 10:00:39 +01:00
Travis Ralston
900a05366e Fix share dialog correctly
componentDidMount fires too late for this dialog, so we need to set ourselves up in the constructor.

Fixes https://github.com/vector-im/riot-web/issues/13068
2020-04-07 15:22:38 -06:00
Michael Telatynski
712e6e8c49 Fix sas verification buttons to match figma and remove useless inDialog prop from EncryptionPanel.js
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-07 19:03:12 +01:00
Travis Ralston
bdeba252ec Support deactivating your account with SSO
Fixes https://github.com/vector-im/riot-web/issues/12940
2020-04-06 15:42:06 -06:00
Bruno Windels
081baa2359 set dialog title for self-verification
use request.isSelfVerification helper
2020-04-02 17:51:06 +02:00
Michael Telatynski
6db51cf9aa
Merge pull request #4321 from matrix-org/t3chguy/room_settings_notif_icon
Fix Room Settings Dialog Notifications tab icon
2020-04-02 09:50:57 +01:00
Travis Ralston
5c2841323e Appease the linter by turning it off 2020-04-01 14:45:54 -06:00
Travis Ralston
47e5cfecf2 Silence usages of componentWillReceiveProps
For https://github.com/vector-im/riot-web/issues/12877
2020-04-01 14:35:39 -06:00
Travis Ralston
07030a9466
Merge branch 'develop' into travis/react-warnings/3-componentCannotDidMount 2020-04-01 11:14:19 -06:00
Travis Ralston
0fcbe40bec
Merge pull request #4314 from matrix-org/travis/react-warnings/2-code-quality
Fix a number of minor code quality issues
2020-04-01 11:13:46 -06:00
Travis Ralston
59a99bbad8
Merge pull request #4313 from matrix-org/travis/react-warnings/1-componentDidMount
Use componentDidMount in place of componentWillMount where possible
2020-04-01 11:13:04 -06:00
Travis Ralston
8f04746e4e Revert to UNSAFE_componentWillMount where componentDidMount will not work 2020-04-01 11:05:49 -06:00
Michael Telatynski
544bd09667
Merge pull request #4320 from matrix-org/t3chguy/user_info_buttons
Fix UserInfo e2e buttons to match Figma
2020-04-01 17:47:05 +01:00
Travis Ralston
094d006928
Merge pull request #4292 from matrix-org/travis/sso-uia
Support SSO for interactive authentication
2020-04-01 10:27:24 -06:00
Michael Telatynski
6293684218 Fix Room Settings Dialog Notifications tab icon
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-01 12:57:28 +01:00
Michael Telatynski
4a4a13ac75 Fix UserInfo e2e buttons to match Figma
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-01 12:21:18 +01:00
Travis Ralston
0a6f54da33 Label and use UNSAFE_componentWillMount to minimize warnings
These TODO comments are expected to be fixed ASAP, but until that happens let's minimize the errors in the console for development.

For https://github.com/vector-im/riot-web/issues/12877

These all aren't using componentDidMount because they do something which causes application instability if componentDidMount were used. Much of these calls are expected to move into constructors once they are converted to real classes.
2020-03-31 14:15:23 -06:00
Travis Ralston
3f99332f4b Use componentDidMount in place of componentWillMount where possible
This fixes a common React warning we see. Most of these components should be using constructors instead, however componentDidMount is just as good (and doesn't require converting most of these).

Conversion to classes will be done in a later stage of React warning fixes.

For https://github.com/vector-im/riot-web/issues/12877
2020-03-31 14:14:17 -06:00
Travis Ralston
c86d75693b Fix a number of minor code quality issues
Most of these are complaints from my IDE. Discovered by going through nearly every file looking for React warnings.
2020-03-31 14:05:56 -06:00
Travis Ralston
6112d92f80 Remove debugging 2020-03-30 20:11:23 -06:00
Travis Ralston
ffa75ef48c Wire up all the dialog parts for SSO, using device deletion as a POC 2020-03-30 20:03:46 -06:00
Michael Telatynski
63853d9de1 Add download logs button to BugReportDialog
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-03-30 16:12:28 +01:00
Michael Telatynski
8c2b910c03 rework SlashCommands to better expose aliases
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-03-30 13:59:08 +01:00
Michael Telatynski
19aae087e0 Field: make id optional, generate one if not provided
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-03-29 22:59:15 +01:00
Bruno Windels
44ce5b5764
Merge pull request #4267 from matrix-org/bwindels/setupcrosssigningafterskip
Fix: make self-verification wait for incoming request
2020-03-26 10:08:15 +00:00
Zoe
936a4a0022 lint 2020-03-25 11:47:07 +00:00
Zoe
8b2ae3e20f If cached keys are present in the key backup dialog, use them 2020-03-25 11:41:59 +00:00
Bruno Windels
3e59127d12 use SetupEncryptionBody to show a dialog from "Verify this session" 2020-03-24 16:39:43 +01:00
David Baker
96ec18a662
Merge pull request #4242 from matrix-org/dbkr/symmetric-ssss-migrate
Migration to symmetric SSSS
2020-03-24 13:12:24 +00:00
Michael Telatynski
1469690835 Fix logout when Olm failed to load.
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-03-23 14:48:55 +00:00
Bruno Windels
39bd1da1d0 update copy 2020-03-20 15:43:05 +01:00
Bruno Windels
1620f2159b add 2020 foundation copyright 2020-03-20 15:36:58 +01:00
Bruno Windels
b97b887305 fix lint 2020-03-20 15:36:58 +01:00
Bruno Windels
510b71b0e5 extract manual device verification out of device verify dialog
as the plan is to remove the latter
2020-03-20 15:36:58 +01:00
David Baker
ea62a13e59 Merge remote-tracking branch 'origin/develop' into dbkr/symmetric-ssss-migrate 2020-03-19 21:14:27 +00:00
David Baker
c8691c73ff Allow key backup restore to get the key backup passphrase
And pass this in as the new callback to bootstrap to get the old
key backup passphrase.
2020-03-19 20:42:16 +00:00
Michael Telatynski
c616107d1c
Merge pull request #4233 from matrix-org/t3chguy/invite_fixes
Invite Dialog fixes
2020-03-19 17:32:30 +00:00
Zoe
d4486a3eeb
Merge pull request #4229 from matrix-org/foldleft/11574-handle-upload-errors
Report to the user when a key signature upload fails
2020-03-19 16:00:18 +00:00
Michael Telatynski
fa6a937896 don't block onFinished as there are other ways to close modal
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-03-19 09:58:49 +00:00
Michael Telatynski
1dc30beb95 disable textarea when busy
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-03-19 09:58:04 +00:00
Michael Telatynski
963c0a7b3f Hide remove target buttons when busy
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-03-18 21:16:41 +00:00
Michael Telatynski
dd9ead0166 Invite dialog: backspace on empty field remove right-most target
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-03-18 21:09:52 +00:00
Michael Telatynski
22c8df9f23 Update DM invite copy
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-03-18 21:08:37 +00:00
Michael Telatynski
d593a76f28 Merge branches 'develop' and 't3chguy/kbd' of github.com:matrix-org/matrix-react-sdk into t3chguy/kbd 2020-03-18 20:41:13 +00:00