Commit Graph

5 Commits

Author SHA1 Message Date
OzzieIsaacs b86864b407 Made kindlegen working on windows (including paths containing umlauts)
Added back buttons on edit mail, edit user, and edit book
2016-11-12 10:52:59 +01:00
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
OzzieIsaacs cd792d0ca7 Import files are now searched first from vendor folder and not from python folder
This should solve issues if different versions of packages are installed on the machine (like in #61)
2016-10-04 18:48:26 +02:00
wuqi b846cc11d8 fix some error
Fix TypeError: 'bool' object is not callable
2016-07-19 10:59:46 +08:00
janeczku 727a49db6f Add gitignore, config.ini.example 2016-04-21 23:13:41 +02:00