mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web synced 2024-10-25 20:26:51 +03:00
Code Issues Projects Releases Packages Wiki Activity
24087 commits 207 branches 547 tags 609 MiB
Commit graph

24087 commits

This branch
This branch
All branches
Author SHA1 Message Date
Michael Telatynski
32c512dbfe Fix internal link styling in Security Settings 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-04-28 17:49:10 +01:00
Weblate
e1a0915ecc Merge branch 'origin/develop' into Weblate. 2020-04-28 15:25:59 +00:00
random
6b28dfa50c Translated using Weblate (Italian) 
Currently translated at 100.0% (2297 of 2297 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/it/
 2020-04-28 15:25:59 +00:00
Bruno Windels
d723aa9efe
Merge pull request #4508 from matrix-org/bwindels/moarthemingfixes 
Small custom theming fixes
 2020-04-28 15:25:53 +00:00
Bruno Windels
8b8b5256be actually use timeline highlight color 2020-04-28 16:49:25 +02:00
Bruno Windels
198edb06b9 use normal accessible button, which is themed 2020-04-28 16:35:20 +02:00
Weblate
255dbab482 Merge branch 'origin/develop' into Weblate. 2020-04-28 12:47:55 +00:00
Jorik Schellekens
cf05beb4b8
Merge pull request #4355 from JorikSchellekens/joriks/font-scaling-fixes 
Fix scaling issues
 2020-04-28 13:47:50 +01:00
Zoe
689d6735fc i18n 2020-04-28 11:36:28 +01:00
Zoe
9d1c73348c Show progress when loading keys 2020-04-28 11:32:51 +01:00
Weblate
87ad4c15c2 Merge branch 'origin/develop' into Weblate. 2020-04-28 10:00:58 +00:00
Priit Jõerüüt
df28baf4f4 Translated using Weblate (Estonian) 
Currently translated at 14.0% (321 of 2296 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/et/
 2020-04-28 10:00:58 +00:00
David Baker
60d51a0f1e
Merge pull request #4506 from matrix-org/dbkr/aggregate_device_verify_toasts 
Aggregate device verify toasts
 2020-04-28 11:00:52 +01:00
Weblate
02c1090bce Merge branch 'origin/develop' into Weblate. 2020-04-28 09:06:14 +00:00
Kévin C
0b9423f6ef Translated using Weblate (French) 
Currently translated at 100.0% (2296 of 2296 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
 2020-04-28 09:06:14 +00:00
Remi Reuvekamp
41ef40a0e3 Translated using Weblate (Dutch) 
Currently translated at 91.1% (2092 of 2296 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/nl/
 2020-04-28 09:06:14 +00:00
Jeff Huang
dfb2c66b6c Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (2296 of 2296 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
 2020-04-28 09:06:13 +00:00
Bruno Windels
3d094ea542
Merge pull request #4503 from matrix-org/bwindels/customthemechanges 
Support setting username and avatar colors in custom themes
 2020-04-28 09:06:08 +00:00
Priit Jõerüüt
8aeeff4204 Translated using Weblate (Estonian) 
Currently translated at 13.8% (317 of 2296 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/et/
 2020-04-28 09:03:30 +00:00
Bruno Windels
4978f8a2a9 validate hex color 2020-04-28 10:59:10 +02:00
David Baker
cad2f4d27d Consts are constant 2020-04-28 09:49:03 +01:00
David Baker
4dca66d140 No need for this if statement now 2020-04-28 09:43:24 +01:00
David Baker
90326955ba No need for a set here - bool is fine 2020-04-28 09:42:39 +01:00
Bruno Windels
19fc6a93ec fix tests 2020-04-28 10:41:35 +02:00
Priit Jõerüüt
d61b72c0e5 Translated using Weblate (Estonian) 
Currently translated at 11.1% (256 of 2296 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/et/
 2020-04-28 06:15:02 +00:00
Michael Telatynski
2792988ad1 Revert "Make Screens an enum" 
This reverts commit f6492918

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-04-27 23:59:07 +01:00
Michael Telatynski
3e35cffae7 null-guards 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-04-27 23:53:32 +01:00
Michael Telatynski
a5830c229e more tidying 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-04-27 23:30:40 +01:00
Michael Telatynski
c7870090f8 clean ups 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-04-27 23:29:38 +01:00
Michael Telatynski
83a4558d49 remove RedactedGrouper for now 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-04-27 23:27:46 +01:00
Michael Telatynski
a399b1018a fix flashing by "" 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-04-27 23:16:08 +01:00
Michael Telatynski
9dd204dd10 Merge branches 'develop' and 't3chguy/redaction_redesign' of github.com:matrix-org/matrix-react-sdk into t3chguy/redaction_redesign 2020-04-27 23:09:08 +01:00
David Baker
7e956514a2 Lint 2020-04-27 20:35:39 +01:00
David Baker
ff1fd15e72 Use the New Session review dialog for verifying our own devices 2020-04-27 20:31:14 +01:00
Michael Telatynski
98b418a809
Merge pull request #4505 from matrix-org/t3chguy/cherry-pick/2 
only clear on continuations where the clear isn't done by SenderProfile
 2020-04-27 19:20:16 +01:00
Michael Telatynski
cf6dbcc71b
Merge pull request #4504 from matrix-org/t3chguy/cherry-pick/3 
cap width of editable item list item to leave space for its X button
 2020-04-27 18:57:23 +01:00
Michael Telatynski
de3226177c cap width of editable item list item to leave space for its X remove button 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-04-27 18:51:07 +01:00
Michael Telatynski
1a99917556 only clear on continuations where the clear isn't done by SenderProfile 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-04-27 18:50:18 +01:00
Bruno Windels
76e04fbdfa update comment 2020-04-27 19:39:07 +02:00
Bruno Windels
1969310003 support overriding avatar background color from custom theme 2020-04-27 19:38:27 +02:00
Weblate
b6c1e44083 Merge branch 'origin/develop' into Weblate. 2020-04-27 17:36:53 +00:00
Michael Telatynski
433b166190
Merge pull request #4501 from matrix-org/t3chguy/fix_floats 
only clear on continuations where the clear isn't done by SenderProfile
 2020-04-27 18:36:48 +01:00
Weblate
969e65e6e5 Merge branch 'origin/develop' into Weblate. 2020-04-27 17:36:45 +00:00
Michael Telatynski
c537b81bea
Merge pull request #4495 from matrix-org/t3chguy/local_alias_remove 
cap width of editable item list item to leave space for its X button
 2020-04-27 18:36:39 +01:00
Jorik Schellekens
66067719f4 Small fixes 2020-04-27 18:36:05 +01:00
J. Ryan Stinnett
b396096cd2 Fix set up encryption toast to have use "set up" as action 
This changes the "set up encryption" toast to use "set up" as the primary action
button, instead of "upgrade". Other toasts that do use text about upgrading will
keep their primary action text of "upgrade" as before.

Fixes https://github.com/vector-im/riot-web/issues/13231
 2020-04-27 18:35:51 +01:00
Bruno Windels
e8e99c2646 Use color values for default avatar backgrounds 
We still need to convert them to URLs for the notification icon,
so use a canvas (with a cache in front of it) to do that.
 2020-04-27 19:35:38 +02:00
David Baker
3bdd24ce83 Make close button work from user info view 
Adds more hacks so that the close button does something vagauely
plausible in all situations.
 2020-04-27 18:34:48 +01:00
David Baker
a5ee99b858 Aggregate device verification toasts into one toast 
'Review' now opens the only place we can verify our own devices:
our user info.
 2020-04-27 18:33:54 +01:00
Michael Telatynski
da7a2f2f62 only clear on continuations where the clear isn't done by SenderProfile 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-04-27 17:50:50 +01:00