calibre-web/cps
Jack Darlington cf1ca21bbc Merge branch 'master' into develop
# Conflicts:
#	cps/db.py
#	cps/ub.py
#	cps/web.py
#	readme.md
#	requirements.txt
2017-03-07 22:03:10 +00:00
..
static Merge remote-tracking branch 'Douban/prod' 2017-03-07 20:30:55 +01:00
templates Merge branch 'master' into develop 2017-03-07 22:03:10 +00:00
translations Merge branch 'janeczku-master' 2017-03-07 09:01:56 +08:00
__init__.py custom columns unfinished 2016-04-20 19:25:47 +02:00
book_formats.py Merge branch 'master' into fix/syntax-python3-20170305 2017-03-07 14:06:29 +08:00
db.py Merge remote-tracking branch 'gitignore/fix/syntax-python3-20170305' 2017-03-07 20:22:28 +01:00
epub.py Fix except clause 2017-03-06 11:44:54 +08:00
fb2.py Fix except clause 2017-03-06 11:44:54 +08:00
gdriveutils.py Update for covers download via opds + inserts permissions if needed (only available with a link) 2017-03-02 23:55:32 +00:00
helper.py Merge branch 'master' into develop 2017-03-07 22:03:10 +00:00
ub.py Merge branch 'master' into develop 2017-03-07 22:03:10 +00:00
uploader.py Reuse original code logic. 2017-03-04 15:37:30 +08:00
web.py Merge branch 'master' into develop 2017-03-07 22:03:10 +00:00