Skip to content
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.

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

[stable25] Fix user settings layout #35375

Merged
merged 4 commits into from
Nov 24, 2022
Merged

[stable25] Fix user settings layout #35375

merged 4 commits into from
Nov 24, 2022

Conversation

backportbot-nextcloud[bot]
Copy link

@backportbot-nextcloud backportbot-nextcloud bot commented Nov 23, 2022

  • ⚠️ This backport had conflicts and is incomplete

backport of #35350

Signed-off-by: John Molakvoæ <[email protected]>
Copy link
Contributor

@szaimen szaimen left a comment

Choose a reason for hiding this comment

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

blocking. See #35350 (review)

@PVince81 PVince81 self-assigned this Nov 23, 2022
@PVince81
Copy link
Member

/compile amend /

@PVince81
Copy link
Member

I've checked the commits and the only diff/conflict is the compiled assets

Signed-off-by: John Molakvoæ <[email protected]>
Signed-off-by: nextcloud-command <[email protected]>
@szaimen
Copy link
Contributor

szaimen commented Nov 23, 2022

/compile amend /

Copy link
Contributor

@szaimen szaimen left a comment

Choose a reason for hiding this comment

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

fine by me now.

However we need to add a vue update for the multiselect checkboxes...

Signed-off-by: Simon L <[email protected]>
Signed-off-by: nextcloud-command <[email protected]>
@szaimen
Copy link
Contributor

szaimen commented Nov 24, 2022

@PVince81 if we manage to release v7.1.0 beta.2 fast enough tomorrow morning, I'd even like to include it in this PR here so that we dont need to add yet another one for stable25.
See nextcloud-libraries/nextcloud-vue#3515

@szaimen
Copy link
Contributor

szaimen commented Nov 24, 2022

/compile amend /

Copy link
Contributor

@szaimen szaimen left a comment

Choose a reason for hiding this comment

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

works:
image

@szaimen szaimen added the 4. to release Ready to be released and/or waiting for tests to finish label Nov 24, 2022
Signed-off-by: Simon L <[email protected]>
Signed-off-by: nextcloud-command <[email protected]>
@szaimen
Copy link
Contributor

szaimen commented Nov 24, 2022

CI failure unrelated

@szaimen szaimen merged commit c1857ef into stable25 Nov 24, 2022
@szaimen szaimen deleted the backport/35350/stable25 branch November 24, 2022 08:57
@szaimen szaimen restored the backport/35350/stable25 branch November 24, 2022 09:05
@szaimen szaimen deleted the backport/35350/stable25 branch November 24, 2022 09:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
4. to release Ready to be released and/or waiting for tests to finish bug feature: settings feature: users and groups regression
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants