Commit Graph

8 Commits (a2a48515d48829a95964ea635483d87760ca7d17)

Author SHA1 Message Date
OzzieIsaacs 453d04b566 Final fix for #86 (reverse proxy error)
renamed admin_user to admin
added configuration infos inm admin panel
8 years ago
OzzieIsaacs ba44a15891 changes for #77
Code cosmetics
#75:
- More debug infos for kindlegen and sending e-mail.
- Button for sending test e-mail.
- timeout of 5min for sending e-mail
8 years ago
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
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)
8 years ago
wuqi ab97ead264 merge test 8 years ago
janeczku d0c9bf9e0e Add shebang
Closes #29
8 years ago
janeczku f7e868044e Move vendored libraries to vendor directory 9 years ago
Jan Broer 64a9cbce2d Initial Fork from https://bitbucket.org/raphaelmutschler/calibreserver/ 9 years ago