PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3
23683 commits 1 branch 0 tags 338 MiB
Commit graph

23683 commits

This branch
This branch
All branches
Author SHA1 Message Date
David Baker
1bd1e25047
Merge pull request #4519 from matrix-org/dbkr/new_device_toast_more_important 
Make new device toasts appear above review toasts
 2020-04-29 15:28:28 +01:00
David Baker
325e1f9c4e Add jsdoc explaining ordering behaviour 2020-04-29 15:10:23 +01:00
David Baker
1291a63b98 Make new device toasts appear above review toasts 
...but below incoming verification toasts, which means we now need
to actually handle priority insertion correctly. Oh well.

Fixes https://github.com/vector-im/riot-web/issues/13442
 2020-04-29 14:49:30 +01:00
David Baker
eceb8edfbc
Merge pull request #4511 from matrix-org/dbkr/another_round_of_toast 
Separate toasts for existing & new device verification
 2020-04-29 12:09:37 +01:00
David Baker
0026e4a018
Comment typo 
Co-Authored-By: J. Ryan Stinnett <jryans@gmail.com>
 2020-04-29 11:25:18 +01:00
Jorik Schellekens
360cc332eb
Merge pull request #4477 from JorikSchellekens/joriks/toggle-bg-color 
Slightly darker toggle off bg color
 2020-04-29 11:10:47 +01:00
Bruno Windels
8c28977c27
Merge pull request #4514 from JorikSchellekens/joriks/font-scaling-fixes 
Fix pill vertical align
 2020-04-29 10:07:44 +00:00
David Baker
126d81912b Remove await for some more getStoredDevice() calls 2020-04-29 11:02:22 +01:00
Jorik Schellekens
2e7ccf6e7a Fix pill vertical align 2020-04-29 10:57:35 +01:00
J. Ryan Stinnett
4adbfce92d
Merge pull request #4502 from matrix-org/jryans/set-up-button-text 
Fix set up encryption toast to have use "set up" as action
 2020-04-29 10:57:24 +01:00
David Baker
89a910c718 Clarify that we don't need tyo recheck 2020-04-29 10:55:44 +01:00
David Baker
75c680715f s/unverified/new/ 2020-04-29 10:53:36 +01:00
Bruno Windels
d9469e6afe
Merge pull request #4509 from matrix-org/bwindels/dontencryptfor3pids 
Don't enable e2ee when inviting a 3pid
 2020-04-29 09:49:28 +00:00
David Baker
6f25f2eaec Add the other toast component 2020-04-29 10:44:51 +01:00
Bruno Windels
bb6d13781c enable encryption when NOT inviting 3pids 2020-04-29 11:40:04 +02:00
Michael Telatynski
90b0223fbd
Merge pull request #4510 from matrix-org/t3chguy/settings_link_styling 
Fix internal link styling in Security Settings
 2020-04-29 10:26:25 +01:00
Bruno Windels
f06a69d8cc targets can also contain RoomMember, so take the positive case rather 2020-04-29 11:05:35 +02:00
Bruno Windels
4e98b5b4b6 dont enable e2ee when inviting a 3pid 2020-04-29 11:05:35 +02:00
David Baker
719faed2ff Separate toasts for existing & new device verification 
Separate device verification toasts into ones for devices that were
there when the app loaded and a separate toast for each device that
has appeared since.

Reverts part of https://github.com/matrix-org/matrix-react-sdk/pull/4506
(clicking a device from your own UserInfo now triggers the legacy
verification flow again).

Fixes https://github.com/vector-im/riot-web/issues/13422
Fixes https://github.com/vector-im/riot-web/issues/13418
 2020-04-28 18:35:16 +01:00
Michael Telatynski
a63dd664a1 fix font-size 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-04-28 17:57:32 +01:00
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
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
Jorik Schellekens
cf05beb4b8
Merge pull request #4355 from JorikSchellekens/joriks/font-scaling-fixes 
Fix scaling issues
 2020-04-28 13:47:50 +01: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
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
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
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
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
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
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
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