Ozzieisaacs 2eec329bdf Merge branch 'master' into Develop ...

# Conflicts:
#	cps/templates/user_edit.html
#	optional-requirements.txt

2020-01-26 19:29:36 +01:00

..

services

Cleanup Kobo integration

2020-01-20 06:14:53 +01:00

static

Merge remote-tracking branch 'develop/calibur-fix-colon' into Develop

2020-01-15 17:57:00 +01:00

templates

Merge branch 'master' into Develop

2020-01-26 19:29:36 +01:00

translations

Update Czech translation

2020-01-20 20:32:41 +01:00

__init__.py

Fix language selection on python3

2019-09-06 20:56:17 +02:00

about.py

Cleanup Kobo integration

2020-01-20 06:14:53 +01:00

admin.py

Added 2 new kobo settings: Enable Kobo Sync (currently not working) and proxy Requests to Kobo

2020-01-26 16:52:40 +01:00

cache_buster.py

Merge branch 'Develop'

2019-07-13 20:54:21 +02:00

cli.py

Added texts for allowed denied tags in configuration

2020-01-11 13:28:09 +01:00

comic.py

Merge remote-tracking branch 'merge-metadata'

2019-12-09 20:53:16 +01:00

config_sql.py

Added 2 new kobo settings: Enable Kobo Sync (currently not working) and proxy Requests to Kobo

2020-01-26 16:52:40 +01:00

constants.py

Merge branch 'master' into Develop

2020-01-26 19:29:36 +01:00

converter.py

Merge remote-tracking branch 'github_3/hotfix/epub-import'

2019-10-20 15:48:06 +02:00

db.py

Merge remote-tracking branch 'cc/develop/custom_float' into Develop

2020-01-15 17:58:23 +01:00

editbooks.py

Merge remote-tracking branch 'cc/develop/custom_float' into Develop

2020-01-15 17:58:23 +01:00

epub.py

Merge remote-tracking branch 'merge-metadata'

2019-12-09 20:53:16 +01:00

fb2.py

Merge branch 'Develop'

2019-07-13 20:54:21 +02:00

gdrive.py

More fixes for googledrive

2019-12-14 22:22:27 +01:00

gdriveutils.py

More fixes for googledrive

2019-12-14 22:22:27 +01:00

helper.py

Fix for limiting domains (now no restriction to domain only)

2020-01-18 10:32:09 +01:00

iso_language_names.py

Updated tiniymce + locale

2020-01-12 14:11:53 +01:00

isoLanguages.py

Moved language names from iso639.pickle to a python file

2019-07-30 15:16:24 +03:00

jinjia.py

Merge branch 'Develop'

2019-07-13 20:54:21 +02:00

kobo_auth.py

Added 2 new kobo settings: Enable Kobo Sync (currently not working) and proxy Requests to Kobo

2020-01-26 16:52:40 +01:00

kobo.py

Added 2 new kobo settings: Enable Kobo Sync (currently not working) and proxy Requests to Kobo

2020-01-26 16:52:40 +01:00

logger.py

Logging to stdout, proposal form #1078

2019-11-16 10:09:34 +01:00

oauth_bb.py

Reenabled multiple oauth provider

2019-07-21 09:45:36 +02:00

oauth.py

Reenabled multiple oauth provider

2019-07-21 09:45:36 +02:00

opds.py

Fix for #768 (If email server is configured, admins can send user passwords, also domains can be denied from registration)

2020-01-01 17:29:01 +01:00

pagination.py

Merge branch 'Develop'

2019-07-13 20:54:21 +02:00

redirect.py

Merge branch 'Develop'

2019-07-13 20:54:21 +02:00

reverseproxy.py

Update Kobo

2020-01-26 14:42:53 +01:00

server.py

Update Kobo

2020-01-26 14:42:53 +01:00

shelf.py

Handle stream output in logviewer

2020-01-07 20:26:59 +01:00

subproc_wrapper.py

Merge branch 'Develop'

2019-07-13 20:54:21 +02:00

ub.py

Update Kobo

2020-01-26 14:42:53 +01:00

updater.py

Revert bug in updater.py preventing new files from being created

2019-09-24 19:00:47 +02:00

uploader.py

Merge remote-tracking branch 'merge-metadata'

2019-12-09 20:53:16 +01:00

web.py

Cleanup Kobo integration

2020-01-20 06:14:53 +01:00

worker.py

Fix for #768 (If email server is configured, admins can send user passwords, also domains can be denied from registration)

2020-01-01 17:29:01 +01:00