mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web.git synced 2024-12-17 07:32:05 +03:00
Code Issues Projects Releases Packages Wiki Activity
21843 commits 219 branches 562 tags 474 MiB
Commit graph

17486 commits

Author SHA1 Message Date
Travis Ralston
760a472be5 Appease the linter 2020-02-19 17:05:32 -07:00
Travis Ralston
3b6a201d4e Add comments 2020-02-19 17:03:50 -07:00
Travis Ralston
45963adeb4 Use binary packing for verification QR codes 
Fixes https://github.com/vector-im/riot-web/issues/12257
Fixes https://github.com/vector-im/riot-web/issues/12375

We do not remove the existing QR code library in this commit because it is still used elsewhere (like the share dialog). 

This should be as accurate as possible to what [MSC1543](https://github.com/matrix-org/matrix-doc/pull/1544) asks for.
 2020-02-19 17:02:14 -07:00
Weblate
9acd1e7d64 Merge branch 'origin/develop' into Weblate. 2020-02-19 17:41:34 +00:00
Michael Telatynski
12eb408c58
Merge pull request #4073 from matrix-org/t3chguy/a11y_share_msg 
Fix share message context menu option keyboard a11y
 2020-02-19 17:41:28 +00:00
Tentarial
fa39021387 Translated using Weblate (German) 
Currently translated at 75.6% (1608 of 2126 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
 2020-02-19 16:05:00 +00:00
Remi Reuvekamp
df897b4734 Translated using Weblate (Dutch) 
Currently translated at 86.6% (1841 of 2126 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/nl/
 2020-02-19 16:04:57 +00:00
Weblate
b856c2e8d5 Merge branch 'origin/develop' into Weblate. 2020-02-19 14:34:36 +00:00
Tentarial
ca680e56fc Translated using Weblate (German) 
Currently translated at 72.6% (1544 of 2126 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
 2020-02-19 14:34:36 +00:00
Tentarial
46fcb7d348 Translated using Weblate (German) 
Currently translated at 72.6% (1544 of 2126 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
 2020-02-19 14:34:35 +00:00
Bruno Windels
a5b9682572 show spinner while loading local aliases 2020-02-19 15:15:05 +01:00
Weblate
fb7cc02b62 Merge branch 'origin/develop' into Weblate. 2020-02-19 14:04:15 +00:00
Damir Jelić
7f71e551da EventIndex: Split out the statements that check for a valid event type. 2020-02-19 14:50:59 +01:00
Damir Jelić
156c6b8db8 EventIndex: Document the return value of the isValidEvent method. 2020-02-19 14:50:59 +01:00
Damir Jelić
59f8b4f6b1 EventIndex: Don't index key verification events. 
Since cross-signing is a thing key verification events have become part
of the timeline and room history.

Those events are m.room.message events for backwards compatibility, so
clients that don't support key verification in the timeline print out a
fall-back message.
 2020-02-19 14:50:59 +01:00
Weblate
2e1334238c Merge branch 'origin/develop' into Weblate. 2020-02-19 12:53:07 +00:00
Michael Telatynski
b1b17a313e
Merge pull request #4046 from matrix-org/t3chguy/usercontent 
Get rid of dependence on usercontent.riot.im
 2020-02-19 12:53:01 +00:00
Michael Telatynski
4da5f32764 get rid of lockOrigin backwards compatibility 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-02-19 12:44:46 +00:00
Weblate
48787d5f4e Merge branch 'origin/develop' into Weblate. 2020-02-19 10:28:50 +00:00
Bruno Windels
30ae6dbdbb also detect aliases using new /aliases endpoint for room access settings 2020-02-19 11:18:56 +01:00
Weblate
a9fe810bab Merge branch 'origin/develop' into Weblate. 2020-02-19 10:03:00 +00:00
Walter
48ef8e84e6 Translated using Weblate (Russian) 
Currently translated at 80.9% (1719 of 2126 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
 2020-02-19 10:03:00 +00:00
random
ad8255e31a Translated using Weblate (Italian) 
Currently translated at 100.0% (2126 of 2126 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/it/
 2020-02-19 10:02:59 +00:00
Szimszon
6c9d489ef7 Translated using Weblate (Hungarian) 
Currently translated at 100.0% (2126 of 2126 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
 2020-02-19 10:02:58 +00:00
Tentarial
7460ddfada Translated using Weblate (German) 
Currently translated at 71.1% (1512 of 2126 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
 2020-02-19 10:02:58 +00:00
Kévin C
2273b8606b Translated using Weblate (French) 
Currently translated at 100.0% (2126 of 2126 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
 2020-02-19 10:02:56 +00:00
Jeff Huang
d7a6296100 Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (2126 of 2126 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
 2020-02-19 10:02:56 +00:00
Bruno Windels
cb5882d59b add null check 2020-02-19 10:40:00 +01:00
Bruno Windels
4c9c57bfe5 check server feature flag 
if not available, revert to old behavior
 2020-02-19 10:06:52 +01:00
Bruno Windels
e6ca581f10 get local aliases from /aliases in room settings 2020-02-18 16:27:45 +01:00
Michael Telatynski
600cb64d00 don't nest <a> inside <AccessibleButton> 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-02-18 15:04:57 +00:00
Weblate
246a903fe8 Merge branch 'origin/develop' into Weblate. 2020-02-18 13:54:03 +00:00
Miren
27bae86c0c Translated using Weblate (Basque) 
Currently translated at 97.6% (2074 of 2126 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eu/
 2020-02-18 13:54:03 +00:00
Besnik Bleta
01f8a1e01f Translated using Weblate (Albanian) 
Currently translated at 99.7% (2119 of 2126 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sq/
 2020-02-18 13:54:02 +00:00
Zoe
27f65c17b5
Merge pull request #4080 from matrix-org/foldleft/12187-e2e-dm 
Start verification sessions in an E2E DM where possible
 2020-02-18 13:53:56 +00:00
Zoe
0e0aadd3f2 fixed inexplicible scope bug 2020-02-18 11:30:10 +00:00
Zoe
164b355ffe abstract out the check for available target devices 2020-02-18 11:25:19 +00:00
Weblate
f8dc10f820 Merge branch 'origin/develop' into Weblate. 2020-02-18 10:16:07 +00:00
Bruno Windels
1b38827d92
Merge pull request #4077 from matrix-org/bwindels/filterverifmethods 
Only show supported verification methods
 2020-02-18 10:16:01 +00:00
Bruno Windels
46e63fd571 cancel on dialog close 2020-02-18 11:14:16 +01:00
Weblate
4520886cde Merge branch 'origin/develop' into Weblate. 2020-02-18 09:55:44 +00:00
catborise
025d028893 Translated using Weblate (Turkish) 
Currently translated at 71.7% (1521 of 2121 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/tr/
 2020-02-18 09:55:44 +00:00
Walter
0c3d247948 Translated using Weblate (Russian) 
Currently translated at 80.8% (1714 of 2121 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
 2020-02-18 09:55:41 +00:00
Tuomas Hietala
c97bcc39f9 Translated using Weblate (Finnish) 
Currently translated at 89.5% (1899 of 2121 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fi/
 2020-02-18 09:55:40 +00:00
Remi Reuvekamp
20a8fc1620 Translated using Weblate (Dutch) 
Currently translated at 85.2% (1808 of 2121 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/nl/
 2020-02-18 09:55:38 +00:00
Bruno Windels
05403eb98c
Merge pull request #4072 from matrix-org/bwindels/localecho2 
Use local echo in VerificationRequest for accepting/declining a verification request
 2020-02-18 09:55:27 +00:00
Zoe
28df1e28cf Start verification sessions in an E2E DM where possible 
Fixes https://github.com/vector-im/riot-web/issues/12187
 2020-02-17 15:08:22 +00:00
progserega
0325fdd37b Translated using Weblate (Russian) 
Currently translated at 80.1% (1699 of 2121 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
 2020-02-17 13:37:07 +00:00
Walter
ed7702b01c Translated using Weblate (Russian) 
Currently translated at 80.1% (1699 of 2121 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
 2020-02-17 13:37:07 +00:00
random
9f466477bd Translated using Weblate (Italian) 
Currently translated at 100.0% (2121 of 2121 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/it/
 2020-02-16 11:24:36 +00:00
Szimszon
f3dd8ecd00 Translated using Weblate (Hungarian) 
Currently translated at 100.0% (2121 of 2121 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
 2020-02-16 11:24:34 +00:00
Kévin C
50886ff127 Translated using Weblate (French) 
Currently translated at 100.0% (2121 of 2121 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
 2020-02-16 11:24:34 +00:00
MadsDyrmann
417774f609 Translated using Weblate (Danish) 
Currently translated at 24.3% (515 of 2121 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/da/
 2020-02-16 11:24:33 +00:00
Jeff Huang
adaef02fca Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (2121 of 2121 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
 2020-02-16 11:24:33 +00:00
Besnik Bleta
d19cbe4afa Translated using Weblate (Albanian) 
Currently translated at 99.7% (2114 of 2121 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sq/
 2020-02-16 11:24:32 +00:00
Weblate
f404885a54 Merge branch 'origin/develop' into Weblate. 2020-02-14 21:40:54 +00:00
jja2000
f8509a40a4 Translated using Weblate (Dutch) 
Currently translated at 83.1% (1762 of 2120 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/nl/
 2020-02-14 21:40:54 +00:00
J. Ryan Stinnett
4e2887ded6
Merge pull request #4078 from matrix-org/jryans/report-experimental-envs 
Report installed PWA, touch input status in rageshakes, analytics
 2020-02-14 21:40:48 +00:00
J. Ryan Stinnett
ca28f83841 Report touch input status in rageshakes, analytics 
This reports whether the device has touch input as a primary input mechanism in
rageshakes and analytics.

For analytics, this replaces the identity server (which ends up being reported
as "<redacted>" by default anyway) because Matomo only supports a limited number
of custom variables.
 2020-02-14 17:36:14 +00:00
J. Ryan Stinnett
ca4f591cb6 Report installed PWA status in rageshakes, analytics 
This adds installed PWA status reporting to rageshakes and analytics, as well as
cleaning up some related strings.
 2020-02-14 16:30:07 +00:00
Hubert Chathi
4a204b715d
Merge pull request #4059 from matrix-org/uhoreg/refactor_event_grouping 
refactor event grouping into separate helper classes
 2020-02-14 10:35:34 -05:00
Bruno Windels
93674ec781
Merge pull request #4070 from matrix-org/bwindels/oneverifrequest 
Find existing requests when starting a new verification request
 2020-02-14 15:33:27 +00:00
Bruno Windels
30718e7fde unsent could potentially also happen here 
although should not happen in practice
 2020-02-14 13:48:38 +01:00
Bruno Windels
a6c072ab42 only show supported verification methods 
also an error message if none match
 2020-02-14 13:48:18 +01:00
Marco Zehe
b83bc7db68 Always speak the full text of the typing indicator when it updates. 
By default, aria-live regions only speak partial updates. However in the case of the typing indicator, if it goes from one person typing to several, and back, the updated text would only be spoken in fragments by screen readers. Adding the aria-atomic attribute with a value of true makes screen readers always speak the full update for this tile, making the experience much nicer.

Signed-off-by: Marco Zehe <marcozehe@mailbox.org>
 2020-02-14 11:12:41 +01:00
Michael Telatynski
42b63fbc81 Fix share message context menu option keyboard a11y 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-02-14 09:36:10 +00:00
Bruno Windels
43f15ab47d
Merge pull request #4008 from BobVul/fix-markdown-escapes 
Fix escaped markdown passing backslashes through
 2020-02-14 09:18:53 +00:00
Michael Telatynski
256659e6f8
Merge pull request #4071 from MarcoZehe/MoveSidebarTabs 
Move the sidebar to below the sidebar tab buttons for screen readers.
 2020-02-13 18:31:25 +00:00
Marco Zehe
7840aa74fd Fix ID to be namespaced 
Signed-off-by: Marco Zehe <marcozehe@mailbox.org>
 2020-02-13 19:18:21 +01:00
Michael Telatynski
8ea13d9b57 delint prefer let/const over var 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-02-13 17:05:48 +00:00
Michael Telatynski
4ed27a4ba6 Move bulk to react-sdk and reference it from riot-web land 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-02-13 16:58:27 +00:00
Michael Telatynski
627a4d4ea4 Update comments and such 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-02-13 16:53:45 +00:00
Michael Telatynski
12aae12218 Merge branches 'develop' and 't3chguy/usercontent' of github.com:matrix-org/matrix-react-sdk into t3chguy/usercontent 2020-02-13 16:36:05 +00:00
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
Zoe
786d853f4c
Merge pull request #4067 from matrix-org/foldleft/12191-pull-big-tooltip 
don't show tooltips on big icons
 2020-02-13 15:22:09 +00:00
Marco Zehe
6319407cab Move the sidebar to below the sidebar tab buttons for screen readers. 
Do this by aria-owning the sidebar into the header wrapper. aria-owned subtrees get added as the last child after all other child elements that are in the DOM. This way, if a sidebar tab is activated, the aside element now is inserted in a position following the tabs, before the main messages list. The association for screen readers is therefore more logical. This has no bearing on the DOM order or CSS properties. aria-owns simply rearranges the accessibility tree.

Fixes vector-im/riot-web/issues/11319

Signed-off-by: Marco Zehe <marcozehe@mailbox.org>
 2020-02-13 16:02:58 +01:00
Zoe
37f1104f61 lint 2020-02-13 14:15:08 +00:00
Zoe
c3af1a2f95 don't be too magic about hiding tooltips 2020-02-13 13:47:39 +00:00
Bruno Windels
4b7cc12daa check if there is already a request in progress when clicking verify 
and go straight there instead of first showing EncryptionInfo panel
 2020-02-13 14:34:44 +01:00
Bruno Windels
68197a1d18 also update phase after starting request 
as it might now be a request that is already ongoing
 2020-02-13 14:33:35 +01:00
Bruno Windels
d49fbf25f7 check if verifier sasEvent was already set on mount 
this allow the verification panel to fully recover
the UI state from an on-going verification request
 2020-02-13 14:32:33 +01:00
Weblate
ccb88cd422 Merge branch 'origin/develop' into Weblate. 2020-02-13 12:46:38 +00:00
Michael Telatynski
4952b5b001
Merge pull request #4068 from matrix-org/t3chguy/piwik_csp 
Fix sending of visit variables to Matomo
 2020-02-13 12:46:33 +00:00
Michael Telatynski
f53c415504 Fix sending of visit variables 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-02-13 11:50:40 +00:00
Weblate
6ed8a7593e Merge branch 'origin/develop' into Weblate. 2020-02-13 10:59:08 +00:00
Michael Telatynski
12c743b160
Merge pull request #4066 from matrix-org/t3chguy/piwik_csp 
Use embedded piwik script rather than piwik.js to respect CSP
 2020-02-13 10:59:02 +00:00
Michael Telatynski
0c4ee0091e Update comment and clear up localstorage on disabling 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-02-13 10:47:50 +00:00
Zoe
9649f2a2da don't show tooltips on big icons 
fixes: https://github.com/vector-im/riot-web/issues/12191
 2020-02-13 10:11:57 +00:00
Weblate
93c412c584 Merge branch 'origin/develop' into Weblate. 2020-02-13 08:51:44 +00:00
Szimszon
98e8fed26e Translated using Weblate (Hungarian) 
Currently translated at 100.0% (2120 of 2120 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
 2020-02-13 08:51:43 +00: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
Michael Telatynski
8d445d54ec Use embedded piwik caller rather than piwik.js bcuz CSP :D 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-02-13 00:39:28 +00:00
Weblate
d6d0831c16 Merge branch 'origin/develop' into Weblate. 2020-02-12 17:44:44 +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
Weblate
8ce73192cc Merge branch 'origin/develop' into Weblate. 2020-02-12 17:04:32 +00: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
Weblate
8943546fd9 Merge branch 'origin/develop' into Weblate. 2020-02-12 17:03:40 +00: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
Weblate
8cabf45ec4 Merge branch 'origin/develop' into Weblate. 2020-02-12 14:10:33 +00:00
Besnik Bleta
13e03bb696 Translated using Weblate (Albanian) 
Currently translated at 99.7% (2113 of 2120 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sq/
 2020-02-12 14:10:33 +00:00
Zoe
e1608509d0 Disable 'start' button after clicking in VerificationPanel 2020-02-12 13:53:16 +00:00
Weblate
aba11f0a2f Merge branch 'origin/develop' into Weblate. 2020-02-12 11:18:37 +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
Weblate
72f1c2a763 Merge branch 'origin/develop' into Weblate. 2020-02-12 10:04:54 +00:00
Szimszon
3c5abf1fc4 Translated using Weblate (Hungarian) 
Currently translated at 100.0% (2119 of 2119 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
 2020-02-12 10:04:53 +00:00
Kévin C
790ed65a17 Translated using Weblate (French) 
Currently translated at 100.0% (2119 of 2119 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
 2020-02-12 10:04:52 +00:00
Jeff Huang
37435bce45 Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (2119 of 2119 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
 2020-02-12 10:04:51 +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
Hubert Chathi
be70ef44f8 lint 2020-02-11 15:34:14 -05:00
Hubert Chathi
4c5046afd5 refactor event grouping into separate helper classes 2020-02-11 15:19:32 -05: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
Weblate
99bbc2bdae Merge branch 'origin/develop' into Weblate. 2020-02-11 17:20:46 +00: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
Weblate
a56d21d80a Merge branch 'origin/develop' into Weblate. 2020-02-11 15:35:30 +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
Weblate
0e366c3ddd Merge branch 'origin/develop' into Weblate. 2020-02-11 15:35:06 +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
Weblate
f206baadd1 Merge branch 'origin/develop' into Weblate. 2020-02-11 15:34:32 +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
Weblate
628be1e90a Merge branch 'origin/develop' into Weblate. 2020-02-11 15:16:54 +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
Weblate
ae237901b0 Merge branch 'origin/develop' into Weblate. 2020-02-11 13:44:08 +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
Weblate
0482a277e1 Merge branch 'origin/develop' into Weblate. 2020-02-11 13:19:24 +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
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
Weblate
b8e75ef440 Merge branch 'origin/develop' into Weblate. 2020-02-11 10:18:49 +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
Weblate
56b723353b Merge branch 'origin/develop' into Weblate. 2020-02-11 10:11:26 +00:00
Michael Telatynski
ee819dfdf8 fix call to SettngsStore.watchSetting, it takes a roomID 2020-02-11 09:32:09 +00:00
Weblate
70d12607dd Merge branch 'origin/develop' into Weblate. 2020-02-11 09:30:35 +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
Weblate
da737952ec Merge branch 'origin/develop' into Weblate. 2020-02-11 08:19:39 +00:00
Kévin C
136dca7837 Translated using Weblate (French) 
Currently translated at 100.0% (2110 of 2110 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
 2020-02-11 08:19:39 +00:00
Stanislav Lukeš
5436662d92 Translated using Weblate (Czech) 
Currently translated at 98.7% (2082 of 2110 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/cs/
 2020-02-11 08:19:39 +00:00
Jeff Huang
dd4aaf230a Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (2110 of 2110 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
 2020-02-11 08:19:38 +00:00
Besnik Bleta
f5111a6290 Translated using Weblate (Albanian) 
Currently translated at 99.7% (2103 of 2110 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sq/
 2020-02-11 08:19:37 +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