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.
parallel-library/cps
Ozzieisaacs 44284ea5fb Merge remote-tracking branch 'opds/master'
# Conflicts:
#	cps/translations/cs/LC_MESSAGES/messages.po
#	cps/translations/de/LC_MESSAGES/messages.po
#	cps/translations/es/LC_MESSAGES/messages.po
#	cps/translations/fi/LC_MESSAGES/messages.po
#	cps/translations/fr/LC_MESSAGES/messages.po
#	cps/translations/hu/LC_MESSAGES/messages.po
#	cps/translations/it/LC_MESSAGES/messages.po
#	cps/translations/ja/LC_MESSAGES/messages.po
#	cps/translations/km/LC_MESSAGES/messages.po
#	cps/translations/nl/LC_MESSAGES/messages.po
#	cps/translations/pl/LC_MESSAGES/messages.po
#	cps/translations/ru/LC_MESSAGES/messages.po
#	cps/translations/sv/LC_MESSAGES/messages.po
#	cps/translations/uk/LC_MESSAGES/messages.po
#	cps/translations/zh_Hans_CN/LC_MESSAGES/messages.po
#	messages.pot
5 years ago
..
services Fix #1311 (Enable LDAP Anonymous Login) 5 years ago
static Merge remote-tracking branch 'remove_usage_local_var_undeclared' 5 years ago
templates Merge remote-tracking branch 'opds/master' 5 years ago
translations Merge remote-tracking branch 'turkish/master' 5 years ago
__init__.py Fix https github oauth 5 years ago
about.py Fixes for oauth login after programming basic tests 5 years ago
admin.py Calibre-Web is rebooted everytime login type ic shanged (from and to standard authentication and between login methods) 5 years ago
cache_buster.py Removed shebang on non executable scripts 5 years ago
cli.py Merge with branch develop 5 years ago
comic.py English Language V2 5 years ago
config_sql.py Fix for #1087 ( Caliblur! Theme button alignment) 5 years ago
constants.py Fix for #1087 ( Caliblur! Theme button alignment) 5 years ago
converter.py Merge remote-tracking branch 'github_3/hotfix/epub-import' 5 years ago
db.py Added fix for python2 regex 5 years ago
editbooks.py Fixes for Kobo sync 5 years ago
epub.py Removed shebang on non executable scripts 5 years ago
fb2.py Removed shebang on non executable scripts 5 years ago
gdrive.py Removed shebang on non executable scripts 5 years ago
gdriveutils.py Removed shebang on non executable scripts 5 years ago
helper.py Fix #1293 (error 500 on search without query) 5 years ago
isoLanguages.py Moved language names from iso639.pickle to a python file 5 years ago
iso_language_names.py Merge remote-tracking branch 'turkish/master' 5 years ago
jinjia.py Removed shebang on non executable scripts 5 years ago
kobo.py Fix for testability of kobo 5 years ago
kobo_auth.py Update Translation 5 years ago
logger.py Logging to stdout, proposal form #1078 5 years ago
oauth.py Fix for #1307 (Oauth login not working) 5 years ago
oauth_bb.py Fix for #1307 (Oauth login not working) 5 years ago
opds.py Added redirect after create shelf 5 years ago
pagination.py Removed shebang on non executable scripts 5 years ago
redirect.py Removed shebang on non executable scripts 5 years ago
reverseproxy.py Merge branch 'master' into Develop 5 years ago
server.py Update shelfs handling, bugfix changed updater 5 years ago
shelf.py Merge remote-tracking branch 'english/master' 5 years ago
subproc_wrapper.py Removed shebang on non executable scripts 5 years ago
ub.py Fix #1307 5 years ago
updater.py Update Updater 5 years ago
uploader.py Removed shebang on non executable scripts 5 years ago
web.py Merge remote-tracking branch 'order_category/master' 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