OzzieIsaacs 12db39523c Merge branch 'master' of https://github.com/wuqi/calibre-web ... # Conflicts: # .gitignore # cps/static/css/colors.css # cps/static/css/style.css # cps/web.py		2016-10-24 19:04:16 +02:00
..
static	Merge branch 'master' of https://github.com/wuqi/calibre-web	2016-10-24 19:04:16 +02:00
templates	Merge branch 'master' of https://github.com/wuqi/calibre-web	2016-10-24 19:04:16 +02:00
__init__.py	custom columns unfinished	2016-04-20 19:25:47 +02:00
book_formats.py	Fix for missing metadata in pdf files	2016-08-07 23:34:23 +02:00
config.py	Merge pull request #48 from OzzieIsaacs/patch-1	2016-08-07 22:51:06 +02:00
db.py	Merge pull request #48 from OzzieIsaacs/patch-1	2016-08-07 22:51:06 +02:00
epub.py	epub uploading	2016-06-05 22:28:30 +03:00
fb2.py	resolve conflicts with PR 30	2016-08-07 18:46:38 +02:00
helper.py	add fix for janeczku/calibre-web#64 kindlegen conversation error	2016-09-21 11:27:37 +03:00
ub.py	Linux path problem solved (finally)	2016-08-07 10:32:45 +02:00
uploader.py	refactoring to make adding new formats possible	2016-06-05 18:41:47 +03:00
web.py	Merge branch 'master' of https://github.com/wuqi/calibre-web	2016-10-24 19:04:16 +02:00