Ozzieisaacs 8646f8f23a Merge branch 'Develop' ...

# Conflicts:
#	cps/__init__.py

2020-05-01 14:51:54 +02:00

..

services

…

static

Merge branch 'master' into Develop

2020-04-30 18:08:28 +02:00

templates

Fix error 404 on reset password (Fix #1342)

2020-05-01 08:33:50 +02:00

translations

Merge remote-tracking branch 'ru/master'

2020-04-29 12:06:35 +02:00

__init__.py

Merge branch 'Develop'

2020-05-01 14:51:54 +02:00

about.py

…

admin.py

Improved errorhandling for resending password

2020-05-01 12:00:45 +02:00

cache_buster.py

…

cli.py

…

comic.py

…

config_sql.py

…

constants.py

Added missing upload format

2020-05-01 13:34:16 +02:00

converter.py

…

db.py

Merge branch 'master' into Develop

2020-04-30 18:08:28 +02:00

editbooks.py

Fixes for deleting books(error handling and user feedback)

2020-05-01 10:26:35 +02:00

epub.py

…

fb2.py

…

gdrive.py

…

gdriveutils.py

…

helper.py

Improved errorhandling for resending password

2020-05-01 12:00:45 +02:00

iso_language_names.py

…

isoLanguages.py

…

jinjia.py

…

kobo_auth.py

…

kobo.py

Merge branch 'master' into Develop

2020-04-30 18:08:28 +02:00

logger.py

…

oauth_bb.py

…

oauth.py

…

opds.py

…

pagination.py

…

redirect.py

…

reverseproxy.py

…

server.py

…

shelf.py

…

subproc_wrapper.py

…

ub.py

Fix from tests

2020-04-30 20:58:01 +02:00

updater.py

…

uploader.py

…

web.py

Merge branch 'master' into Develop

2020-04-30 18:08:28 +02:00

worker.py

…