Commit Graph

6 Commits

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
2016-10-24 19:04:16 +02:00
Cervinko Cera
829e926770 Add PyPDF2 to vendor 2016-08-07 22:12:32 +02:00
wuqi
350f4e21e6 Add txt reader
add txt file reader,and add select for read the book
2016-07-16 16:44:47 +08:00
janeczku
f7e868044e Move vendored libraries to vendor directory 2016-04-27 17:47:31 +02:00
Jan Broer
faabe31730 Remove kindlegen 2015-08-04 03:05:12 +02:00
Jan Broer
aef608aa10 Refactor (settings database, etc...) 2015-08-02 21:23:24 +02:00