1
0
mirror of https://github.com/janeczku/calibre-web synced 2025-10-13 22:57:39 +00:00

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
This commit is contained in:
Ozzieisaacs
2019-02-24 10:39:37 +01:00
14 changed files with 491 additions and 497 deletions

View File

@@ -225,7 +225,10 @@ def get_valid_filename(value, replace_whitespace=True):
value = value[:128]
if not value:
raise ValueError("Filename cannot be empty")
return value
if sys.version_info.major == 3:
return value
else:
return value.decode('utf-8')
def get_sorted_author(value):