calibre-web/cps
Ozzieisaacs 7f34073955 Merge branch 'master' into Develop
# Conflicts:
#	cps/web.py
#	readme.md
2019-02-03 17:33:54 +01:00
..
static Merge remote-tracking branch 'audiobook/Branch_c27805b' 2019-01-27 11:14:38 +01:00
templates Merge branch 'master' into Develop 2019-02-03 17:33:54 +01:00
translations Fixes Google Drive 2019-02-03 16:38:27 +01:00
__init__.py
book_formats.py Updated translations 2019-01-20 19:37:45 +01:00
cache_buster.py Updated translations 2019-01-20 19:37:45 +01:00
cli.py Updated translations 2019-01-20 19:37:45 +01:00
comic.py Updated translations 2019-01-20 19:37:45 +01:00
converter.py Updated translations 2019-01-20 19:37:45 +01:00
db.py Updated translations 2019-01-20 19:37:45 +01:00
epub.py Updated translations 2019-01-20 19:37:45 +01:00
fb2.py Updated translations 2019-01-20 19:37:45 +01:00
gdriveutils.py Fixes Google Drive 2019-02-03 16:38:27 +01:00
helper.py Fixes Google Drive 2019-02-03 16:38:27 +01:00
oauth.py Add OAuth support: GitHub & Google 2018-10-14 16:51:00 +08:00
redirect.py Updated translations 2019-01-20 19:37:45 +01:00
reverseproxy.py Updated translations 2019-01-20 19:37:45 +01:00
server.py Fix viewing Publisher settings for other users 2019-01-26 19:06:54 +01:00
ub.py Merge remote-tracking branch 'oauth/oauth' into Develop 2019-01-27 11:22:22 +01:00
updater.py Fixes Google Drive 2019-02-03 16:38:27 +01:00
uploader.py Updated translations 2019-01-20 19:37:45 +01:00
web.py Merge branch 'master' into Develop 2019-02-03 17:33:54 +01:00
worker.py Updated translations 2019-01-20 19:37:45 +01:00