sorb/ThreadNet-Web
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 4 Wiki Activity
21,154 Commits 4 Branches 19 Tags
b5914f5c2bb7ee2f44440d78e16d8607ea75d1e9
Commit Graph
6621 Commits
Author SHA1 Message Date
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 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 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 BakerandGitHub 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 RalstonandGitHub 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 RalstonandGitHub 5f2df15987 Merge branch 'develop' into travis/invite-polish 2020-01-24 08:56:18 -07:00
Travis RalstonandGitHub 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
ZoeandGitHub 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
Zoe 75da5b7944 Design pass for room icons 2020-01-24 13:37:47 +00:00
ZoeandGitHub 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
Michael TelatynskiandGitHub 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 WindelsandGitHub 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
ZoeandGitHub 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
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 TelatynskiandGitHub 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 BakerandGitHub 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 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