2
0
mirror of https://github.com/janeczku/calibre-web synced 2024-10-31 15:20:28 +00:00
Commit Graph

16 Commits

Author SHA1 Message Date
Ozzieisaacs
7c89f0b5b9 Merge with branch develop
Release version
2020-02-23 09:08:01 +01:00
Ozzieisaacs
1d7e52c198 Merge with develop:
- No. of unread books correct calculated
- logviewer handles stream output correct
- Id for testablility in email server setup
2020-01-13 18:37:29 +01:00
Daniel Pavel
a836df9a5a more robust disposing of database session
avoid spamming the log with debug messages from libraries
2019-07-14 14:44:48 +03:00
Ozzieisaacs
f5b335e8e9 Update setup 2019-06-01 09:51:20 +02:00
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
2018-07-07 11:41:39 +02:00
Jonathan Rehm
b494b6b62a Remove vendor directory from git
Directory will automatically get created when it's used as pip's target.
2017-08-21 09:23:49 -07:00
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