Skip to content

Collapse 2FA admin detail settings if disabled #14713

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
MorrisJobke merged 1 commit into from
Mar 20, 2019
Merged

Collapse 2FA admin detail settings if disabled #14713

MorrisJobke merged 1 commit into from
Mar 20, 2019

Conversation

@ChristophWurst
Copy link
Member

@ChristophWurst ChristophWurst commented Mar 15, 2019

  • Only show details when 2FA is enforced
  • Don't immediately save 2FA enforced setting but only when the save button is clicked

Ref #14639

@ChristophWurst ChristophWurst added this to the Nextcloud 16 milestone Mar 15, 2019
@ChristophWurst ChristophWurst self-assigned this Mar 15, 2019
@jancborchardt jancborchardt mentioned this pull request Mar 15, 2019
Closed
62 tasks
@MorrisJobke

This comment has been minimized.

Sign in to view
@MorrisJobke MorrisJobke added the 3. to review Waiting for reviews label Mar 15, 2019
@ChristophWurst

This comment has been minimized.

Sign in to view
@jancborchardt

This comment has been minimized.

Sign in to view
@ChristophWurst
Copy link
Member Author

ChristophWurst commented Mar 18, 2019

The save button now only shows if the user made any local changes and vanishes once saved.

This PR now also fixes a regression of the group selection. This seems to be broken otherwise with the move to the Vuex store.

@ChristophWurst ChristophWurst requested a review from rullzer March 18, 2019 13:39
@MorrisJobke MorrisJobke mentioned this pull request Mar 20, 2019
Merged
9 tasks
@nextcloud nextcloud deleted a comment from faily-bot bot Mar 20, 2019
@MorrisJobke
Copy link
Member

MorrisJobke commented Mar 20, 2019

Rebased and squashed.

@MorrisJobke MorrisJobke force-pushed the fix/admin-2fa-collapse-disable branch from bebaf61 to 3311d95 Compare March 20, 2019 11:09
MorrisJobke
MorrisJobke approved these changes Mar 20, 2019
View reviewed changes
Copy link
Member

@MorrisJobke MorrisJobke left a comment

Choose a reason for hiding this comment

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

Tested and works 👍

@MorrisJobke MorrisJobke requested a review from skjnldsv March 20, 2019 11:10
@MorrisJobke MorrisJobke added 4. to release Ready to be released and/or waiting for tests to finish and removed 3. to review Waiting for reviews labels Mar 20, 2019
@MorrisJobke MorrisJobke merged commit 1c8779d into master Mar 20, 2019
@MorrisJobke MorrisJobke deleted the fix/admin-2fa-collapse-disable branch March 20, 2019 13:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@MorrisJobke MorrisJobke MorrisJobke approved these changes

@skjnldsv skjnldsv skjnldsv approved these changes

@jancborchardt jancborchardt Awaiting requested review from jancborchardt

@rullzer rullzer Awaiting requested review from rullzer

Assignees

@ChristophWurst ChristophWurst

Labels

4. to release Ready to be released and/or waiting for tests to finish

Projects

None yet

Milestone

Nextcloud 16

Development

Successfully merging this pull request may close these issues.

5 participants

@ChristophWurst @MorrisJobke @jancborchardt @skjnldsv