mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web.git synced 2024-12-16 15:42:01 +03:00
Code Issues Projects Releases Packages Wiki Activity
21537 commits 219 branches 562 tags 474 MiB
Commit graph

39 commits

Author SHA1 Message Date
Zoe
e1608509d0 Disable 'start' button after clicking in VerificationPanel 2020-02-12 13:53:16 +00:00
Bruno Windels
1d39aa6a81
Merge pull request #4049 from matrix-org/bwindels/verifybuttonsdisable 
Disable verification buttons after clicking to avoid double submission
 2020-02-11 15:35:00 +00:00
Bruno Windels
a693af0c6b fix lint 2020-02-10 16:19:27 +01:00
Bruno Windels
2a8453b939 i18n fixes 2020-02-10 16:19:27 +01:00
Bruno Windels
9059f00b29 move css to correct file 
Move the CSS for the dialog layout used in VerificationPanel to
_VerificationPanel.scss,
and delete the latter as it doesn't have any css of it's own anymore
 2020-02-10 16:19:27 +01:00
Travis Ralston
ea4d97fa73 Hack in a layout option 2020-02-10 16:19:27 +01:00
Bruno Windels
577121e88d disable "verify by emoji" after clicking it 2020-02-07 15:50:51 +01:00
Travis Ralston
724cff6a2e Update QR code rendering to support VerificationRequests 
Makes for building the QR code easier and more common.
 2020-01-30 17:12:44 +00:00
Bruno Windels
ad458722dc evaluate on mount whether we need to call .verify() 
as the request might be in phase started already.
 2020-01-29 17:58:23 +01:00
Michael Telatynski
9457520cc2
Merge pull request #3975 from matrix-org/t3chguy/right_panel_learn_more 
Replace Verify button in UserInfo verification with "Learn more"
 2020-01-29 15:27:46 +00:00
Bruno Windels
44bc0d9fb1 phase is a prop now 2020-01-29 15:45:36 +01:00
Bruno Windels
59dc3cfb97 update immediately, don't wait until verification is done 
this can deadlock, as you can't finish the verification without the UI
 2020-01-29 15:27:55 +01:00
Michael Telatynski
19e7c768b6 Replace Verify button in UserInfo verification with "Learn more" 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-01-29 14:11:50 +00:00
Michael Telatynski
37e568448d delint 2020-01-29 08:08:52 +00:00
Michael Telatynski
0bb423fd5a Add console log on unhandled error to track down rageshake 2020-01-29 08:00:32 +00:00
Michael Telatynski
3d47e25955 improve PropTypes for better rageshakes 2020-01-29 07:53:45 +00:00
Michael Telatynski
58df4127d3 Update propTypes and remove todo 2020-01-28 17:14:48 +00:00
Michael Telatynski
657457c14b Apply remainder of ux 2020-01-28 11:13:09 +00:00
Michael Telatynski
db1d3c091e Error handle the no QR verif case better 2020-01-27 17:21:31 +00:00
Michael Telatynski
ca5d4d88a2 Style the QR code 2020-01-27 17:17:05 +00:00
Michael Telatynski
50b491d7e5 post merge fix 2020-01-27 15:48:19 +00:00
Michael Telatynski
b67256c7c2 post-merge fix 2020-01-24 16:41:43 +00: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
b7e680ba51 Fix key ID 2020-01-23 20:14:27 -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
Bruno Windels
a73b7229a7 fix lint 2020-01-17 16:31:38 +01:00
Bruno Windels
d20db3560a fix import paths after build system refactor 2020-01-17 15:50:27 +01:00
Travis Ralston
d1fcef1211 Merge branch 'develop' into bwindels/verification-right-panel 2020-01-16 13:23:32 -07:00
Bruno Windels
7a88a94936 fixes! 2020-01-03 13:50:13 +01:00
Bruno Windels
de1c3e2f83 use same style as UserInfo for sections and paragraphs 2020-01-03 13:50:13 +01:00
Bruno Windels
2dd1e93d84 show message after clicking "they match" 2020-01-03 13:50:13 +01:00
Bruno Windels
b866c16071 show cancellation 2020-01-03 13:47:38 +01:00
Bruno Windels
db17321777 await verify so errors (like cancellation) are caught 2020-01-03 13:47:38 +01:00
Bruno Windels
2c28fa0568 use verif in right panel from "verify" button 2020-01-03 13:47:38 +01:00
Bruno Windels
0f415038be actually start verify process in verification panel 
temporary code, as ux is not complete
 2020-01-03 13:42:18 +01:00
Bruno Windels
c02fc44d25 WIP sas in right panel 2020-01-03 13:42:17 +01:00