Skip to content

Conversation

@backportbot-nextcloud
Copy link

@backportbot-nextcloud backportbot-nextcloud bot commented Dec 14, 2022

  • ⚠️ This backport had conflicts and is incomplete

backport of #35501

@ChristophWurst
Copy link
Member

@JuliaKirschenheuter please make sure the diff is actually complete. I see fewer changes here than in the original PR.

Afterwards also cherry-pick the changes of #35545 onto this PR's branch.

@ChristophWurst ChristophWurst marked this pull request as draft December 14, 2022 15:02
@ChristophWurst ChristophWurst added the 1. to develop Accepted and waiting to be taken care of label Dec 14, 2022
@JuliaKirschenheuter JuliaKirschenheuter self-assigned this Dec 16, 2022
@JuliaKirschenheuter JuliaKirschenheuter removed the 1. to develop Accepted and waiting to be taken care of label Dec 16, 2022
@JuliaKirschenheuter JuliaKirschenheuter marked this pull request as ready for review December 16, 2022 14:06
@JuliaKirschenheuter JuliaKirschenheuter added the 3. to review Waiting for reviews label Dec 21, 2022
@ChristophWurst
Copy link
Member

#35771 (comment) done?

@ChristophWurst
Copy link
Member

/build fixup /

@ChristophWurst
Copy link
Member

/compile fixup /

@ChristophWurst
Copy link
Member

Untracked files:
(use "git add ..." to include in what will be committed)
dist/icons.css

@PVince81
Copy link
Member

Untracked files:
(use "git add ..." to include in what will be committed)
dist/icons.css

I tried this locally without any git apps in "apps":
make dev-setup && make build-js-production && npm run sass && npm run sass:icons && git status

and there are no changes to commit, so icons.css is in the correct state (for both @JuliaKirschenheuter and I)
also rebased on top of origin/stable25

and yet the node test complains ?

@PVince81
Copy link
Member

okay, looks like a gitignore quirk: the changeset on Github says that "icons.css" got removed, but recompiling locally and git status doesn't offer to re-add it.

I've now been able to explicitly readd it with git add dist/icons.css

@JuliaKirschenheuter be careful when discarding changes in "dist", never use delete operations and always "git checkout origin/stable25 dist/" instead

…) have no overlapping.

Add native tooltips to items.

Signed-off-by: julia.kirschenheuter <julia.kirschenheuter@nextcloud.com>
Signed-off-by: nextcloud-command <nextcloud-command@users.noreply.github.com>
@PVince81 PVince81 force-pushed the backport/35501/stable25 branch from 2c87151 to 055f421 Compare December 22, 2022 14:31
@JuliaKirschenheuter JuliaKirschenheuter added 4. to release Ready to be released and/or waiting for tests to finish and removed 3. to review Waiting for reviews labels Dec 22, 2022
@JuliaKirschenheuter JuliaKirschenheuter merged commit dbc2ad9 into stable25 Dec 23, 2022
@JuliaKirschenheuter JuliaKirschenheuter deleted the backport/35501/stable25 branch December 23, 2022 09:01
@skjnldsv skjnldsv mentioned this pull request Jan 6, 2023
5 tasks
@blizzz blizzz mentioned this pull request Jan 11, 2023
6 tasks
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 accessibility feature: accessibility

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants