Commit graph

21076 commits

Author SHA1 Message Date
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
Weblate
041dfe265e Merge branch 'origin/develop' into Weblate. 2020-01-23 17:02:06 +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
Weblate
0190d785ba Merge branch 'origin/develop' into Weblate. 2020-01-23 16:28:04 +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
Weblate
f071f05c01 Merge branch 'origin/develop' into Weblate. 2020-01-23 16:24:04 +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
Weblate
407f144247 Merge branch 'origin/develop' into Weblate. 2020-01-23 16:04:46 +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
Weblate
cbe8190f15 Merge branch 'origin/develop' into Weblate. 2020-01-23 14:59:26 +00:00
Michael Telatynski
26aa4bb4f3
Merge pull request #3909 from matrix-org/t3chguy/invite_reject_ignore
Add Reject & Ignore user button to invites view
2020-01-23 14:59:19 +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
Zoe
e9dccd1460 moving icons exactly one pixel to the right and one pixel down 2020-01-23 14:44:57 +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ć
e2a4a08b25 Update the translation file. 2020-01-23 15:32:43 +01:00
Damir Jelić
381fe95f67 EventIndex: Fix some lint errors. 2020-01-23 15:22:26 +01:00
Damir Jelić
a5a149933a EventIndexPanel: Add a spinner when the index is being enabled. 2020-01-23 15:06:38 +01:00
Damir Jelić
251661388a ManageEventIndex: Set the button kind to danger. 2020-01-23 15:06:10 +01:00
Damir Jelić
3073ce5588 DisableEventIndex: Set the correct button kind and add a spinner. 2020-01-23 15:05:40 +01:00
J. Ryan Stinnett
2b16b650fe Add encryption option to createRoom 2020-01-23 14:05:38 +00: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
Weblate
e4ce5c41cc Merge branch 'origin/develop' into Weblate. 2020-01-23 13:31:18 +00:00
Michael Telatynski
d7a4698db8
Merge pull request #3891 from matrix-org/t3chguy/fix_multi_paragraph_formatting
Fix paragraph-awareness of the composer formatting features
2020-01-23 13:31:12 +00:00
Damir Jelić
981acec0d2 EventIndexPanel: Show the enable button if event indexing is disabled. 2020-01-23 14:27:46 +01:00
Damir Jelić
5ac37c8694 ManageEventIndex: Remove the enable button, that one goes somewhere else. 2020-01-23 14:26:35 +01:00
Damir Jelić
c251031dfb DisableEventIndex: Return back to the user settings after disabling. 2020-01-23 14:25:47 +01:00
Michael Telatynski
78e1d1674f reactor E2EIcon for reusability 2020-01-23 13:00:17 +00:00
Damir Jelić
64c4ad2eb9 ManageEventIndex: Hook up the disable event index button. 2020-01-23 13:33:55 +01:00
Damir Jelić
4aa0658ac8 SecurityUserSettingsTab: Put the event index settings behind the feature flag. 2020-01-23 13:33:09 +01:00
Damir Jelić
947ea9823d Settings: Remove the crawler sleep time setting. 2020-01-23 13:32:27 +01:00
Michael Telatynski
30bfd4046d improve spacing of buttons on RoomPreviewBar 2020-01-23 12:27:25 +00:00
Michael Telatynski
1747a62118 add missing awaits 2020-01-23 11:55:08 +00:00
Weblate
7396430c46 Merge branch 'origin/develop' into Weblate. 2020-01-23 11:51:37 +00:00
David Baker
8d59cb4632
Merge pull request #3903 from matrix-org/dbkr/bootstrap_visuals_1
Updated visuals for cross-signing bootstrap
2020-01-23 11:51:32 +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
Damir Jelić
4953f32cba ManageEventIndex: Rename the enable crawler setting. 2020-01-23 12:26:26 +01:00
Damir Jelić
9bee024da7 ManageEventIndex: Remove some useless divs and add the enable case. 2020-01-23 12:24:06 +01:00
Damir Jelić
0d545ed335 EventIndexPeg: Small refactor and change the init logic.
This changes the way the event index is initialized, if it's disabled in
the settings it will not be initialized at all, before only the crawler
loop was not being started.
2020-01-23 12:23:23 +01:00
Michael Telatynski
13bb719a89 Add comment for operations loop 2020-01-23 11:22:22 +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
10db79bb93 Merge remote-tracking branch 'origin/develop' into dbkr/bootstrap_visuals_1 2020-01-23 11:05:21 +00:00