Ozzieisaacs 52489a484a Merge remote-tracking branch 'Knepherbird/master' into master ...

# Conflicts:
#	cps/jinjia.py
#	cps/templates/detail.html
#	cps/templates/discover.html
#	cps/templates/index.html
#	cps/web.py

2020-10-10 12:47:49 +02:00

..

services

Fixes for failed email and conversions with gdrive

2020-10-04 13:59:33 +02:00

static

Merge remote-tracking branch 'Knepherbird/master' into master

2020-10-10 12:47:49 +02:00

tasks

Fixes from merge problems

2020-10-10 07:30:03 +02:00

templates

Merge remote-tracking branch 'Knepherbird/master' into master

2020-10-10 12:47:49 +02:00

translations

Update translation files

2020-10-10 11:38:40 +02:00

__init__.py

Fix add to shelf from search

2020-10-10 10:32:53 +02:00

about.py

Fix for #1407 converting books should now be possible again

2020-05-21 18:16:11 +02:00

admin.py

Change ldap_certpath to file

2020-10-04 06:15:35 +02:00

cache_buster.py

Removed shebang on non executable scripts

2020-02-10 18:37:47 +01:00

cli.py

Code cosmetics

2020-04-19 19:08:58 +02:00

comic.py

Fix "is not a valid language" on upload of comic books

2020-09-20 15:05:52 +02:00

config_sql.py

Improvements for file uploading format restriction

2020-09-08 20:57:39 +02:00

constants.py

Added id's for testing

2020-09-27 16:00:17 +02:00

converter.py

Improvements

2020-05-09 11:01:00 +02:00

db.py

Fix add to shelf from search

2020-10-10 10:32:53 +02:00

editbooks.py

Fix for convert + email task with gdrive

2020-09-30 19:29:57 +02:00

epub.py

Fix "is not a valid language" on upload

2020-09-20 11:44:03 +02:00

fb2.py

Removed shebang on non executable scripts

2020-02-10 18:37:47 +01:00

gdrive.py

Fix "is not a valid language" on upload

2020-09-20 11:44:03 +02:00

gdriveutils.py

Fix "is not a valid language" on upload of comic books

2020-09-20 15:05:52 +02:00

helper.py

Fixes from merge problems

2020-10-10 07:30:03 +02:00

iso_language_names.py

Merge remote-tracking branch 'turkish/master'

2020-04-24 22:14:57 +02:00

isoLanguages.py

Fix "is not a valid language" on upload of comic books

2020-09-20 15:05:52 +02:00

jinjia.py

Merge remote-tracking branch 'Knepherbird/master' into master

2020-10-10 12:47:49 +02:00

kobo_auth.py

Better detection of localhost for kobo sync (possibly related to #1400)

2020-05-17 21:44:12 +02:00

kobo.py

Merge remote-tracking branch 'jef/jef/download-kobo' into master

2020-08-23 21:22:44 +02:00

logger.py

Fix "is not a valid language" on upload of comic books

2020-09-20 15:05:52 +02:00

oauth_bb.py

Merge remote-tracking branch 'oauth/oauth-typo' into master

2020-08-30 08:28:27 +02:00

oauth.py

Change some links from http to https

2020-05-09 17:11:56 +02:00

opds.py

Internal paged Search prepared

2020-06-08 17:34:03 +02:00

pagination.py

Removed shebang on non executable scripts

2020-02-10 18:37:47 +01:00

redirect.py

Removed shebang on non executable scripts

2020-02-10 18:37:47 +01:00

reverseproxy.py

Fix kobo links for reverse proxies with subdomains (and docker?) #1470

2020-07-04 13:35:08 +02:00

server.py

Merge branch 'master' into Develop

2020-09-27 13:02:25 +02:00

shelf.py

Fix add to shelf from search

2020-10-10 10:32:53 +02:00

subproc_wrapper.py

Fix version detect of binaries on windows

2020-05-24 17:24:54 +02:00

ub.py

Fix add to shelf from search

2020-10-10 10:32:53 +02:00

updater.py

Fix

2020-10-03 21:43:48 +02:00

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 'Knepherbird/master' into master

2020-10-10 12:47:49 +02:00