Commit Graph
76 Commits
Author SHA1 Message Date
Ozzieisaacs fc4436f091 Update Translation 2020-02-23 20:07:21 +01:00
Ozzieisaacs 317e59df4b Bugfixes from tests 2020-02-15 16:02:31 +01:00
Ozzieisaacs a9a6f5b97e Renamed restrict -> deny 2020-02-15 10:21:45 +01:00
Ozzieisaacs 726595e117 Update for testability 2020-02-10 18:34:10 +01:00
Ozzieisaacs e44494aad0 Kobo sync enable/disable working 2020-01-27 20:32:37 +01:00
Ozzieisaacs 4ab3dc2599 Merge branch 'master' into Develop
# Conflicts:
#	cps/admin.py
2020-01-27 18:20:50 +01:00
Ozzieisaacs b29b5b7ac1 Merge remote-tracking branch 'github/fix-admin-view-log-file' 2020-01-27 18:14:16 +01:00
Ghighi Eftimie fc79cdfaa2 fix mismerge 2020-01-27 15:24:11 +02:00
Ghighi Eftimie 647e954e8a fix admin view of error log 2020-01-26 20:53:03 +02:00
Ozzieisaacs 0411d4a8c9 Added 2 new kobo settings: Enable Kobo Sync (currently not working) and proxy Requests to Kobo
Added fix for kobo reader generating requests without right port number, causing url_for not working correct
2020-01-26 16:52:40 +01:00
Ozzieisaacs cd9bb56db5 Cleanup Kobo integration 2020-01-20 06:14:53 +01:00
Ozzieisaacs 79a9ef4859 Make Kobo optional
move jsonschema dependency to optional-requirements.txt
Added version of jsonschema to about section
Added additional column to RemoteAuthToken table
Update configuration of Kobo sync protocol
2020-01-12 13:42:39 +01:00
Ozzieisaacs 8143c16c14 Added texts for allowed denied tags in configuration
Removed domain only restriction (now it's also possible to allow/deny name parts of users email)
Fix no. of displayed books in unread books section, with applied restrictions
2020-01-11 13:28:09 +01:00
Ozzieisaacs 661ed17d23 Handle stream output in logviewer
Add migration of global matrue content settings to user based settings
Fix Caliblur Theme (Publisherslist)
Allow/deny list/edit/add/delete of tags and custom columns
Colored table background for tags restriction
2020-01-07 20:26:59 +01:00
Ozzieisaacs cabad83418 moved language selection back, default value for restriction columns
Merge branch 'master' into Develop

# Conflicts:
#	cps/editbooks.py
2020-01-05 16:20:36 +01:00
Ozzieisaacs 24ae7350f5 Fix # #1127 (user template show random books in detail view not saved) 2020-01-05 16:18:51 +01:00
Ozzieisaacs 6a07cfba65 Merge remote-tracking branch 'proxy_login/1105-reverse-proxy-login'
Fix for creation of bool config settings (before: new bool columns where always created with true as default)
2020-01-05 13:38:51 +01:00
Ozzieisaacs d9adb4fc94 Improvements for limit tags 2020-01-01 17:30:08 +01: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 1da4efec86 Merge branch 'master' into Develop 2019-12-31 10:52:45 +01:00
Ozzieisaacs 1c18a788f4 Merge remote-tracking branch 'tags_restrict/master' into Develop 2019-12-30 15:15:07 +01:00
Ozzieisaacs 5887f0fe6b Fix for #768 (If email server is configured, admins can send user passwords, also domains can be denied from registration) 2019-12-29 13:54:52 +01:00
Ozzieisaacs 01381488f4 Fixes from tests 2019-12-28 16:18:21 +01:00
Ozzieisaacs f705889c23 Inital Kobo 2019-12-17 20:28:20 +01:00
Ozzieisaacs eabc6e23be Test Email now send to user's email address (#834)
Added forgot/reset password routine (#1098, #1063)
2019-12-15 17:08:17 +01:00
Ozzieisaacs 86fe970651 More fixes for googledrive 2019-12-14 22:22:27 +01:00
Andrew Roberts efcee0a7b7 added reverse proxy configuration form and handler 2019-12-12 21:31:21 -05:00
Ozzieisaacs 8af178c19c Fix for gdrive not working #1081 2019-11-26 10:46:06 +01:00
Ozzieisaacs a4416c202d Merge remote-tracking branch 'rename/develop' 2019-11-16 08:01:18 +01:00
zelazna 3764c33a3a Add the posibility to change the username 2019-10-01 15:36:00 +02:00
Ozzieisaacs f543d7f486 Fix #1016 2019-08-20 18:32:04 +02:00
Ozzieisaacs 3e008ef29b Fix update dates shown in local time format again
Fix "to update" history is shown again
2019-07-21 13:28:55 +02:00
Ozzieisaacs 38f3c2d5b9 Reenabled multiple oauth provider
deleted duplicate download counting function
2019-07-21 09:45:36 +02:00
Ozzieisaacs c6542fdec6 New Oauth code 2019-07-20 20:01:05 +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
Ozzieisaacs d82289e303 Deactivate ldap
Fix setup for pypi
2019-07-14 18:37:44 +02: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 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
Daniel Pavel 006e596c72 Moved config class into separate file.
Moved Goodreads and LDAP services into separate package.
2019-07-07 16:05:51 +03: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 572b5427c7 Fix Encoding issues for python2 2019-06-23 21:11:45 +02:00
Ozzieisaacs 32af660f86 Improvements for logfile viewer
Fix for tornado-server with deactivated accesslog doesn't log to normal log anymore
Merge from master for unique user ids, get_metadata,
fix Goodreads integration
Update Translation (merge NL, update DE)
2019-06-22 19:55:59 +02:00
Ozzieisaacs cc8a431532 Merge remote-tracking branch 'socket/unix-socket' into Develop 2019-06-21 09:46:03 +02:00
Ozzieisaacs 5c7aeb2f2c Change GDrive 2019-06-20 20:12:01 +02:00
Daniel Pavel e254565901 support binding the http server to a unix socket file instead of TCP socket 2019-06-18 08:57:37 +03:00
Ozzieisaacs f40fc5aa75 Update LDAP 2019-06-16 08:59:25 +02:00
Ozzieisaacs 9b74d51f21 Merge remote-tracking branch 'ldap/master' into Develop
# Conflicts:
#	cps/server.py
#	cps/templates/config_edit.html
#	cps/ub.py
#	cps/updater.py
#	cps/web.py
#	optional-requirements-ldap.txt
#	setup.cfg
2019-06-16 08:20:01 +02:00
Ozzieisaacs d45b1b8ea5 Fix #937
logviewerintegrated
Code cosmetics
2019-06-15 21:18:13 +02:00
Ozzieisaacs 26949970d8 Revert logging functions
Fix access logger for tornado
2019-06-11 20:07:51 +02:00