HermesFactory/cloud-reader
Archived
4
0
Fork 0
Code Issues 14 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' into feature/customizable-mobile-reading-experience

Browse Source 
Resolve merge conflicts:
- backend/apps/books/: Keep main's models (EBook, BookChapter, etc.)
- frontend/src/App.tsx: Keep /read/:id route + main's all routes
- web/ files: Accept deletion (content ported to frontend/)
This commit is contained in:
Marko (Hermes Implementer)
2026-05-29 05:59:10 +00:00
parent 74fdae61db 3f626259e8
commit edac7cb08a
102 changed files with 4400 additions and 2847 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/config/django.py
+5 -1
View File
@@ -141,13 +141,17 @@ USE_I18N = True
USE_TZ = True
# ---------------------------------------------------------------------------
# Static / Media
# Static / Media / Uploads
# ---------------------------------------------------------------------------
STATIC_URL = "static/"
STATIC_ROOT = BASE_DIR / "staticfiles"
MEDIA_URL = "media/"
MEDIA_ROOT = BASE_DIR / "media"
# Maximum upload size: 50MB
DATA_UPLOAD_MAX_MEMORY_SIZE = 52_428_800
FILE_UPLOAD_MAX_MEMORY_SIZE = 52_428_800
# ---------------------------------------------------------------------------
# Default primary key
# ---------------------------------------------------------------------------