calibre-web/cps
Ozzieisaacs 2de4bfdcf2 Merge branch 'master' into Develop
# Conflicts:
#	cps/book_formats.py
#	cps/helper.py
#	cps/web.py
2019-04-20 18:32:46 +02:00
..
static Merge branch 'master' into Develop 2019-04-20 18:32:46 +02:00
templates Merge branch 'master' into Develop 2019-04-20 18:32:46 +02:00
translations Added updated translation 2019-04-13 16:46:06 +02:00
__init__.py Merge branch 'master' into Develop 2019-04-20 18:32:46 +02:00
about.py Merge remote-tracking branch 'github/patch-1' into Develop 2019-02-24 19:34:57 +01:00
admin.py Code improvement 2019-03-24 15:58:43 +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 Fix for #812 2019-03-05 21:28:55 +01:00
converter.py More refactoring 2019-02-08 20:12:16 +01:00
db.py Merge branch 'master' into Develop 2019-04-20 18:32:46 +02:00
editbooks.py Merge branch 'master' into Develop 2019-04-20 18:32:46 +02:00
epub.py support pycountry if iso-639 is not available 2019-03-29 07:00:10 +02:00
fb2.py Updated translations 2019-01-20 19:37:45 +01:00
gdrive.py Link fixes 2019-02-16 07:23:36 +01:00
gdriveutils.py Merge branch 'master' into Develop 2019-02-20 18:09:42 +01:00
helper.py Merge branch 'master' into Develop 2019-04-20 18:32:46 +02:00
isoLanguages.py Clarified licences for isolanguages.py and reverseproxy.py 2019-04-20 17:57:06 +02:00
jinjia.py More refactoring 2019-02-08 20:12:16 +01:00
oauth_bb.py Fixes for Oauth 2019-03-10 12:54:32 +01:00
oauth.py Link fixes 2019-02-16 07:23:36 +01:00
opds.py Merge branch 'master' into Develop 2019-04-20 18:32:46 +02:00
pagination.py More refactoring 2019-02-08 20:12:16 +01:00
redirect.py Updated translations 2019-01-20 19:37:45 +01:00
reverseproxy.py Merge branch 'master' into Develop 2019-04-20 18:32:46 +02:00
server.py More refactoring 2019-02-08 20:12:16 +01:00
shelf.py Refactored shelf.py and editbooks.py 2019-03-16 16:53:22 +01:00
subproc_wrapper.py Refactor subprocess calls 2019-02-03 18:32:27 +01:00
ub.py Merge branch 'master' into Develop 2019-04-14 18:18:39 +02:00
updater.py Merge branch 'master' into Develop 2019-04-20 18:32:46 +02:00
uploader.py Merge branch 'master' into Develop 2019-04-20 18:32:46 +02:00
web.py Merge branch 'master' into Develop 2019-04-20 18:32:46 +02:00
worker.py Merge branch 'master' into Develop 2019-04-14 18:18:39 +02:00