21540 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Bruno Windels	3292991491	provide specific label for when accepting/declining is in progress ... also distuingish between cancelling and declining	2020-02-13 17:29:38 +01:00
Bruno Windels	3eb07465f7	use canAccept in tile, which takes local echo into account	2020-02-13 17:29:13 +01:00
Bruno Windels	3ec0301f9d	use canAccept in toast, which takes local echo into account	2020-02-13 17:28:10 +01:00
Bruno Windels	ec708b5e9b	Merge pull request #4058 from matrix-org/bwindels/dontpassmethodstoverify ... remove methods arg to requestVerification(DM)	2020-02-13 08:51:36 +00:00
Travis Ralston	d172e1bf85	Revert "Merge pull request #4060 from matrix-org/travis/better-invite" ... This reverts commit 48860f0a10.	2020-02-12 10:44:27 -07:00
Travis Ralston	b514f89594	Merge pull request #4061 from matrix-org/travis/fix-settings-handling ... Check for null config settings a bit safer	2020-02-12 10:04:26 -07:00
Travis Ralston	48860f0a10	Merge pull request #4060 from matrix-org/travis/better-invite ... Score user ID searches higher when they match nearly exactly	2020-02-12 10:03:33 -07:00
J. Ryan Stinnett	b46af07752	Merge pull request #4051 from TestardR/feature/WhoIsTyping ... Fix uncentered letter inside avatar for currently typing users	2020-02-12 15:36:02 +00:00
Zoe	d1cce3030c	Merge pull request #4065 from matrix-org/foldleft/12335-verification-panel ... Disable 'start' button after clicking in VerificationPanel	2020-02-12 14:10:26 +00:00
Zoe	e1608509d0	Disable 'start' button after clicking in VerificationPanel	2020-02-12 13:53:16 +00:00
Zoe	466d4a3e51	Merge pull request #4057 from matrix-org/foldleft/12221-secret-storage ... Fixed bug where key reset didn't always return the right key	2020-02-12 11:18:32 +00:00
Michael Telatynski	97ab0636d9	Merge pull request #4062 from MarcoZehe/PresentationalAvatars ... Don't render avatars in pills for screen readers.	2020-02-12 10:04:39 +00:00
Marco Zehe	8004a35179	Update to use proper quotes and fix code styling. And fix test. ... Signed-off-by: Marco Zehe <marcozehe@mailbox.org>	2020-02-12 10:54:08 +01:00
Marco Zehe	6fe4eb1fc3	Don't render avatars in pills for screen readers. ... These don't provide any additional information, but add extraneous noise. The link text and title already provide all information. Therefore, mark the avatar inside pills (the mention links inside messages) as hidden. Note that due to the images being part of something focusable, role "presentation" does not work here. Signed-off-by: Marco Zehe <marcozehe@mailbox.org>	2020-02-12 09:36:59 +01:00
Travis Ralston	a05dafc300	Check for null config settings a bit safer ... Fixes https://github.com/vector-im/riot-web/issues/12254	2020-02-12 01:58:21 +00:00
Travis Ralston	9acf70c693	Score user ID searches higher when they match nearly exactly	2020-02-12 01:55:20 +00:00
unknown	078401c58f	I have reverted and used the styling a bit higher in the DOM	2020-02-11 20:06:07 +01:00
Zoe	c8e65bfa65	flip sense of 'force' flag in if statement	2020-02-11 17:56:25 +00:00
Bruno Windels	33f3a61b94	remove unused imports	2020-02-11 18:23:05 +01:00
Bruno Windels	a1844e44f2	remove methods arg to requestVerification(DM) ... as it's easy to have this argument be out of sync from all the places this is called from the js-sdk. There is also little point, as you can already specify the methods a consumer of the js-sdk wants to provide through the verificationMethods option when creating the client object.	2020-02-11 18:22:48 +01:00
Bruno Windels	91c9c00712	Merge pull request #4044 from matrix-org/bwindels/riotx-qr-compat ... Make QR self-verification compatible with RiotX	2020-02-11 17:20:40 +00:00
Zoe	5382a52519	Fixed bug where key reset didn't always return the right key	2020-02-11 15:57:14 +00:00
Bruno Windels	7a026eb15d	Merge pull request #4043 from matrix-org/bwindels/showunverifieddevicedialogonclick ... Verify single device from other user in right panel & Not Trusted dialog	2020-02-11 15:35:24 +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	703f52be33	Merge pull request #4048 from matrix-org/bwindels/toasttuning ... Verification toast fixes	2020-02-11 15:34:26 +00:00
Bruno Windels	5267dbf44a	Update src/components/views/right_panel/UserInfo.js ... Co-Authored-By: J. Ryan Stinnett <jryans@gmail.com>	2020-02-11 15:21:01 +00:00
Bruno Windels	a84e90df51	Merge pull request #4042 from matrix-org/bwindels/encryptionpaneleverywhere ... Use EncryptionPanel everywhere, part I	2020-02-11 15:16:47 +00:00
Zoe	e54d34090a	Merge pull request #4056 from matrix-org/foldleft/12221-temp-remove ... quick fix for cross-signing reset bug	2020-02-11 13:44:02 +00:00
Zoe	cbb0ad6621	god i hate the i18n linter	2020-02-11 13:20:27 +00:00
Zoe	8c36792840	Merge pull request #4055 from matrix-org/foldleft/12288-correct-feedback-order ... Fix error message rendering for key entry	2020-02-11 13:19:18 +00:00
Zoe	627ced3838	quick fix for cross-signing reset bug	2020-02-11 13:17:18 +00:00
Zoe	9a5663056d	lint	2020-02-11 12:06:40 +00:00
Zoe	a677780889	i18n	2020-02-11 12:05:58 +00:00
Zoe	6b6d612041	Fix error message rendering for key entry ... Relates to https://github.com/vector-im/riot-web/issues/12288	2020-02-11 12:02:12 +00:00
Michael Telatynski	67aa241ee5	Merge pull request #4052 from matrix-org/t3chguy/recaptcha_protocol ... Fix recaptcha blocked by CSP for non-SSL origins	2020-02-11 10:18:44 +00:00
Michael Telatynski	36fa6261cf	Merge pull request #4054 from matrix-org/t3chguy/showTypingNotifications ... Fix watcher for showTypingNotifications setting	2020-02-11 10:11:20 +00:00
Michael Telatynski	ee819dfdf8	fix call to SettngsStore.watchSetting, it takes a roomID	2020-02-11 09:32:09 +00:00
Michael Telatynski	f381099f2a	Merge pull request #4053 from matrix-org/t3chguy/server_enter ... Allow custom hs url submission on enter	2020-02-11 09:30:29 +00:00
Bruno Windels	1e94929b88	Merge pull request #4045 from matrix-org/bwindels/qrcodetuning ... Support keepSecretStoragePassphraseForSession at the config level too	2020-02-11 08:19:29 +00:00
Michael Telatynski	f01b4fe241	Allow custom hs url submission on enter	2020-02-10 20:47:27 +00:00
Michael Telatynski	86306e3da3	Recaptcha should always be loaded over https	2020-02-10 20:41:16 +00:00
unknown	3da630beb8	I have removed problematic ligns	2020-02-10 21:38:31 +01:00
Michael Telatynski	b9db0ad013	Merge pull request #4047 from matrix-org/t3chguy/hide_typing_notifs ... Add setting to allow hiding of typing indicator	2020-02-10 18:01:52 +00:00
Zoe	d47d13256f	Merge pull request #4041 from matrix-org/foldleft/12221-reset-cross-signing ... Button to reset cross-signing and SSSS keys	2020-02-10 17:14:05 +00:00
Zoe	2d42505124	and re-run yarn i18n	2020-02-10 17:00:03 +00:00
Zoe	4f4b52d666	Update src/components/views/settings/CrossSigningPanel.js ... Co-Authored-By: J. Ryan Stinnett <jryans@gmail.com>	2020-02-10 16:59:17 +00:00
Bruno Windels	9dde09d36f	cleanup	2020-02-10 17:35:10 +01:00
Travis Ralston	ccde5530d2	Add reciprocate as a method	2020-02-10 17:34:45 +01:00
Travis Ralston	afc38b92a0	Always send scan for RiotX (for now)	2020-02-10 17:33:19 +01:00
Travis Ralston	ea7cb6ba0b	Support keepSecretStoragePassphraseForSession at the config level too	2020-02-10 17:15:08 +01:00