You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Ozzieisaacs 4ab3dc2599 Merge branch 'master' into Develop ... # Conflicts: # cps/admin.py		5 years ago
..
services	Cleanup Kobo integration	5 years ago
static	Merge remote-tracking branch 'develop/calibur-fix-colon' into Develop	5 years ago
templates	Merge branch 'master' into Develop	5 years ago
translations	Update Italian translation	5 years ago
__init__.py	Fix language selection on python3	5 years ago
about.py	Cleanup Kobo integration	5 years ago
admin.py	Merge branch 'master' into Develop	5 years ago
cache_buster.py	Merge branch 'Develop'	5 years ago
cli.py	Added texts for allowed denied tags in configuration	5 years ago
comic.py	Merge remote-tracking branch 'merge-metadata'	5 years ago
config_sql.py	Added 2 new kobo settings: Enable Kobo Sync (currently not working) and proxy Requests to Kobo	5 years ago
constants.py	Update Version Info	5 years ago
converter.py	Merge remote-tracking branch 'github_3/hotfix/epub-import'	5 years ago
db.py	Merge remote-tracking branch 'cc/develop/custom_float' into Develop	5 years ago
editbooks.py	Merge remote-tracking branch 'cc/develop/custom_float' into Develop	5 years ago
epub.py	Merge remote-tracking branch 'merge-metadata'	5 years ago
fb2.py	Merge branch 'Develop'	5 years ago
gdrive.py	More fixes for googledrive	5 years ago
gdriveutils.py	More fixes for googledrive	5 years ago
helper.py	Fix for limiting domains (now no restriction to domain only)	5 years ago
isoLanguages.py	Moved language names from iso639.pickle to a python file	5 years ago
iso_language_names.py	Updated tiniymce + locale	5 years ago
jinjia.py	Merge branch 'Develop'	5 years ago
kobo.py	Added 2 new kobo settings: Enable Kobo Sync (currently not working) and proxy Requests to Kobo	5 years ago
kobo_auth.py	Added 2 new kobo settings: Enable Kobo Sync (currently not working) and proxy Requests to Kobo	5 years ago
logger.py	Logging to stdout, proposal form #1078	5 years ago
oauth.py	Reenabled multiple oauth provider	5 years ago
oauth_bb.py	Reenabled multiple oauth provider	5 years ago
opds.py	Fix for #768 (If email server is configured, admins can send user passwords, also domains can be denied from registration)	5 years ago
pagination.py	Merge branch 'Develop'	5 years ago
redirect.py	Merge branch 'Develop'	5 years ago
reverseproxy.py	Update Kobo	5 years ago
server.py	Update Kobo	5 years ago
shelf.py	Handle stream output in logviewer	5 years ago
subproc_wrapper.py	Merge branch 'Develop'	5 years ago
ub.py	Update Kobo	5 years ago
updater.py	Revert bug in updater.py preventing new files from being created	5 years ago
uploader.py	Merge remote-tracking branch 'merge-metadata'	5 years ago
web.py	Cleanup Kobo integration	5 years ago
worker.py	Fix for #768 (If email server is configured, admins can send user passwords, also domains can be denied from registration)	5 years ago