Skip to content

Skip a folder if it contains a file named .nomedia or .noimage - #617

Closed
schklom wants to merge 312 commits into
nextcloud:masterfrom
schklom:master
Closed

Skip a folder if it contains a file named .nomedia or .noimage#617
schklom wants to merge 312 commits into
nextcloud:masterfrom
schklom:master

Conversation

@schklom

@schklom schklom commented Jun 5, 2021

Copy link
Copy Markdown

I haven't tested it, but the code is simple enough. Hopefully it works :)

tacruc
tacruc previously approved these changes Mar 14, 2022
@tacruc
tacruc dismissed their stale review March 14, 2022 14:02

DCO is not happy

Signed-off-by: Nextcloud bot <bot@nextcloud.com>
Signed-off-by: schklom <23263086+schklom@users.noreply.github.com>
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
Signed-off-by: schklom <23263086+schklom@users.noreply.github.com>
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
Signed-off-by: schklom <23263086+schklom@users.noreply.github.com>
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
Signed-off-by: schklom <23263086+schklom@users.noreply.github.com>
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
Signed-off-by: schklom <23263086+schklom@users.noreply.github.com>
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
Signed-off-by: schklom <23263086+schklom@users.noreply.github.com>
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
Signed-off-by: schklom <23263086+schklom@users.noreply.github.com>
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
Signed-off-by: schklom <23263086+schklom@users.noreply.github.com>
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
Signed-off-by: schklom <23263086+schklom@users.noreply.github.com>
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
Signed-off-by: schklom <23263086+schklom@users.noreply.github.com>
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
Signed-off-by: schklom <23263086+schklom@users.noreply.github.com>
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
Signed-off-by: schklom <23263086+schklom@users.noreply.github.com>
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
Signed-off-by: schklom <23263086+schklom@users.noreply.github.com>
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
Signed-off-by: schklom <23263086+schklom@users.noreply.github.com>
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
Signed-off-by: schklom <23263086+schklom@users.noreply.github.com>
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
Signed-off-by: schklom <23263086+schklom@users.noreply.github.com>
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
Signed-off-by: schklom <23263086+schklom@users.noreply.github.com>
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
Signed-off-by: schklom <23263086+schklom@users.noreply.github.com>
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
Signed-off-by: schklom <23263086+schklom@users.noreply.github.com>
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
Signed-off-by: schklom <23263086+schklom@users.noreply.github.com>
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
Signed-off-by: schklom <23263086+schklom@users.noreply.github.com>
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
Signed-off-by: schklom <23263086+schklom@users.noreply.github.com>
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
Signed-off-by: schklom <23263086+schklom@users.noreply.github.com>
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
Signed-off-by: schklom <23263086+schklom@users.noreply.github.com>
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
Signed-off-by: schklom <23263086+schklom@users.noreply.github.com>
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
Signed-off-by: schklom <23263086+schklom@users.noreply.github.com>
nextcloud-bot and others added 22 commits March 14, 2022 16:13
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
Signed-off-by: schklom <23263086+schklom@users.noreply.github.com>
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
Signed-off-by: schklom <23263086+schklom@users.noreply.github.com>
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
Signed-off-by: schklom <23263086+schklom@users.noreply.github.com>
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
Signed-off-by: schklom <23263086+schklom@users.noreply.github.com>
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
Signed-off-by: schklom <23263086+schklom@users.noreply.github.com>
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
Signed-off-by: schklom <23263086+schklom@users.noreply.github.com>
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
Signed-off-by: schklom <23263086+schklom@users.noreply.github.com>
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
Signed-off-by: schklom <23263086+schklom@users.noreply.github.com>
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
Signed-off-by: schklom <23263086+schklom@users.noreply.github.com>
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
Signed-off-by: schklom <23263086+schklom@users.noreply.github.com>
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
Signed-off-by: schklom <23263086+schklom@users.noreply.github.com>
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
Signed-off-by: schklom <23263086+schklom@users.noreply.github.com>
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
Signed-off-by: schklom <23263086+schklom@users.noreply.github.com>
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
Signed-off-by: schklom <23263086+schklom@users.noreply.github.com>
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
Signed-off-by: schklom <23263086+schklom@users.noreply.github.com>
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
Signed-off-by: schklom <23263086+schklom@users.noreply.github.com>
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
Signed-off-by: schklom <23263086+schklom@users.noreply.github.com>
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
Signed-off-by: schklom <23263086+schklom@users.noreply.github.com>
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
Signed-off-by: schklom <23263086+schklom@users.noreply.github.com>
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
Signed-off-by: schklom <23263086+schklom@users.noreply.github.com>
Signed-off-by: Arne Hamann <kontakt+github@arne.email>
Signed-off-by: schklom <23263086+schklom@users.noreply.github.com>
Signed-off-by: Chris "Koying" Browet <cbro@semperpax.com>
Signed-off-by: schklom <23263086+schklom@users.noreply.github.com>
@schklom

schklom commented Mar 14, 2022

Copy link
Copy Markdown
Author

@tacruc Ok, it took me a while but I somehow managed to make DCO happy by following the instruction to rebase.

@tacruc

tacruc commented Mar 14, 2022

Copy link
Copy Markdown
Collaborator

@schklom, I think you somehow manged to changed a way too many commits.

@schklom

schklom commented Mar 14, 2022

Copy link
Copy Markdown
Author

@tacruc DCO asked me to execute

git rebase HEAD~10 --signoff
git push --force-with-lease origin master

and now I see all these changes.

I'm not very familiar with git and even less with rebasing. What should I do?

@tacruc

tacruc commented Mar 14, 2022

Copy link
Copy Markdown
Collaborator

Right now you still have 312 Commits in your branch.
The easiest thing is probably to start a new branch from master, add your changes and do a new PR, with the one commit you would like to apply.

@eneiluj other suggestions?

@schklom

schklom commented Mar 16, 2022

Copy link
Copy Markdown
Author

@tacruc Ok, I'm closing this PR and creating a new one.

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.

6 participants