Skip to content

Collapse 2FA admin detail settings if disabled - #14713

Merged
MorrisJobke merged 1 commit into
masterfrom
fix/admin-2fa-collapse-disable
Mar 20, 2019
Merged

Collapse 2FA admin detail settings if disabled#14713
MorrisJobke merged 1 commit into
masterfrom
fix/admin-2fa-collapse-disable

Conversation

@ChristophWurst

@ChristophWurstChristophWurst commented Mar 15, 2019

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

Ref #14639

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

This comment has been minimized.

Sign in to view
@MorrisJobkeMorrisJobke 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

ChristophWurst commented Mar 18, 2019

Copy link
Copy Markdown
MemberAuthor

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.

@MorrisJobkeMorrisJobke mentioned this pull request Mar 20, 2019
Merged
9 tasks
@nextcloudnextcloud deleted a comment from faily-botBotMar 20, 2019
@ChristophWurst@MorrisJobke
Collapse 2FA admin detail settings if disabled
3311d95
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
@MorrisJobke

MorrisJobke commented Mar 20, 2019

Copy link
Copy Markdown
Member

Rebased and squashed.

@MorrisJobke
MorrisJobkeforce-pushed the fix/admin-2fa-collapse-disable branch from bebaf61 to 3311d95CompareMarch 20, 2019 11:09
MorrisJobke
MorrisJobke approved these changes Mar 20, 2019
View reviewed changes

@MorrisJobkeMorrisJobke left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Tested and works 👍

@MorrisJobkeMorrisJobke 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 masterMar 20, 2019
@MorrisJobke
MorrisJobke deleted the fix/admin-2fa-collapse-disable branch March 20, 2019 13:20
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@MorrisJobkeMorrisJobkeMorrisJobke approved these changes
@skjnldsvskjnldsvskjnldsv approved these changes
@jancborchardtjancborchardtAwaiting requested review from jancborchardt
@rullzerrullzerAwaiting requested review from rullzer

Assignees

@ChristophWurstChristophWurst

Labels

4. to releaseReady 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.

4 participants

@ChristophWurst@MorrisJobke@jancborchardt@skjnldsv