Skip to content
This repository has been archived by the owner on Sep 11, 2024. It is now read-only.

Expose power level toggle for enabling e2ee to room settings #3351

Merged
merged 3 commits into from
Aug 30, 2019

Conversation

t3chguy
Copy link
Member

@t3chguy t3chguy commented Aug 28, 2019

Fixes element-hq/element-web#10463

Signed-off-by: Michael Telatynski 7t3chguy@gmail.com

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
@t3chguy t3chguy requested a review from a team August 28, 2019 10:37
@turt2live turt2live changed the title expose power level toggle for enabling e2ee to room settings Expose power level toggle for enabling e2ee to room settings Aug 28, 2019
Copy link
Member

@turt2live turt2live left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It should be disabled if encryption is already enabled

@t3chguy
Copy link
Member Author

t3chguy commented Aug 30, 2019

It should be disabled if encryption is already enabled

This is kind-of already an issue already if someone changes the PL required for enabling E2EE riot will show it in settings anyway, the wording is just a bit less ambiguous after this change
image

…atrix-org/matrix-react-sdk into t3chguy/pl_control_e2e

� Conflicts:
�	src/components/views/settings/tabs/room/RolesRoomSettingsTab.js
�	src/i18n/strings/en_EN.json
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
@t3chguy t3chguy requested a review from turt2live August 30, 2019 09:59
Copy link
Member

@turt2live turt2live left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

hiding is indeed better, I think. The whole power levels page is due for a redesign anyhow.

@t3chguy t3chguy merged commit de07191 into develop Aug 30, 2019
@t3chguy t3chguy deleted the t3chguy/pl_control_e2e branch April 27, 2020 18:00
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

We should also expose a power level toggle for who can enable encryption
2 participants