Michael Telatynski
50b491d7e5
post merge fix
2020-01-27 15:48:19 +00:00
Michael Telatynski
ddb0f06005
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
2020-01-27 15:46:38 +00:00
Half-Shot
4d83288f4e
linting
2020-01-27 14:42:46 +00:00
Half-Shot
c0d1298c4f
Factor out into BridgeTile
2020-01-27 14:05:22 +00:00
Zoe
e224150190
detail pass on DMs
2020-01-27 12:17:12 +00:00
David Baker
1ab91d1d74
Merge pull request #3943 from matrix-org/dbkr/kill_lingering_verification_toast
...
Stop rogue verification toast if you verify during login
2020-01-27 11:17:55 +00:00
David Baker
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
David Baker
11de92b9a9
hopefully informative comment
2020-01-27 11:07:55 +00:00
David Baker
d5ac37a4ab
Merge pull request #3940 from matrix-org/dbkr/e2e_upgrade_toast
...
Verification nag toasts
2020-01-27 10:16:18 +00:00
David Baker
086e43e584
comments ftw
2020-01-25 21:30:42 +00:00
David Baker
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
David Baker
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
David Baker
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
David Baker
437b45f8a6
Remember password for e2e bootstrapping
...
Fixes https://github.com/vector-im/riot-web/issues/12046
2020-01-25 15:28:06 +00:00
David Baker
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
J. Ryan Stinnett
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
David Baker
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
Travis Ralston
540a7f5c02
less duplication
2020-01-24 09:41:47 -07:00
Michael Telatynski
b67256c7c2
post-merge fix
2020-01-24 16:41:43 +00:00
Travis Ralston
91d59556db
Also check for our own key ID
2020-01-24 09:37:12 -07:00
Travis Ralston
f8e0dcf264
Add null check for cross-signing info in verification panel
2020-01-24 09:33:55 -07:00
Michael Telatynski
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
Michael Telatynski
7a5e172b88
Apply a huge part of the decorations and copy
2020-01-24 16:16:46 +00:00
Travis Ralston
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
Travis Ralston
5f2df15987
Merge branch 'develop' into travis/invite-polish
2020-01-24 08:56:18 -07:00
Travis Ralston
eb2402609a
Merge pull request #3871 from matrix-org/travis/qr-verif-rp
...
QR code verification
2020-01-24 08:55:40 -07:00
Damir Jelić
5d3b916a89
DialogButtons: Allow setting the cancel button class with a prop.
2020-01-24 16:46:46 +01:00
Damir Jelić
cd225943ea
EventIndexPanel: Shorten a overly long line.
2020-01-24 16:22:09 +01:00
Damir Jelić
ddea7415c7
EventIndexPanel: Use formatCountLong to format the event and room counts.
2020-01-24 16:15:06 +01:00
Damir Jelić
47999c2e46
EventIndexPanel: Add a separate message for the case where Seshat is missing.
2020-01-24 15:26:54 +01:00
Zoe
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
Damir Jelić
cbfde4d78f
Merge branch 'poljar/seshat-filepanel' into develop
2020-01-24 14:44:24 +01:00
Zoe
75da5b7944
Design pass for room icons
2020-01-24 13:37:47 +00:00
Zoe
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
Damir Jelić
3534cd4202
FilePanel: Add comments to explain what's going on with the event index.
2020-01-24 14:23:43 +01:00
Michael Telatynski
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
Zoe
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
Michael Telatynski
210616c737
Phase 1, split out UserInfo into a generic Pane, use for EncInfo
2020-01-24 11:45:39 +00:00
Bruno Windels
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
Zoe
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
Bruno Windels
6cce65a2a5
fix lint
2020-01-24 12:08:47 +01:00
Zoe
395c82b1e5
Update src/components/structures/RoomView.js
...
Co-Authored-By: J. Ryan Stinnett <jryans@gmail.com>
2020-01-24 11:04:40 +00:00
Bruno Windels
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
Bruno Windels
2483337e89
don't use removed .event property anymore on verification request
2020-01-24 11:59:01 +01:00
Damir Jelić
029369a04b
EventIndexPanel: Small style fix.
2020-01-24 11:56:43 +01:00
Damir Jelić
ffe5d411db
EventIndexPanel: Add a link to the download page of Riot Desktop.
2020-01-24 11:44:56 +01:00
Michael Telatynski
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
Damir Jelić
660240e2c0
EventIndexPanel: Use formatCount to format the room count.
2020-01-24 11:13:09 +01:00
Michael Telatynski
b72ab57e1b
add <Tooltip/> to <E2EIcon/>
2020-01-24 10:13:03 +00:00
David Baker
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
David Baker
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
David Baker
99252e08b0
Unintentional commit
2020-01-24 09:37:43 +00:00
David Baker
cd4e75c378
Unnecessary blank line
2020-01-24 09:36:22 +00:00
Damir Jelić
93facca479
ManageEventIndex: Rename the file to contain the Dialog suffix.
2020-01-24 09:54:46 +01:00
Travis Ralston
12fa94106e
Actually add the secret to the QR code url
2020-01-23 20:19:17 -07:00
Travis Ralston
b7e680ba51
Fix key ID
2020-01-23 20:14:27 -07:00
Travis Ralston
0ce9da5d36
Appease the linter
2020-01-23 20:12:24 -07:00
Travis Ralston
ebcc4d573b
Add trace logging to figure out which component is causing weird events
...
For https://github.com/vector-im/riot-web/issues/11120
2020-01-23 20:10:31 -07:00
Travis Ralston
b682e7d908
Generate a QR code for apps to scan
2020-01-23 20:05:32 -07:00
Travis Ralston
586a240e41
Don't use private keys for QR code
2020-01-23 19:29:54 -07:00
Travis Ralston
1ec746c014
Add verification with QR codes
2020-01-23 19:29:54 -07:00
Travis Ralston
32f9a4e623
Add some debugging around the recently DM'd users
...
The suggestions are relatively stable, but the recents have some issues. Adding logging to the suggestions would also destroy the console log with thousands of messages whereas recents aren't too bad.
2020-01-23 17:35:36 -07:00
Travis Ralston
442ab9f301
Clear the filter when a suggestion is accepted/added
2020-01-23 17:27:37 -07:00
Travis Ralston
b5f22001b1
Fix copy
2020-01-23 17:22:39 -07:00
Travis Ralston
1394331133
Fix booleans
2020-01-23 16:33:33 -07:00
Travis Ralston
c22bfa84b7
Hide password section if you can't change your password
...
Fixes https://github.com/vector-im/riot-web/issues/11950
2020-01-23 16:29:55 -07:00
Travis Ralston
915c4efeac
Ensure a plaintext version of the composer ends up on the clipboard
...
Fixes https://github.com/vector-im/riot-web/issues/12018
2020-01-23 15:53:32 -07:00
Travis Ralston
6be0cb92ff
Merge pull request #3907 from matrix-org/travis/user-lists-suggestions
...
Try to populate user IDs even when the server's directory fails us
2020-01-23 14:49:27 -07:00
David Baker
74b678d0ff
Only say the session is verified if it is now verified
2020-01-23 19:19:12 +00:00
David Baker
a3026277c1
Unused variable
2020-01-23 18:24:03 +00:00
David Baker
5319ee4572
Remove riot logo from the security setup screens
...
With a little faff to make the rounded borders consistent again
2020-01-23 18:14:08 +00:00
Bruno Windels
ce32c12303
Merge pull request #3912 from matrix-org/bwindels/verifyowndevicechecks
...
Remove .event property on verification request
2020-01-23 17:02:00 +00:00
Michael Telatynski
661b2415d6
Merge pull request #3911 from matrix-org/t3chguy/a11y_tweak
...
Attempt to fix Safari + VoiceOver misunderstanding the timeline list
2020-01-23 16:27:58 +00:00
J. Ryan Stinnett
e3027d3086
Merge pull request #3913 from matrix-org/jryans/negotiate-e2e-dms
...
Enable encryption in DMs with device keys
2020-01-23 16:23:59 +00:00
Michael Telatynski
237a0ed071
Make the entire User Info scrollable, sticky close button
2020-01-23 16:09:32 +00:00
Travis Ralston
a566c74e39
Merge pull request #3905 from matrix-org/travis/user-lists-final
...
Fix scrollable area and padding in user lists dialog
2020-01-23 09:04:40 -07:00
J. Ryan Stinnett
1e25b32ba3
Enable encryption in DMs with device keys
...
When the cross-signing lab is enabled, this changes DMs to use encryption as
long as all invited users have uploaded device keys (which we're using as a
proxy for "has some client that understands E2E").
Fixes https://github.com/vector-im/riot-web/issues/12005
2020-01-23 16:03:42 +00:00
Bruno Windels
8a523fbb59
remove this log line, so we can remove the .event property
...
this is likely the error Dave hit last week, because there was
no .request event set yet for some other reasons that have
been fixed already (the event being put in the wrong map, theirs
instead of us) in the VerificationRequest object.
2020-01-23 15:53:54 +01:00
Michael Telatynski
604e244265
Attempt to fix Safari + VoiceOver misunderstanding the timeline list
2020-01-23 14:53:41 +00:00
Michael Telatynski
662b34c8db
Update MessageComposer placeholder and e2e icon size
2020-01-23 14:38:39 +00:00
Michael Telatynski
74b08ea489
Clean up E2EIcon for better maintainability
2020-01-23 14:38:17 +00:00
Damir Jelić
a5a149933a
EventIndexPanel: Add a spinner when the index is being enabled.
2020-01-23 15:06:38 +01:00
J. Ryan Stinnett
c25c1878b8
Move control of room initial state into createRoom
...
This changes `createRoom` so it has more control of the room's initial state,
and appends state for different features, rather resetting the entire state
array. This makes room for also controlling encryption state in the next change.
2020-01-23 13:54:43 +00:00
Damir Jelić
981acec0d2
EventIndexPanel: Show the enable button if event indexing is disabled.
2020-01-23 14:27:46 +01:00
Michael Telatynski
78e1d1674f
reactor E2EIcon for reusability
2020-01-23 13:00:17 +00:00
Damir Jelić
4aa0658ac8
SecurityUserSettingsTab: Put the event index settings behind the feature flag.
2020-01-23 13:33:09 +01:00
Michael Telatynski
1747a62118
add missing awaits
2020-01-23 11:55:08 +00:00
Michael Telatynski
873952a83e
delint
2020-01-23 11:51:31 +00:00
Michael Telatynski
6c3ac2d0c4
Add Reject & Ignore user button to invites view
2020-01-23 11:50:59 +00:00
Zoe
a409b9b96f
whoops, left some printfs
2020-01-23 11:14:01 +00:00
Zoe
ee33c7cd62
lint
2020-01-23 11:10:39 +00:00
David Baker
442b8be459
Merge pull request #3897 from matrix-org/dbkr/bootstrap_from_key_backup_ui
...
Implement some parts of new cross signing bootstrap UI
2020-01-23 11:04:49 +00:00
Zoe
d68db74efe
Room list reflects encryption state
2020-01-23 10:46:05 +00:00
Travis Ralston
e41f94bdb7
Try to populate user IDs even when the server's directory fails us
...
Fixes https://github.com/vector-im/riot-web/issues/11943
2020-01-22 22:33:50 -07:00
Travis Ralston
054ebb9458
Fix scrollable area and padding in user lists dialog
2020-01-22 21:07:29 -07:00
J. Ryan Stinnett
1fdd155dd2
Merge pull request #3904 from matrix-org/jryans/report-admin-external-links
...
Treat links as external in report content admin message
2020-01-23 01:06:42 +00:00
J. Ryan Stinnett
a504faa2f6
Treat links as external in report content admin message
...
This marks all the links in the report content admin message (in Markdown
format) as external so they open in a new tab.
2020-01-22 22:08:37 +00:00
Michael Telatynski
b7d1c17ad1
simple optimization to bail out of check on first failure
2020-01-22 16:56:27 +00:00
Michael Telatynski
9706114bb5
move E2E_STATE to E2EIcon to simplify imports
2020-01-22 16:54:31 +00:00
Michael Telatynski
33b5d42c06
Be consistent about our settings svg, free the other one
2020-01-22 15:34:17 +00:00
Damir Jelić
c3418df919
FilePanel: Remove whitespace before two function definitions.
2020-01-22 16:31:49 +01:00
Damir Jelić
c5e8753b05
FilePanel: Don't import the whole of the js-sdk.
2020-01-22 16:26:40 +01:00
Damir Jelić
f917c2faea
FilePanel: Listen for live events and add them to an open FilePanel.
2020-01-22 16:21:11 +01:00
David Baker
7e52eb9f65
Unused import
2020-01-22 15:16:41 +00:00
Damir Jelić
735ba4fd33
EventIndex: Correctly populate events on initial fill requests.
2020-01-22 16:11:54 +01:00
David Baker
e3a28e3e44
Remove the react-sdk version
...
I'm not sure if there was ever a point where this did work and
we had 'dist' and 'gitHead' properties in our package.json but
I can't find any trace of them now and I'm sick of this just being
there syaing '<local>' all the time.
2020-01-22 15:05:25 +00:00
Michael Telatynski
97edb824bc
Merge pull request #3893 from matrix-org/t3chguy/double_slash
...
Slash Command improvements around sending messages with leading slash
2020-01-22 14:32:09 +00:00
Michael Telatynski
516dd25797
fix typo in fallback codepath
2020-01-22 14:24:10 +00:00
J. Ryan Stinnett
fbb65f068a
Support admin configurable message when reporting content
...
This adds support for an admin-configured message in config.json to be shown in
the report content dialog to allow linking to community rules, etc.
Fixes https://github.com/vector-im/riot-web/issues/11992
2020-01-22 14:07:18 +00:00
Michael Telatynski
e1e53f567f
add more tests
2020-01-22 11:56:27 +00:00
David Baker
e98269822c
Add icon to bootstrap dialogs
2020-01-22 11:44:47 +00:00
Zoe
684974372d
Merge pull request #3896 from matrix-org/zip/11986-only-warn-unverified
...
Don't warn on unverified users; ensured behavior stays the same with flags off
2020-01-22 11:44:14 +00:00
Michael Telatynski
2a331c0a2b
Merge pull request #3895 from matrix-org/t3chguy/roving
...
Fix roving room list for resizer and ff tabstop a11y
2020-01-22 11:24:23 +00:00
Zoe
85ee6bd51f
Don't warn on unverified users; ensured behavior stays the same with flags off
2020-01-22 11:22:20 +00:00
David Baker
d211372740
UI to bootsrap SSSS from key backup
2020-01-22 10:44:02 +00:00
Michael Telatynski
2c6fe78012
Fix roving room list for resizer and ff tabstop a11y
2020-01-22 10:36:20 +00:00
Half-Shot
b2fc4a1c4d
Style bridge settings tab according to design
...
Signed-off-by: Half-Shot <will@half-shot.uk>
2020-01-21 18:41:43 +00:00
Zoe
0809d7dcba
Merge pull request #3875 from matrix-org/zip/11880-message-shields
...
Verify individual messages via cross-signing
2020-01-21 18:11:36 +00:00
Michael Telatynski
7b26067397
delint
2020-01-21 18:03:01 +00:00
Michael Telatynski
e455aa474d
improve copy further
2020-01-21 17:58:53 +00:00
Michael Telatynski
a8df058ea6
tidy up, improve wording on modal
2020-01-21 17:54:27 +00:00
Michael Telatynski
587ff6ad75
Merge pull request #3844 from matrix-org/t3chguy/roving
...
Implement Roving Tab Index and Room List as TreeView
2020-01-21 17:36:30 +00:00
Zoe
2480f709b3
E2ESTATE -> E2E_STATE
2020-01-21 17:19:10 +00:00
Michael Telatynski
9f7df33bc3
re-arrange to split the async task into two and only wait on the user-blocking one
2020-01-21 16:57:07 +00:00
Zoe
ec714283ca
Merge pull request #3888 from matrix-org/zip/11833-overlay-shields
...
Move room header shields over the avatar for the room
2020-01-21 16:56:09 +00:00
Michael Telatynski
b34fe45518
First attempt. Has a lag issue due to the async-clear :(
2020-01-21 16:50:04 +00:00
Michael Telatynski
060938379a
Fix changes after typing / at pos=0 allowing to cancel command
2020-01-21 15:58:51 +00:00
Michael Telatynski
b5e902e1f2
Fix escaping commands using double-slash //, e.g //plain sends /plain
2020-01-21 15:55:21 +00:00
Damir Jelić
a2892f5b02
EventIndex: Fix some lint issues.
2020-01-21 16:40:32 +01:00
J. Ryan Stinnett
9c0cf326c1
Only show devices and verify actions in E2EE rooms
...
This changes logic to only show the devices list and verify button in E2EE
rooms, matching the design.
Fixes https://github.com/vector-im/riot-web/issues/11839
2020-01-21 15:13:03 +00:00
J. Ryan Stinnett
224528afd4
Merge pull request #3887 from matrix-org/jryans/user-verif-mismatch
...
Change user info verification checks to use cross-signing
2020-01-21 13:44:22 +00:00
Zoe
c8a2f6a5a0
Move room header shields over the avatar for the room
...
Currently this is calibrated like the lil' DM icon is
2020-01-21 13:33:16 +00:00
Michael Telatynski
ddfed32ea9
Merge pull request #3886 from matrix-org/t3chguy/insert_mention_colon
...
Fix click-to-ping not inserting colon if composer non-empty
2020-01-21 13:15:38 +00:00
Damir Jelić
8e26268079
SecurityUserSettingsTab: Rename encrypted search section.
2020-01-21 13:38:20 +01:00
Damir Jelić
6b85284632
EventIndexPanel: Move the bulk of the event index info into a modal.
2020-01-21 13:20:30 +01:00
J. Ryan Stinnett
b3d56b378e
Use cross-signing verification only for own devices
...
The device verification checks are slightly more nuanced: we want to use
stricter cross-signing checks for your own devices to encourage everyone to
trust their devices via cross-signing so that other users can in turn trust
them.
However, for other users, it's okay to use the looser verification check that
also includes locally verified devices.
2020-01-21 12:03:52 +00:00
Michael Telatynski
f56a9d246f
Fix index for _insertMention
2020-01-21 11:13:08 +00:00
Michael Telatynski
adec308529
Merge pull request #3884 from matrix-org/t3chguy/emoji_space_complete
...
Fix emoticon space completion for upper case emoticons like :D xD
2020-01-21 11:01:40 +00:00
J. Ryan Stinnett
8a00ff7f1f
Change all user info verification checks to cross-signing
...
This fixes some user vs. device verification confusion in user info by changing
all the verification tests to the cross-signing variant when the lab is enabled.
Fixes https://github.com/vector-im/riot-web/issues/11886
2020-01-21 11:00:40 +00:00
J. Ryan Stinnett
ff8ee5cc7d
Merge pull request #3880 from matrix-org/jryans/repair-cs-panel
...
Repair cross-signing panel with async status
2020-01-21 10:56:13 +00:00
Michael Telatynski
26bba4416b
Fix emoticon space completion for upper case emoticons like :D xD
2020-01-21 10:12:23 +00:00
Zoe
d34f1e52ad
constants for e2estates
2020-01-21 10:08:53 +00:00
Damir Jelić
908a00a13d
EventIndexPanel: Move the panel from the preferences to the security tab.
2020-01-21 10:06:04 +01:00
Damir Jelić
4913d579e3
EventIndexPanel: Reword the crawler state if no room is being crawled.
2020-01-21 09:24:20 +01:00
Michael Telatynski
397e116efb
Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into t3chguy/roving
2020-01-20 20:48:11 +00:00
J. Ryan Stinnett
5a67bd4b46
Repair cross-signing panel with async status
...
This repairs the cross-signing panel after recent changes that made the panel's
status an async function.
Regressed by https://github.com/matrix-org/matrix-react-sdk/pull/3864
Fixes https://github.com/vector-im/riot-web/issues/11952
2020-01-20 20:35:25 +00:00
Michael Telatynski
0bcfe5819f
Integrate handleHomeEnd
2020-01-20 20:31:36 +00:00
J. Ryan Stinnett
e947a68e13
Remove temporary key backup button
...
This removes the temporary extra key backup setup button in Settings used for
testing with and without cross-signing. With this change, there's only one
button and the path you take is determined by the labs flag.
Fixes https://github.com/vector-im/riot-web/issues/11890
2020-01-20 20:21:03 +00:00
Travis Ralston
7193e7dcb0
Merge pull request #3866 from matrix-org/travis/ftue/user-lists/7-suggestions
...
Score users who have recently spoken higher in invite suggestions
2020-01-20 10:53:18 -07:00
Bruno Windels
95a0ebaf06
Merge pull request #3796 from matrix-org/bwindels/verification-right-panel
...
Initial support for verification in right panel
2020-01-20 17:18:32 +00:00