Ozzieisaacs 38c28f4358 Merge branch 'master' into Develop ... # Conflicts: # cps/admin.py # cps/constants.py # cps/static/css/caliBlur.min.css # cps/uploader.py		2020-05-17 16:22:58 +02:00
..
services	Make goodreads compatible for betterreads dependency	2020-05-06 20:57:54 +02:00
static	Merge branch 'master' into Develop	2020-05-17 16:22:58 +02:00
templates	Merge branch 'master' into Develop	2020-05-17 16:22:58 +02:00
translations	Merge remote-tracking branch 'nl/master'	2020-05-15 20:34:30 +02:00
__init__.py	Merge branch 'master' into Develop	2020-05-10 19:24:55 +02:00
about.py	Improvements	2020-05-09 11:01:00 +02:00
admin.py	Merge branch 'master' into Develop	2020-05-17 16:22:58 +02:00
cache_buster.py
cli.py
comic.py	Fix #985 (png and webp are extracted as cover files from comic files)	2020-05-02 11:24:30 +02:00
config_sql.py	Merge branch 'master' into Develop	2020-05-17 16:22:58 +02:00
constants.py	Merge branch 'master' into Develop	2020-05-17 16:22:58 +02:00
converter.py	Improvements	2020-05-09 11:01:00 +02:00
db.py	Merge branch 'master' into Develop	2020-05-12 16:16:04 +02:00
editbooks.py	Autodetect binaries	2020-05-09 11:04:35 +02:00
epub.py
fb2.py
gdrive.py
gdriveutils.py
helper.py	Merge branch 'master' into Develop	2020-05-13 20:16:29 +02:00
iso_language_names.py
isoLanguages.py
jinjia.py
kobo.py	Fix for #1391 (Kobo sync not working if series is given, but no series_index)	2020-05-17 10:46:48 +02:00
kobo_auth.py
logger.py
oauth.py	Change some links from http to https	2020-05-09 17:11:56 +02:00
oauth_bb.py
opds.py
pagination.py
redirect.py
reverseproxy.py
server.py
shelf.py
subproc_wrapper.py
ub.py	Merge branch 'master' into Develop	2020-05-13 20:03:54 +02:00
updater.py
uploader.py	Merge branch 'master' into Develop	2020-05-17 16:22:58 +02:00
web.py	Merge branch 'master' into Develop	2020-05-17 16:22:58 +02:00
worker.py	Merge branch 'master' into Develop	2020-05-12 16:16:04 +02:00