Commit Graph

6 Commits (a6b6700a73bd3e7a2f0ec55fab45a5c2193a8a52)

Author SHA1 Message Date
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
8 years ago
Cervinko Cera 829e926770 Add PyPDF2 to vendor 8 years ago
wuqi 350f4e21e6 Add txt reader
add txt file reader,and add select for read the book
8 years ago
janeczku f7e868044e Move vendored libraries to vendor directory 8 years ago
Jan Broer faabe31730 Remove kindlegen 9 years ago
Jan Broer aef608aa10 Refactor (settings database, etc...) 9 years ago