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

Implement the Security & Privacy tab of new room settings #2523

Merged
merged 4 commits into from
Jan 30, 2019

Conversation

turt2live
Copy link
Member

@turt2live turt2live requested a review from a team January 29, 2019 21:37
@turt2live
Copy link
Member Author

test failures are expected because branch mismatch

@jryans jryans self-assigned this Jan 30, 2019
Copy link
Collaborator

@jryans jryans left a comment

Choose a reason for hiding this comment

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

Looks good, thanks! 😁

*/

.mx_SecurityRoomSettingsTab label {
display: block;
Copy link
Collaborator

Choose a reason for hiding this comment

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

Minor style nit: Use 4 spaces for indentation.

Copy link
Member Author

Choose a reason for hiding this comment

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

I'm going to fix all of the CSS I've added for settings in one go because they're all at 2 spaces.

@jryans jryans assigned turt2live and unassigned jryans Jan 30, 2019
@turt2live turt2live merged commit c145d4b into experimental Jan 30, 2019
@turt2live turt2live deleted the travis/rsettings/tab/security branch January 30, 2019 05:58
turt2live added a commit that referenced this pull request Mar 22, 2019
Fixes element-hq/element-web#9235

The global option in user settings is unaffected by this bug. Users who have previously set the per-room flag without success can simply refresh the page and the change will be picked up. The bug here is that the current session would not update accordingly, however.

Introduced in #2523
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.

2 participants