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

21698 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
b984764268 Merge branch 'origin/develop' into Weblate. 2020-02-12 15:36:09 +00: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
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
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
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
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
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
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
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
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