Ozzieisaacs
|
4708347c16
|
Merge branch 'Develop'
# Conflicts:
# MANIFEST.in
# README.md
# cps/helper.py
# cps/static/js/archive/archive.js
# cps/translations/nl/LC_MESSAGES/messages.mo
# cps/translations/nl/LC_MESSAGES/messages.po
# cps/ub.py
# cps/updater.py
# cps/web.py
# cps/worker.py
# optional-requirements.txt
|
6 years ago |
|
OzzieIsaacs
|
7d3fadb685
|
Improved compability for gevent (version 1.3.x & Windows)
Bugfix gdrive naming of client_secrets.json
Bugfix handling of gdrive with working folder not cps root folder
|
7 years ago |
|
Jonathan Rehm
|
b494b6b62a
|
Remove vendor directory from git
Directory will automatically get created when it's used as pip's target.
|
7 years ago |
|
Jack Darlington
|
fabfcb2036
|
Merge branch 'master' into develop
# Conflicts:
# .gitignore
# cps/web.py
|
8 years ago |
|
林檎
|
c439f5088c
|
ignore kindlegen in vendor folder
|
8 years ago |
|
Jack Darlington
|
7b709c15c2
|
GitIgnore update + fixes for initial setup
|
8 years ago |
|
idalin
|
9f65eae024
|
add default language configuration
|
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
|
b86864b407
|
Made kindlegen working on windows (including paths containing umlauts)
Added back buttons on edit mail, edit user, and edit book
|
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
|
b846cc11d8
|
fix some error
Fix TypeError: 'bool' object is not callable
|
9 years ago |
|
janeczku
|
727a49db6f
|
Add gitignore, config.ini.example
|
9 years ago |