OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity
21,115 Commits
217 Branches
561 Tags
467 MiB
Commit Graph

21115 Commits (61d0021c8eef4f7d558a596800e7d210510c7cea)

Author SHA1 Message Date
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
Weblate f3a846dfff Merge branch 'origin/develop' into Weblate. 2020-01-23 11:04:58 +00:00
Balázs Meskó 5d8249507c Translated using Weblate (Hungarian) 
Currently translated at 100.0% (2042 of 2042 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
 2020-01-23 11:04:57 +00:00
Kévin C f7ca8a1b84 Translated using Weblate (French) 
Currently translated at 100.0% (2042 of 2042 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
 2020-01-23 11:04:56 +00:00
Jeff Huang 8218962c37 Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (2042 of 2042 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
 2020-01-23 11:04:56 +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
Damir Jelić 5fd121d2af ManageEventIndex: Remove the unused stats. 2020-01-23 11:44:56 +01:00
David Baker c0b7132404 Different copy on done screen if we setup from scratch 2020-01-23 10:18:08 +00:00
Damir Jelić 4627e3b282 EventIndex: Refactor out the addInitialCheckpoints method. 2020-01-23 11:02:44 +01:00
Travis Ralston 65450e893c Try and fix e2e tests for new invite dialog 2020-01-22 22:40:02 -07:00
Travis Ralston 3541ef2889 Merge branch 'travis/user-lists-suggestions' into travis/user-lists-labs 2020-01-22 22:38:25 -07:00