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/35886 replace custom tooltips with native one for personal and administration settings stable25 #36197

Conversation

JuliaKirschenheuter
Copy link
Contributor

@JuliaKirschenheuter JuliaKirschenheuter commented Jan 17, 2023

  • ⚠️ This backport had conflicts and is incomplete

backport of #35901

ToDo

  • : resolve conflicts in BackgroundSettings.vue

@JuliaKirschenheuter JuliaKirschenheuter force-pushed the fix/35886-Replace_custom_tooltips_with_native_one_for_personal_and_administration_settings-stable25 branch from 138ae5d to 6127b03 Compare January 17, 2023 16:41
@JuliaKirschenheuter JuliaKirschenheuter marked this pull request as draft January 17, 2023 16:43
@JuliaKirschenheuter
Copy link
Contributor Author

@nickvergessen

Thank you! I will fix that problem as a follow-up ticket on master + will create a follow-up backport to stable25. Could we merge this PR or should i just close this one?

@nickvergessen
Copy link
Member

You can also just restore the deleted line in this pr and then we merge?
The we don't have to backport a second pr?

@JuliaKirschenheuter JuliaKirschenheuter marked this pull request as ready for review January 19, 2023 10:34
@JuliaKirschenheuter JuliaKirschenheuter force-pushed the fix/35886-Replace_custom_tooltips_with_native_one_for_personal_and_administration_settings-stable25 branch from 9665089 to 5faa82c Compare January 19, 2023 10:55
@ChristophWurst
Copy link
Member

fixup! build locally

FYI this is not how fixup commits are structured. Git won't be able to resolve what commit you are fixing up.

Signed-off-by: julia.kirschenheuter <julia.kirschenheuter@nextcloud.com>
@JuliaKirschenheuter JuliaKirschenheuter force-pushed the fix/35886-Replace_custom_tooltips_with_native_one_for_personal_and_administration_settings-stable25 branch from 5faa82c to d2e50ba Compare January 20, 2023 08:33
@JuliaKirschenheuter JuliaKirschenheuter merged commit 26c87d8 into stable25 Jan 20, 2023
@JuliaKirschenheuter JuliaKirschenheuter deleted the fix/35886-Replace_custom_tooltips_with_native_one_for_personal_and_administration_settings-stable25 branch January 20, 2023 10:12
@blizzz blizzz mentioned this pull request Feb 6, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants