Commit Graph

11 Commits (0329306031b2a8bd4bd9aecdc101d33fc2e9eaf1)

Author SHA1 Message Date
Jonathan Rehm b494b6b62a Remove vendor directory from git
Directory will automatically get created when it's used as pip's target.
Jack Darlington fabfcb2036 Merge branch 'master' into develop
# Conflicts:
#	.gitignore
#	cps/web.py
林檎 c439f5088c ignore kindlegen in vendor folder
Jack Darlington 7b709c15c2 GitIgnore update + fixes for initial setup
idalin 9f65eae024 add default language configuration
OzzieIsaacs ba44a15891 changes for
Code cosmetics
:
- More debug infos for kindlegen and sending e-mail.
- Button for sending test e-mail.
- timeout of 5min for sending e-mail
OzzieIsaacs b86864b407 Made kindlegen working on windows (including paths containing umlauts)
Added back buttons on edit mail, edit user, and edit book
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
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 )
wuqi b846cc11d8 fix some error
Fix TypeError: 'bool' object is not callable
janeczku 727a49db6f Add gitignore, config.ini.example