blitzmann 6a8ae9c0c4 Merge remote-tracking branch 'upstream/master' into tasks ... # Conflicts: # cps/helper.py		2020-08-23 21:38:56 -04:00
..
services	py27 support (I think) and some clean up	2020-08-23 21:21:55 -04:00
static
tasks	Add error handling to the email task within the convert task	2020-08-23 21:35:05 -04:00
templates	Merge remote-tracking branch 'jef/jef/download-kobo' into master	2020-08-23 21:22:44 +02:00
translations
__init__.py
about.py
admin.py	Merge remote-tracking branch 'jef/jef/download-kobo' into master	2020-08-23 21:22:44 +02:00
cache_buster.py
cli.py
comic.py
config_sql.py	Merge remote-tracking branch 'jef/jef/download-kobo' into master	2020-08-23 21:22:44 +02:00
constants.py
converter.py
db.py	Remove convert task from db.py - with the fixed from #1565, this no longer seems to be needed	2020-08-23 13:07:24 -04:00
editbooks.py	Merge remote-tracking branch 'upstream/master' into tasks	2020-08-23 21:38:56 -04:00
epub.py	Fix comma separated author names during for upload	2020-08-23 09:44:42 +02:00
fb2.py
gdrive.py	Merge remote-tracking branch 'origin/master' into master	2020-08-21 19:27:19 +02:00
gdriveutils.py	Fix for #1573	2020-08-21 19:26:58 +02:00
helper.py	Merge remote-tracking branch 'upstream/master' into tasks	2020-08-23 21:38:56 -04:00
iso_language_names.py
isoLanguages.py
jinjia.py	Added series like custom columns #1501	2020-08-11 18:56:34 +02:00
kobo_auth.py
kobo.py	Merge remote-tracking branch 'jef/jef/download-kobo' into master	2020-08-23 21:22:44 +02:00
logger.py
oauth_bb.py	Fix for #1573	2020-08-21 19:26:58 +02:00
oauth.py
opds.py
pagination.py
redirect.py
reverseproxy.py
server.py
shelf.py
subproc_wrapper.py
ub.py	Excluded series type again, as it causes problems upon reconnect	2020-08-14 19:43:54 +02:00
updater.py
uploader.py	Merge remote-tracking branch 'name/patch-2' into master	2020-08-23 10:53:18 +02:00
web.py	Merge remote-tracking branch 'upstream/master' into tasks	2020-08-23 21:38:56 -04:00
worker.py