Merge Nightly into Stable

[ronny1982]

All commits cherry picked and applied by using the merge script

Merge Nightly to Stable

# Run these commands in your local HakuNeko fork (remote of the fork must be on GitHub!)

# switch to master branch (nightly)
git switch master
# sync the master branch of this fork with the master branch from the official repository
git pull https://github.com/manga-download/hakuneko.git master

# switch to 6.1.7 branch (stable)
git switch 6.1.7
# sync the 6.1.7 branch of this fork with the 6.1.7 branch from the official repository
git pull https://github.com/manga-download/hakuneko.git 6.1.7

# create a new branch based on 6.1.7 for merging all new changes from master into 6.1.7
git switch -c merge-nightly-stable
# cherry pick all commits from master that were introduced after the last commit present in 6.1.7
git rev-list --reverse --max-age=$(git show -s --format=%ct HEAD) master | git cherry-pick --stdin
# push the new branch to the remote of the local fork
git push --set-upstream origin merge-nightly-stable
# the local branch is no longer required and can be removed
git switch master
git branch -d merge-nightly-stable

# All done, now create a pull request on GitHub: fork/merge-nightly-stable => official/6.1.7

Merge conflicts occured in f7c0b1a when cherry picked from 4318aac, not sure if they were resolved correctly.

[ronny1982]

Suggestion to close PR after Saturday, 19 October 2024 (12 weeks) if not approved by a reviewer.

[cloudflare-workers-and-pages]

Deploying hakuneko with    Cloudflare Pages

Latest commit:	85eef8a
Status:	✅  Deploy successful!
Preview URL:	https://648ff043.hakuneko.pages.dev
Branch Preview URL:	https://merge-nightly-stable.hakuneko.pages.dev

View logs

[MikeZeDev]

Pretty sure the conflicts were solved correctly. I mean, i remember you locked the version when i complained about CI, but i dont remember about changing eslint command line.

Also you may wan to include #7111. Its a regular website now there is nothing to see..

[ronny1982]

Pretty sure the conflicts were solved correctly. I mean, i remember you locked the version when i complained about CI, but i dont remember about changing eslint command line.

Also you may wan to include #7111. Its a regular website now there is nothing to see..

Changes for 6.1.7 should only be cherry picked from master, otherwise it will become quite messy when cherry picking randomly across different branches.
Furthermore the PR is not yet approved.