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

24311 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Jorik Schellekens
55084e918c Really fix info avatar 2020-04-27 17:40:37 +01:00
Jorik Schellekens
00c0212c03 Revert previous fix 2020-04-27 17:35:52 +01:00
Jorik Schellekens
c995e2e021 Fix info avatar 2020-04-27 17:29:03 +01:00
David Baker
582747d2ed
Merge pull request #4499 from matrix-org/dbkr/link_from_settings_to_userprofile_rel 
Add a link from settings / devices to your user profile
 2020-04-27 17:28:46 +01:00
Jorik Schellekens
b567b95fad Lint 2020-04-27 17:27:54 +01:00
Bruno Windels
b1870660d8 support theming username colors 2020-04-27 17:31:22 +02:00
Bruno Windels
2f68f608c5 add 15pct value of accent color for FormButton backgrounds 
so the button in the toasts has the correct background color
 2020-04-27 17:30:28 +02:00
David Baker
63d2d128c5 Lint 2020-04-27 16:29:28 +01:00
David Baker
d6f96f2f27 Update i18n 2020-04-27 16:29:22 +01:00
David Baker
ef1e40c839 Update to (almost) match design 2020-04-27 16:29:17 +01:00
David Baker
0a89813de1 Add a link from settings / devices to your user profile 
Temporarily until you can verify devices in settings

Fixes https://github.com/vector-im/riot-web/issues/13401
 2020-04-27 16:29:11 +01:00
Weblate
4866a14457 Merge branch 'origin/develop' into Weblate. 2020-04-27 15:28:12 +00:00
Priit Jõerüüt
ab369e7023 Translated using Weblate (Estonian) 
Currently translated at 6.7% (154 of 2294 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/et/
 2020-04-27 15:28:12 +00:00
David Baker
b608c6925c
Merge pull request #4498 from matrix-org/dbkr/link_from_settings_to_userprofile 
Add a link from settings / devices to your user profile
 2020-04-27 16:28:04 +01:00
David Baker
5d4aa03c8e Lint 2020-04-27 14:43:17 +01:00
David Baker
4e38b63b82 Update i18n 2020-04-27 14:38:22 +01:00
David Baker
03d89361cd Update to (almost) match design 2020-04-27 14:35:32 +01:00
Michael Telatynski
a58fd6c475 delint 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-04-27 14:27:41 +01:00
David Baker
ca0cede1aa Add a link from settings / devices to your user profile 
Temporarily until you can verify devices in settings

Fixes https://github.com/vector-im/riot-web/issues/13401
 2020-04-27 14:25:47 +01:00
Michael Telatynski
37374036d5 i18n 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-04-27 14:09:41 +01:00
Michael Telatynski
606940bd77 Update Invite Dialog copy to include email addresses 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-04-27 14:07:39 +01:00
David Baker
b3f19086f2
Merge pull request #4496 from RiotTranslateBot/weblate-riot-web-matrix-react-sdk 
Update from Weblate
 2020-04-27 13:14:09 +01:00
Jorik Schellekens
b4dcd50d56 Use camel case on import 2020-04-27 11:51:56 +01:00
Jorik Schellekens
a772d959a7 Remove redundent padding property and use em 2020-04-27 11:51:56 +01:00
Jorik Schellekens
669562b90c Extra right padding in user pills 2020-04-27 11:51:56 +01:00
Jorik Schellekens
c3ba7a8c91 Tweak read receipt remainder text 2020-04-27 11:51:56 +01:00