Commit graph

63 commits

Author SHA1 Message Date
Ozzieisaacs
47641eee59 Merge branch 'master' into Develop 2020-05-12 16:16:04 +02:00
Ozzieisaacs
33472567de Improved Debug output on send email 2020-05-11 19:28:22 +02:00
Ozzieisaacs
718d50a037 Starting again without traceback (moved gdriveutil import) 2020-05-09 12:17:28 +02:00
Ozzieisaacs
0138ff9e16 Added additional config options 2020-05-02 10:18:01 +02:00
Ozzieisaacs
9bc085a23e Fixes for comic reader 2020-05-02 09:35:14 +02:00
Ozzieisaacs
2d92818613 Code cosmetics 2020-04-27 20:01:13 +02:00
Ozzieisaacs
513ac6cfb4 Fix for #768 (If email server is configured, admins can send user passwords, also domains can be denied from registration)
Fixes from tests
Fix response opds with read/unread
changed db_reconnect
Changed output for error 500 (now including error message)
Fix in task queue after 20 messages
2020-01-01 17:29:01 +01:00
Ozzieisaacs
e0faad1e59 Handle no write permission to tmp folder (#1060) 2019-12-08 09:40:54 +01:00
Ozzieisaacs
8af178c19c Fix for gdrive not working #1081 2019-11-26 10:46:06 +01:00
Ozzieisaacs
78f9ee86b1 Fix pdf cover
Fix massadding books
Add feature inform of duplicate books
2019-11-26 08:19:03 +01:00
Ozzieisaacs
d7ea5bb9d7 Fix for #1037
Update German translation
2019-09-17 18:25:17 +02:00
Ozzieisaacs
fc4dc36c65 Fix #969 (duplicate code "init" in epub reader)
Fix for #890
2019-07-23 19:26:01 +02:00
Ozzieisaacs
9f64a96502 Fix for #890 2019-07-22 18:28:45 +02:00
Ozzieisaacs
26a7d9ef30 Merge branch 'Develop'
# Conflicts:
#	cps/__init__.py
#	cps/about.py
#	cps/admin.py
#	cps/cli.py
#	cps/config_sql.py
#	cps/constants.py
#	cps/converter.py
#	cps/db.py
#	cps/editbooks.py
#	cps/gdriveutils.py
#	cps/helper.py
#	cps/logger.py
#	cps/oauth.py
#	cps/server.py
#	cps/services/simpleldap.py
#	cps/ub.py
#	cps/web.py
#	cps/worker.py
#	optional-requirements.txt
#	setup.cfg
#	setup.py
2019-07-17 19:07:05 +02:00
Daniel Pavel
63634961d4 cleaner worker api
the worker thread now stops on its own
2019-07-14 20:28:32 +03:00
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
2019-07-13 20:54:21 +02:00
Ozzieisaacs
e734bb120a Merge remote-tracking branch 'github/config_sql' into Develop 2019-07-09 19:29:58 +02:00
Ozzieisaacs
499a66dfb0 Additional glyphicons for music on search and author page
Fix duplicate user and email (now case insensitive)
Output of calibre on stderr is now logged (full traceback in debug-log, otherwise, only errormessage)
Natural sorting for comic reader
Fix for long running tasks
2019-07-06 14:46:25 +02:00
Ozzieisaacs
f79d549910 Fix duplicate user and email (now case insensitive #948)
Fix sorting in comics (#950)
Fix log error on Calibre converter error (#953)
Fix long running tasks (#954)
2019-07-06 14:35:12 +02:00
Ozzieisaacs
572b5427c7 Fix Encoding issues for python2 2019-06-23 21:11:45 +02:00
Ozzieisaacs
26949970d8 Revert logging functions
Fix access logger for tornado
2019-06-11 20:07:51 +02:00
Ozzieisaacs
546ed65e1d Update logging
Fix sort order author
Fixes sorting view
Moved version info
added feature limit listening to single ipaddress
2019-06-10 14:15:21 +02:00
Ozzieisaacs
14b6202eec Code cosmetics
Fixes func in helper,web
Fixes for pdf reader
fixes for calling from another folder
renamed to calibreweb for importing in python caller script
2019-06-08 13:45:27 +02:00
Daniel Pavel
b89ab9ff10 logging clean-up
- moved most constants to separate file
- sorted and cleaned-up imports
- moved logging setup to separate file
2019-06-06 18:10:22 +03:00
Ozzieisaacs
bb0d5c5538 Working for pip and "normal" start for python3 and python2 2019-06-02 09:33:45 +02:00
Ozzieisaacs
4ae9d4a749 Merge branch 'master' into Develop
# Conflicts:
#	cps/web.py
#	cps/worker.py
2019-04-14 18:18:39 +02:00
Ozzieisaacs
436c2671d1 Fix delete domain entries
Fix error handling smtp.authentication error
2019-04-14 14:08:49 +02:00
Ozzieisaacs
a360b1759a Code cosmetics
bugfix import HttpError from pydrive
2019-03-16 17:20:14 +01:00
Ozzieisaacs
4230226716 Link fixes
Fixes reader button visible in detail view
Fix formats to convert (added htmlz)
Fix logger in updater
Added request "v3" of github api on update
Fix quotes parameter on external calls
E-Mail logger working more stable (also on python3)
Routing fixes
Change import in ub
2019-02-16 07:23:36 +01:00
Ozzieisaacs
a00d93a2d9 Working again (basically) 2019-02-06 21:52:32 +01:00
Ozzieisaacs
36229076f7 Refactor subprocess calls 2019-02-03 18:32:27 +01:00
Ozzieisaacs
836c6fd245 Updated translations
Added license texts in flies
2019-01-20 19:37:45 +01:00
Ozzieisaacs
32568c9009 Update testing
Update custom columns unicode enums
2019-01-14 20:27:53 +01:00
Ozzieisaacs
d0fd1a4601 Merged new caliblur theme
Fix for new users created
Fix for options to the calibre-converter
Only the first 300 chars are logged for the emailbody (spamming of logfile is prevented)
Added class to "Random" header
2018-12-27 10:53:19 +01:00
Ozzieisaacs
dfa17956c9 Merge remote-tracking branch 'bbb/295---Send-AZW-to-Kindle'
Changed function for 295, azw3 is preferred format for sending to kindle
2018-11-18 17:09:13 +01:00
Ozzieisaacs
c3bec48bc7 Fix #617
Additional texts translated
2018-11-03 13:43:38 +01:00
bodybybuddha
ee686b5379 Fix for #617
Task table: Status column and task messages have been localized
	Cleaned up the use of the task fields 'typ' and 'type' to be taskType and taskMessage
2018-10-03 15:58:37 -04:00
bodybybuddha
1144d97bc1 Fixed updating new book format to be all caps in database
This keeps us inline with calibre's behavior.
2018-10-01 15:34:16 -04:00
bodybybuddha
29efcf8358 Merge branch 'master' of https://github.com/janeczku/calibre-web into 617 2018-09-23 19:53:47 -04:00
OzzieIsaacs
ba7c734657 Fixes from testing:
Certificate files are rejected if not both files are provided
Server shuts down controlled after pressing crtl+c
Logfile location is better checked
improvements for better testing (added ids and name in templates)
2018-09-23 19:15:50 +02:00
bodybybuddha
b4122e9858 Partial fix to #617. Local status messages now work. 2018-09-19 11:26:52 -04:00
OzzieIsaacs
36d26f2089 Merge remote-tracking branch '625/625'
Update russian translation
2018-09-14 20:36:45 +02:00
bodybybuddha
03dc179bc3 Fixed Codacy Issues 2018-09-14 10:35:01 -04:00
bodybybuddha
89c0904ac9 Fix to #625 - Check to see if target book format already exists before executing conversion. 2018-09-13 21:24:21 -04:00
OzzieIsaacs
9d0f583d4f Updated french and chinese language. Thanks to @idalin and Olivier
Fixed bug some translations are not shown
2018-09-08 12:28:48 +02:00
OzzieIsaacs
a4190f39de Fix #577 2018-09-02 08:54:46 +02:00
OzzieIsaacs
4dd6c55c38 Fix for #587 (Better handling of errors in sending email) 2018-09-02 08:41:09 +02:00
OzzieIsaacs
4a95404e17 Merge remote-tracking branch 'Convert_all/ebookconvert-any'
# Conflicts:
#	cps/web.py
2018-08-31 15:00:22 +02:00
bodybybuddha
4b006fba99 Re-commit: #584 & #587 Convert any book format to another format 2018-08-28 23:32:30 -04:00
bodybybuddha
a2dfdaad1e Revert "#584 & #587 Convert any book format to another format"
This reverts commit 75e6653442.
2018-08-28 22:36:04 -04:00