imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
24206 commits 222 branches 563 tags 470 MiB
Commit graph

10295 commits

Author SHA1 Message Date
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
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
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
Zoe
9d1c73348c Show progress when loading keys 2020-04-28 11:32:51 +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
David Baker
4dca66d140 No need for this if statement now 2020-04-28 09:43:24 +01: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
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
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
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
David Baker
5d4aa03c8e Lint 2020-04-27 14:43:17 +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
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
Jorik Schellekens
b4dcd50d56 Use camel case on import 2020-04-27 11:51:56 +01:00
Jorik Schellekens
c3ba7a8c91 Tweak read receipt remainder text 2020-04-27 11:51:56 +01:00
Jorik Schellekens
cef6868f02 Resize room list scroll section. 
This fix isn't perfect. Currently the scroll view is
slightly smaller than the list of rooms. I think it has something
to do with the how the heigh is calculate in js, considering it has
some assumptions about the height of each bar and the padding. However
room items are the only things which change with respect to the root
value. Therefore the item list is actually taller than the computed
pixel value of the list converted to rems.

I'll look into it.
 2020-04-27 11:51:55 +01:00
Jorik Schellekens
ff1544b783 Fix read receipt horizontal spacing at scale 2020-04-27 11:51:54 +01:00
Jorik Schellekens
3f56ed393d Use a function to convert to rem. 2020-04-27 11:51:54 +01:00
Jorik Schellekens
e2aef3a62b Fix pills. 
This was a hard pill to swallow
 2020-04-27 11:51:54 +01:00
Agusti Bau
98a949bed1 Refactored DNDTagTile to use useContextMenu 
Signed-off-by: Agusti Bau <agustibau@gmail.com>
 2020-04-26 18:54:35 +02:00
Agusti Bau
5f3e3b3ec2 Extracted context menu from TagTile to DNDTagTile 2020-04-25 01:09:07 +02:00
David Baker
121ac14273
Merge pull request #4485 from matrix-org/dbkr/setup_encryption_dialog_icon 
Make icon change in SetupEncryptionDialog
 2020-04-24 18:56:40 +01:00
David Baker
6460f6303c Move store subscribe to didmount 2020-04-24 17:36:02 +01:00
Travis Ralston
117322b3b5 Remove invite only padlocks feature flag 
Fixes https://github.com/vector-im/riot-web/issues/13366

Only known issue on this is https://github.com/vector-im/riot-web/issues/12148

This has been pre-approved by Product.
 2020-04-24 10:05:28 -06:00
David Baker
bbce37b92f Make icon change in SetupEncryptionDialog 
Fixes https://github.com/vector-im/riot-web/issues/13368
 2020-04-24 15:39:54 +01:00
Michael Telatynski
d3b0e008c1 first draft of Redaction ELS 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-04-24 15:39:23 +01:00
Michael Telatynski
e16f511527 Redesign redactions 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-04-24 15:07:39 +01:00
Travis Ralston
50783c2432 Appease the linter 2020-04-23 23:25:53 -06:00
Travis Ralston
28865e27bc Don't overwrite the 'domain' data key for all widgets 
Some widgets, which aren't Jitsi widgets, might need this to be something else.
 2020-04-23 15:24:27 -06:00
Travis Ralston
efaf4fbbda Decode dollar signs in safe widget URLs before rendering/templating 
Fixes https://github.com/vector-im/riot-web/issues/13344
 2020-04-23 15:24:27 -06:00
J. Ryan Stinnett
5af3d83cc7 Fix recovery link on login verification flow 
This fixes the recovery link to go to the right place.

Fixes https://github.com/vector-im/riot-web/issues/13346
 2020-04-23 18:14:30 +01:00
Michael Telatynski
531de19fa4 Revert "Discard unused CompatibilityPage.js in react-sdk" 
This reverts commit e3ba9c9b

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-04-23 16:11:58 +01:00
Michael Telatynski
e3ba9c9b38 Discard unused CompatibilityPage.js in react-sdk 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-04-23 16:11:29 +01:00