Jack Darlington
|
fabfcb2036
|
Merge branch 'master' into develop
# Conflicts:
# .gitignore
# cps/web.py
|
2017-03-06 19:17:00 +00:00 |
|
林檎
|
c439f5088c
|
ignore kindlegen in vendor folder
|
2017-03-01 17:42:56 +08:00 |
|
Jack Darlington
|
7b709c15c2
|
GitIgnore update + fixes for initial setup
|
2017-02-22 22:06:59 +00:00 |
|
idalin
|
9f65eae024
|
add default language configuration
|
2017-01-09 13:47:50 +08:00 |
|
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
|
2016-12-23 09:53:39 +01:00 |
|
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 |
|