Merge main into pr-760 and resolve conflicts

Author: crocodilestick

.gitignore

@@ -24,6 +24,8 @@ cwa-wiki/
 docs/
 .venv-activate.sh
 test_venv
+cwa.code-workspace
+
 
 
 # Test Scripts
@@ -80,6 +82,7 @@ htmlcov/
 .cache
 nosetests.xml
 coverage.xml
+coverage.md
 *.cover
 *.py,cover
 .hypothesis/
@@ -156,7 +159,7 @@ celerybeat.pid
 *.sage.py
 
 # Environments
-.env
+*.env
 .venv
 env/
 venv/
@@ -195,3 +198,6 @@ cython_debug/
 #  and can be added to the global gitignore or merged into this file.  For a more nuclear
 #  option (not recommended) you can uncomment the following to ignore the entire idea folder.
 #.idea/
+
+# Dev instance files for testing in the same folder
+instance/

CONTRIBUTORS

@@ -1,7 +1,6 @@
 CONTRIBUTORS
 
 This file is automatically generated. DO NOT EDIT MANUALLY.
-Generated on: 2025-10-29T11:15:51.677020Z
 
 Upstream project: https://github.com/janeczku/calibre-web
 Fork project (Calibre-Web Automated, since 2024): https://github.com/crocodilestick/calibre-web-automated
@@ -12,7 +11,7 @@ Copyright (C) 2018-2025 Calibre-Web contributors
 Copyright (C) 2024-2025 Calibre-Web Automated contributors
 # Upstream Contributors (janeczku/calibre-web)
 
-- OzzieIsaacs (anon) (2750 commits)
+- OzzieIsaacs (anon) (2758 commits)
 - Ozzie Isaacs (anon) (263 commits)
 - cbartondock (96 commits)
 - idalin (69 commits)
@@ -123,6 +122,7 @@ Copyright (C) 2024-2025 Calibre-Web Automated contributors
 - h1f0x (2 commits)
 - halkeye (2 commits)
 - hitsounds (2 commits)
+- holzerseb (2 commits)
 - issmirnov (2 commits)
 - jef (2 commits)
 - jfenske89 (2 commits)
@@ -133,6 +133,7 @@ Copyright (C) 2024-2025 Calibre-Web Automated contributors
 - nanu-c (2 commits)
 - norangebit (2 commits)
 - Northguy (2 commits)
+- o-F3L1X-o (2 commits)
 - peperunas (2 commits)
 - petersonev (2 commits)
 - rafarq (2 commits)
@@ -154,6 +155,7 @@ Copyright (C) 2024-2025 Calibre-Web Automated contributors
 - adocampo (1 commits)
 - aexvir (1 commits)
 - akushsky (1 commits)
+- alasano (1 commits)
 - Allram (1 commits)
 - altair (1 commits)
 - anatoliifetisov (1 commits)
@@ -254,6 +256,7 @@ Copyright (C) 2024-2025 Calibre-Web Automated contributors
 - nelsg2 (1 commits)
 - nferrari (1 commits)
 - NickWick13 (1 commits)
+- Nico31240 (1 commits)
 - oguzkilcan (1 commits)
 - overhacked (1 commits)
 - petervirtech (1 commits)
@@ -272,6 +275,8 @@ Copyright (C) 2024-2025 Calibre-Web Automated contributors
 - ruben-herold (1 commits)
 - ryanlong1004 (1 commits)
 - sartoshi-foot-dao (1 commits)
+- schnabelewobski (1 commits)
+- shsm0520 (1 commits)
 - skiman6010 (1 commits)
 - SpaceWhite (1 commits)
 - theopsall (1 commits)
@@ -298,15 +303,16 @@ Copyright (C) 2024-2025 Calibre-Web Automated contributors
 - zhiyue (1 commits)
 # Fork Contributors (crocodilestick/calibre-web-automated)
 
-- crocodilestick (745 commits)
+- crocodilestick (776 commits)
 - jmarmstrong1207 (73 commits)
 - demitrix (30 commits)
 - sirwolfgang (22 commits)
 - Domoel (21 commits)
+- wolffshots (14 commits)
 - angelicadvocate (9 commits)
+- jgoguen (9 commits)
 - natabat (8 commits)
 - nstwfdev (8 commits)
-- jgoguen (7 commits)
 - alva-seal (6 commits)
 - smevawala (5 commits)
 - Aymendje (4 commits)
@@ -322,9 +328,11 @@ Copyright (C) 2024-2025 Calibre-Web Automated contributors
 - sethvoltz (2 commits)
 - Strubbl (2 commits)
 - tecosaur (2 commits)
+- TexGG (2 commits)
 - tseho (2 commits)
 - Valenth (2 commits)
 - a-eukarya (1 commits)
+- AlexSat (1 commits)
 - Andrej Kralj (anon) (1 commits)
 - bcrdncola (1 commits)
 - brunofin (1 commits)
@@ -348,6 +356,8 @@ Copyright (C) 2024-2025 Calibre-Web Automated contributors
 - jack1lee1995 (anon) (1 commits)
 - jspiers (1 commits)
 - kevpam (1 commits)
+- lazyusername (1 commits)
+- marauder37 (1 commits)
 - Marodeur80 (anon) (1 commits)
 - Matteo Benaroyo (anon) (1 commits)
 - morpheus65535 (1 commits)
@@ -362,6 +372,7 @@ Copyright (C) 2024-2025 Calibre-Web Automated contributors
 - spezzino (1 commits)
 - stadler-pascal (1 commits)
 - stefanop1 (1 commits)
+- tomried (1 commits)
 - Turmaxx (1 commits)
 - ugyes (1 commits)
 - werdeil (1 commits)