calibre-web/cps
Ozzieisaacs 38c28f4358 Merge branch 'master' into Develop
# Conflicts:
#	cps/admin.py
#	cps/constants.py
#	cps/static/css/caliBlur.min.css
#	cps/uploader.py
2020-05-17 16:22:58 +02:00
..
services Make goodreads compatible for betterreads dependency 2020-05-06 20:57:54 +02:00
static Merge branch 'master' into Develop 2020-05-17 16:22:58 +02:00
templates Merge branch 'master' into Develop 2020-05-17 16:22:58 +02:00
translations Merge remote-tracking branch 'nl/master' 2020-05-15 20:34:30 +02:00
__init__.py Merge branch 'master' into Develop 2020-05-10 19:24:55 +02:00
about.py Improvements 2020-05-09 11:01:00 +02:00
admin.py Merge branch 'master' into Develop 2020-05-17 16:22:58 +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 #985 (png and webp are extracted as cover files from comic files) 2020-05-02 11:24:30 +02:00
config_sql.py Merge branch 'master' into Develop 2020-05-17 16:22:58 +02:00
constants.py Merge branch 'master' into Develop 2020-05-17 16:22:58 +02:00
converter.py Improvements 2020-05-09 11:01:00 +02:00
db.py Merge branch 'master' into Develop 2020-05-12 16:16:04 +02:00
editbooks.py Autodetect binaries 2020-05-09 11:04:35 +02: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 Merge branch 'master' into Develop 2020-05-13 20:16:29 +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 Code cosmetics 2020-04-19 19:08:58 +02:00
kobo_auth.py Code cosmetics 2020-04-27 20:01:13 +02:00
kobo.py Fix for #1391 (Kobo sync not working if series is given, but no series_index) 2020-05-17 10:46:48 +02:00
logger.py Code cosmetics 2020-04-19 19:08:58 +02:00
oauth_bb.py Fix for #1307 (Oauth login not working) 2020-04-16 17:58:42 +02:00
oauth.py Change some links from http to https 2020-05-09 17:11:56 +02:00
opds.py Fix opds with shelves 2020-04-26 08:40:53 +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 bugfix on create shelv via kobo sync protocol 2020-04-25 20:02:55 +02:00
shelf.py Merge remote-tracking branch 'kobo/shelves' into Develop 2020-04-24 16:56:08 +02:00
subproc_wrapper.py Code cosmetics 2020-04-19 19:08:58 +02:00
ub.py Merge branch 'master' into Develop 2020-05-13 20:03:54 +02:00
updater.py Code cosmetics 2020-04-19 19:08:58 +02:00
uploader.py Merge branch 'master' into Develop 2020-05-17 16:22:58 +02:00
web.py Merge branch 'master' into Develop 2020-05-17 16:22:58 +02:00
worker.py Merge branch 'master' into Develop 2020-05-12 16:16:04 +02:00