6737523b1c
Merge pull request #3942 from matrix-org/dbkr/show_incoming_verifications_in_complete_security
...
Show incoming verification requests in the 'complete security' phase
2020-01-27 11:17:16 +00:00
11de92b9a9
hopefully informative comment
2020-01-27 11:07:55 +00:00
d5ac37a4ab
Merge pull request #3940 from matrix-org/dbkr/e2e_upgrade_toast
...
Verification nag toasts
2020-01-27 10:16:18 +00:00
086e43e584
comments ftw
2020-01-25 21:30:42 +00:00
f851f976e7
Stop rogue verification toast if you verify during login
...
Fixes https://github.com/vector-im/riot-web/issues/12057
2020-01-25 21:26:43 +00:00
9e38c62791
Show incoming verification requests in the 'complete security' phase
...
If you click to verify your new sign in on another device, actually
show the verification request on the 'complete security' screen.
2020-01-25 20:42:45 +00:00
8c5fd5c77e
Verification nag toasts
...
Implement the three differenty cases for this session, and also fix
ones for other sessions which had the wrong copy.
Fixes https://github.com/vector-im/riot-web/issues/11220
2020-01-25 16:52:12 +00:00
437b45f8a6
Remember password for e2e bootstrapping
...
Fixes https://github.com/vector-im/riot-web/issues/12046
2020-01-25 15:28:06 +00:00
988ae14d35
Merge pull request #3937 from matrix-org/dbkr/e2esetup
...
Setup flow for cross-signing on login / registration
2020-01-25 12:40:17 +00:00
9991a544aa
Resolve default export warnings from Webpack
...
Webpack was printing several warnings about missing default exports,
particularly from components, where we auto-generate a default import via the
component index.
As part of this, the emoji picker recent handling (which is not a component) is
moved elsewhere to avoid the generated import.
2020-01-24 22:26:34 +00:00
3d7137d4ad
Setup flow for cross-signing on login / registration
...
Still outstanding:
* Keep password from login / registration
* Confirmation on skip button
Fixes https://github.com/vector-im/riot-web/issues/11902
2020-01-24 19:11:57 +00:00
540a7f5c02
less duplication
2020-01-24 09:41:47 -07:00
b67256c7c2
post-merge fix
2020-01-24 16:41:43 +00:00
91d59556db
Also check for our own key ID
2020-01-24 09:37:12 -07:00
f8e0dcf264
Add null check for cross-signing info in verification panel
2020-01-24 09:33:55 -07:00
342fcb09c4
Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into t3chguy/cs_verification_decoration
...
Conflicts:
src/components/views/right_panel/VerificationPanel.js
src/components/views/toasts/VerificationRequestToast.js
2020-01-24 16:19:41 +00:00
7a5e172b88
Apply a huge part of the decorations and copy
2020-01-24 16:16:46 +00:00
169ca4a4da
Merge pull request #3926 from matrix-org/travis/event-tile-trace
...
Add trace logging to figure out which component is causing weird events
2020-01-24 08:57:43 -07:00
5f2df15987
Merge branch 'develop' into travis/invite-polish
2020-01-24 08:56:18 -07:00
eb2402609a
Merge pull request #3871 from matrix-org/travis/qr-verif-rp
...
QR code verification
2020-01-24 08:55:40 -07:00
5d3b916a89
DialogButtons: Allow setting the cancel button class with a prop.
2020-01-24 16:46:46 +01:00
cd225943ea
EventIndexPanel: Shorten a overly long line.
2020-01-24 16:22:09 +01:00
ddea7415c7
EventIndexPanel: Use formatCountLong to format the event and room counts.
2020-01-24 16:15:06 +01:00
47999c2e46
EventIndexPanel: Add a separate message for the case where Seshat is missing.
2020-01-24 15:26:54 +01:00
543be90eda
Merge pull request #3931 from matrix-org/foldleft/12035-room-decoration-design-pass
...
Design pass for room icons
2020-01-24 13:54:51 +00:00
cbfde4d78f
Merge branch 'poljar/seshat-filepanel' into develop
2020-01-24 14:44:24 +01:00
75da5b7944
Design pass for room icons
2020-01-24 13:37:47 +00:00
131aacd3ab
Merge pull request #3929 from matrix-org/zip/11840-tooltips-on-padlocks
...
Seperates out the padlock icon, and adds a tooltip
2020-01-24 13:26:59 +00:00
3534cd4202
FilePanel: Add comments to explain what's going on with the event index.
2020-01-24 14:23:43 +01:00
2c40b73ff6
Merge pull request #3910 from matrix-org/t3chguy/cross-signing-composer
...
Cross Signing redesign for composer
2020-01-24 13:18:09 +00:00
a6fcbcacf6
Seperates out the padlock icon, and adds a tooltip
...
Fixes https://github.com/vector-im/riot-web/issues/11840
2020-01-24 12:06:21 +00:00
210616c737
Phase 1, split out UserInfo into a generic Pane, use for EncInfo
2020-01-24 11:45:39 +00:00
b66154330c
Merge pull request #3927 from matrix-org/bwindels/fixverifyowndevice
...
Fix verifying your own devices with to_device messages
2020-01-24 11:24:33 +00:00
1d686fe49e
Merge pull request #3908 from matrix-org/zip/11935-room-list-decoration
...
Room list reflects encryption state
2020-01-24 11:14:53 +00:00
6cce65a2a5
fix lint
2020-01-24 12:08:47 +01:00
395c82b1e5
Update src/components/structures/RoomView.js
...
Co-Authored-By: J. Ryan Stinnett <jryans@gmail.com >
2020-01-24 11:04:40 +00:00
512bd4b0b2
show to_device verification in dialog, not right panel
...
this also makes it work again, as the VerificationPanel doens't
know how to deal with requests that are already in PHASE_STARTED,
which was breaking verifying your own devices.
2020-01-24 11:59:17 +01:00
2483337e89
don't use removed .event property anymore on verification request
2020-01-24 11:59:01 +01:00
029369a04b
EventIndexPanel: Small style fix.
2020-01-24 11:56:43 +01:00
ffe5d411db
EventIndexPanel: Add a link to the download page of Riot Desktop.
2020-01-24 11:44:56 +01:00
0078c2f099
Merge pull request #3914 from matrix-org/t3chguy/userinfo_scroll
...
Make the entire User Info scrollable, sticky close button
2020-01-24 10:22:17 +00:00
660240e2c0
EventIndexPanel: Use formatCount to format the room count.
2020-01-24 11:13:09 +01:00
b72ab57e1b
add <Tooltip/> to <E2EIcon/>
2020-01-24 10:13:03 +00:00
50b05551ba
Merge pull request #3916 from matrix-org/dbkr/security_dialog_noheader
...
Remove riot logo from the security setup screens
2020-01-24 09:50:25 +00:00
81caa12b16
Merge pull request #3917 from matrix-org/dbkr/complete_security_detect_success
...
Only say the session is verified if it is now verified
2020-01-24 09:38:25 +00:00
99252e08b0
Unintentional commit
2020-01-24 09:37:43 +00:00
cd4e75c378
Unnecessary blank line
2020-01-24 09:36:22 +00:00
93facca479
ManageEventIndex: Rename the file to contain the Dialog suffix.
2020-01-24 09:54:46 +01:00
12fa94106e
Actually add the secret to the QR code url
2020-01-23 20:19:17 -07:00
b7e680ba51
Fix key ID
2020-01-23 20:14:27 -07:00
David Baker