Commit Graph

1066 Commits (feb6a71f95e238b9b32a044b0acef6e5e3d2704f)

Author SHA1 Message Date
Ozzieisaacs feb6a71f95 Fix uncompressed cbz files
merge from master -> file extension limitation
Ozzieisaacs 1561a4abdf Comic improvments
Ozzieisaacs f483ca3214 Code cosmetics
Bugfix uploadprogress
Bugfix mature content
Reenable read and unread feature
Ozzieisaacs 0224d45961 Code cosmetics
Ozzieisaacs 0be17ed157 Refactored sidebar (some parts are missing)
Ozzieisaacs f0de822ce7 Start refactor sidebar and view settings sidebar
Ozzieisaacs fb23db57b4 Added filtering of authors, series, categories, publishers
Ozzieisaacs fda977b155 Fix for users with umlauts
Ozzieisaacs 68a36597ab Fix opds login on python3
Ozzieisaacs de58d0a4d8 Merge remote-tracking branch 'metadata/Develop' into Develop
Update logger for updater
jianyun.zhao 54a006a420 [fix] Add a scroll bar to a long list of meta information
Ozzieisaacs 246d7673a9 Corrected file header with copyright information
Ozzieisaacs eef4787b79 Merge remote-tracking branch 'github/patch-1' into Develop
Oauth is optional again
Ozzieisaacs 1de3929988 Unicode
Ozzieisaacs cc3088c52f Merge branch 'master' into Develop
# Conflicts:
#	cps/book_formats.py
#	cps/static/js/libs/bootstrap.min.js
#	cps/templates/detail.html
#	cps/templates/layout.html
#	cps/web.py

Improvement updater (up to 100 releases are loaded at once)
Fix oauth pathes
Fix oauth without registering
Ozzieisaacs 0facb8fffa Fix
Ozzieisaacs 1a7052b287 Update pdf upload
Translation of uploadprogress dialog
AngelByDay 38307ececb
Force namespace resolution of imports
The current import for some local modules causes errors when those already exist in site-packages on the target system.
Namely "import db" is ambiguous and may cause errors due to loading of the 'db' PyPI package instead of the module.
Ozzieisaacs 17b7333992 Merge remote-tracking branch 'caliblur/master'
leram84 ae279c5123
fixed description read-more button
Ozzieisaacs e92497b34e Merge branch 'master' into Develop
# Conflicts:
#	cps/gdriveutils.py
#	cps/helper.py
Ozzieisaacs ae7c4908f9 Fix
Ozzieisaacs ea1a882353 Merge remote-tracking branch 'origin/master'
hexeth 9a0e8fefb7
re-add loader code
Matt c07cb23ef2 Merge branch 'master' of git://github.com/janeczku/calibre-web
hexeth 5a863541de
Fix object object
Ozzie Isaacs 4c80db4324
Revert bootstrap update 3.4.0 -> 3.3.7
Ozzieisaacs 2505f0c1e4 Merge remote-tracking branch 'filename/patch-1'
Fixes for Google Drive
Fabian Wüthrich 7fb9bf8889
Truncate single quote in upload file name
Ozzieisaacs 3d5d95904a Oauth working somehow (?)
Ozzieisaacs a0be02e687 Ldap working
Ozzieisaacs 237502ae6b Output of errormessage for invalid CALIBRE_PORT value
Ozzieisaacs 37007dafee Merge branch 'master' into Develop
# Conflicts:
#	cps/templates/layout.html
#	cps/web.py
#	readme.md
Ozzieisaacs 56826f67fc progressbar during upload thanks to jim3ma
Ozzieisaacs 0fa45f5800 Merge remote-tracking branch 'github/master'
Improvement for 
Ozzieisaacs 4230226716 Link fixes
Fixes reader button visible in detail view
Fix formats to convert (added htmlz)
Fix logger in updater
Added request "v3" of github api on update
Fix quotes parameter on external calls
E-Mail logger working more stable (also on python3)
Routing fixes
Change import in ub
lorek123 d508b909d1 update js and css libs, especially to fix xss in Jquery and Bootstrap
Ozzieisaacs c1ef1bcd19 User and admin pages are working again
Ozzieisaacs 1fc4bc5204 Fix routes
Fix error page
Ozzieisaacs f5235b1d4c Uploader progress bar
Fixes imports and routes
Merge branch 'master' into Develop
Finished routing
Ozzieisaacs d58d792f56 Catch Imagemagick policy error
Ozzieisaacs d6ee8f75e9 More refactoring
Ozzieisaacs a00d93a2d9 Working again (basically)
Ozzieisaacs 561d40f8ff Merge branch 'master' into Develop
Ozzieisaacs 6fc4b318e8 cover folders beautified
Ozzieisaacs 36229076f7 Refactor subprocess calls
Ozzieisaacs 7f34073955 Merge branch 'master' into Develop
# Conflicts:
#	cps/web.py
#	readme.md
Ozzieisaacs ea98323c06 Fixes Google Drive
Improved user guidance for Google Drive
Improved Errorhandling for Google Drive
Update french translation
Added ukranian translation
Improvements on updater: calibre-web.log1, calibre-web.log2, gdrive_credentials, settings.yaml, gdrive.db, .git are no longer deleted upon update
Ozzieisaacs b75b91606c Fix config oauth-UI
Ozzieisaacs 80582573f5 Merge remote-tracking branch 'oauth/oauth' into Develop
# Conflicts:
#	cps/templates/config_edit.html
#	cps/ub.py
#	cps/web.py