1
0
mirror of https://github.com/janeczku/calibre-web synced 2024-11-24 18:47:23 +00:00
calibre-web/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
2020-04-26 18:55:23 +02:00
..
services Fix #1311 (Enable LDAP Anonymous Login) 2020-04-18 11:48:34 +02:00
static Merge remote-tracking branch 'remove_usage_local_var_undeclared' 2020-04-24 21:05:56 +02:00
templates Merge remote-tracking branch 'opds/master' 2020-04-26 18:55:23 +02:00
translations Merge remote-tracking branch 'turkish/master' 2020-04-24 22:14:57 +02:00
__init__.py Fix https github oauth 2020-04-19 19:53:41 +08:00
about.py Fixes for oauth login after programming basic tests 2020-04-15 22:03:21 +02:00
admin.py Calibre-Web is rebooted everytime login type ic shanged (from and to standard authentication and between login methods) 2020-04-26 18:24:22 +02:00
cache_buster.py Removed shebang on non executable scripts 2020-02-10 18:37:47 +01:00
cli.py Merge with branch develop 2020-02-23 09:08:01 +01:00
comic.py English Language V2 2020-03-19 13:10:10 +11:00
config_sql.py Fix for #1087 ( Caliblur! Theme button alignment) 2020-04-17 18:16:28 +02:00
constants.py Fix for #1087 ( Caliblur! Theme button alignment) 2020-04-17 18:16:28 +02:00
converter.py Merge remote-tracking branch 'github_3/hotfix/epub-import' 2019-10-20 15:48:06 +02:00
db.py Added fix for python2 regex 2020-04-14 10:58:32 +02:00
editbooks.py Fixes for Kobo sync 2020-03-07 11:07:43 +01:00
epub.py Removed shebang on non executable scripts 2020-02-10 18:37:47 +01:00
fb2.py Removed shebang on non executable scripts 2020-02-10 18:37:47 +01:00
gdrive.py Removed shebang on non executable scripts 2020-02-10 18:37:47 +01:00
gdriveutils.py Removed shebang on non executable scripts 2020-02-10 18:37:47 +01:00
helper.py Fix #1293 (error 500 on search without query) 2020-04-14 19:27:18 +02:00
iso_language_names.py Merge remote-tracking branch 'turkish/master' 2020-04-24 22:14:57 +02:00
isoLanguages.py Moved language names from iso639.pickle to a python file 2019-07-30 15:16:24 +03:00
jinjia.py Removed shebang on non executable scripts 2020-02-10 18:37:47 +01:00
kobo_auth.py Update Translation 2020-02-23 20:07:21 +01:00
kobo.py Fix for testability of kobo 2020-03-09 20:25:59 +01:00
logger.py Logging to stdout, proposal form #1078 2019-11-16 10:09:34 +01:00
oauth_bb.py Fix for #1307 (Oauth login not working) 2020-04-16 17:58:42 +02:00
oauth.py Fix for #1307 (Oauth login not working) 2020-04-16 17:58:42 +02:00
opds.py Added redirect after create shelf 2020-04-02 20:19:05 +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 Merge branch 'master' into Develop 2020-02-17 18:42:53 +01:00
server.py Update shelfs handling, bugfix changed updater 2020-04-02 18:23:24 +02:00
shelf.py Merge remote-tracking branch 'english/master' 2020-04-03 19:46:26 +02:00
subproc_wrapper.py Removed shebang on non executable scripts 2020-02-10 18:37:47 +01:00
ub.py Fix #1307 2020-04-14 18:28:16 +02:00
updater.py Update Updater 2020-04-01 18:45:16 +02:00
uploader.py Removed shebang on non executable scripts 2020-02-10 18:37:47 +01:00
web.py Merge remote-tracking branch 'order_category/master' 2020-04-26 18:50:28 +02: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