Commit Graph

185 Commits (ed2fa4cdd8369925b373da914cb50d1662a6ed0d)

Author SHA1 Message Date
Ozzieisaacs 7aabfc573b Merge branch 'master' into Develop
# Conflicts:
#	cps/admin.py
#	cps/config_sql.py
#	cps/templates/config_edit.html
#	cps/web.py
4 years ago
Ozzieisaacs 56505457eb Merge remote-tracking branch 'ldap_import/feat/ldap-import-user-identifier' into master
# Conflicts:
#	cps/admin.py
4 years ago
Ozzieisaacs 3372070a58 Fix change title regex
Merge branch 'Develop' into master
4 years ago
Ozzieisaacs 6ad56a0859 Merge branch 'master' into Develop 4 years ago
Ozzieisaacs 8515781564 Fix #1727 (import rarfile 4.0 fails on python3.5) 4 years ago
Ozzieisaacs f620d4a9ca Fix LDAP errors 4 years ago
Ozzieisaacs 9bd51c650b Add config options for client certificate authentication 4 years ago
Ozzieisaacs ceefba2743 Fix for #1550 (password prompt for LDAP and anonymous browsing) 4 years ago
Ozzieisaacs 32b7b39223 Added function to download debug information 4 years ago
Ozzieisaacs 400f6e02a5 Fix #1668 (upload of books with language set to different than UI language and not showing all books)
Fix for only showing external port if kobo is really activated in admin menu
4 years ago
jvoisin 8b60a19577 Don't leak to non-admin users the current installed version 4 years ago
Ozzieisaacs 5b67b687d3 Removed remaining code from view downloaded books in user section
Fixes for #1661
4 years ago
Ozzieisaacs 95d540630e Change ldap_certpath to file 4 years ago
Ozzieisaacs 7ba014ba49 Fix "is not a valid language" on upload of comic books
Fix metadata excration of comic books
updated bootstrap table
updated handling of upload formats restrictions
4 years ago
OzzieIsaacs 843279bacb Merge remote-tracking branch 'jef/jef/download-kobo' into master 4 years ago
OzzieIsaacs 1535bdbcd8 Merge remote-tracking branch 'memorydatabase/issue/1564' 4 years ago
Clément Poissonnier 1ca4583896 feat(ldap): add a field that allows to override LDAP User Object Filter when a user is imported 4 years ago
Jef LeCompte e048388213
feat(api): include external port option
Signed-off-by: Jef LeCompte <jeffreylec@gmail.com>
4 years ago
Ozzieisaacs 852f252d13 Prevent invalid variable
Make text in kobo_auth_screen consistent
4 years ago
Ozzieisaacs dde5b08c47 Re enabled gevent as dependency
Fix #1399 (Calibre-web starting with installed and not activated gdrive denpendencies without internet connection again)
4 years ago
Ozzieisaacs 88d2c60ee8 Catch some errors related to non writable settings db 4 years ago
Ozzieisaacs ef2c98ba39 Fix #1453 (error unrar binary not found) 4 years ago
Ozzieisaacs 5f0660a4e5 Refactored helper.py and db.py 4 years ago
OzzieIsaacs 0cf1cc5587 Fixes from tests 4 years ago
Ozzieisaacs 1a458fe39f Fix for #1407 converting books should now be possible again 4 years ago
OzzieIsaacs a48418364c Fiexes from tests 4 years ago
Ozzieisaacs b75497231e Additional fix for #1407 (metadata.db is now held in memory, app.db is attached to it -> joins between both databases possible -> book_read_link is joined for getting result) 4 years ago
Ozzieisaacs 38c28f4358 Merge branch 'master' into Develop
# Conflicts:
#	cps/admin.py
#	cps/constants.py
#	cps/static/css/caliBlur.min.css
#	cps/uploader.py
4 years ago
Ozzieisaacs 5405dc5141 Fix for #1387 (saving settings with enabled gdrive metadata watch led to crash) 4 years ago
Ozzieisaacs 1bc7134ec2 Fix error 500 on reset password in debug mode 4 years ago
Ozzieisaacs 273572f44c Merge branch 'master' into Develop
# Conflicts:
#	cps/ub.py
4 years ago
Ozzieisaacs e787f9dd9f Automatic username (#1172) 4 years ago
Ozzieisaacs 308fd55483 #1141 (Setting for file size limit on email) 4 years ago
Ozzieisaacs fefb44e612 #1356 (fixes for readonly metadata.db)
Fix remove trailing metadata.db at entering calibre_db_path
4 years ago
Ozzieisaacs 75fb7c2e95 Allowing upload extensions (#1119) 4 years ago
Ozzieisaacs e8aedeac36 Refactored admin.py 4 years ago
Ozzieisaacs 0a02caad04 Improvements 4 years ago
Ozzieisaacs a437c603c6 Merge remote-tracking branch 'kepubify/Develop' into Develop
# Conflicts:
#	cps/admin.py
#	cps/helper.py
#	cps/templates/config_edit.html
#	cps/web.py
4 years ago
Ozzieisaacs 0adcd1b3d9 UI Improvements
Added additional restrictions to Calibre DB interface
4 years ago
Ozzieisaacs 0138ff9e16 Added additional config options 4 years ago
Ozzieisaacs 832b34fc54 Improved errorhandling for resending password
Improved errorhandling for editing user
4 years ago
Ozzieisaacs 000b85ff81 Fixes for deleting books(error handling and user feedback) 4 years ago
Ozzieisaacs bb317d54f2 Fix reject reset password without configured email server 4 years ago
Ozzieisaacs d6f41d8dc0 Fix error 404 on reset password (Fix #1342) 4 years ago
Ozzieisaacs bea7223a0a Renabled cbrimage extraction (via unrar and rarfile) 4 years ago
Ozzieisaacs 2d92818613 Code cosmetics 4 years ago
Ozzieisaacs 898e6b4f80 Calibre-Web is rebooted everytime login type ic shanged (from and to standard authentication and between login methods) 4 years ago
Ozzieisaacs d657330584 Fix for removing admin role from last admin user (in addition to prevent delete of last admin user) #1326 4 years ago
Ozzieisaacs 06fde4fcd0 Fix #1311 (Enable LDAP Anonymous Login) 4 years ago
Ozzieisaacs 81a329f1e7 Fix for #1087 ( Caliblur! Theme button alignment) 4 years ago
Ozzieisaacs a784c6bd52 Fixes for oauth login after programming basic tests 4 years ago
Ozzieisaacs 3fbaba6693 Fix #1307 4 years ago
Ozzieisaacs 4749eccfa5 Added fix for python2 regex
Fix for python2 attributeError instead of TypeError on login with wrong openLDAP setting
Added default empty string on LDAPCertificate
Fix ldap as scheme for tls connection
Enabled add user on LDAP Authentication
LDAP config port is now number input
Added header for user import config
Added python ldap version to about section
Fix: It's no longer possible to login via fallback password as long as LDAP server is available
Fix: TypeError on bind is now catched and transformed to error message
Update Readme
Fixes for ldap
4 years ago
Ozzieisaacs a194216568 Merge remote-tracking branch 'origin/master' 4 years ago
Ozzieisaacs 8bee424cc0 Merge remote-tracking branch 'ldap/master'
# Conflicts:
#	cps/admin.py
#	cps/templates/admin.html
#	cps/templates/config_edit.html
#	cps/web.py
4 years ago
Ozzieisaacs 0c27ff11b9 Update Updater 4 years ago
Ozzieisaacs 4eacb21259 Update updater
Update change logfile
code cosmetics js files
4 years ago
Ozzieisaacs fc4436f091 Update Translation 4 years ago
Ozzieisaacs 317e59df4b Bugfixes from tests 4 years ago
Ozzieisaacs a9a6f5b97e Renamed restrict -> deny 4 years ago
Ozzieisaacs 726595e117 Update for testability 4 years ago
Ozzieisaacs e44494aad0 Kobo sync enable/disable working 4 years ago
Ozzieisaacs 4ab3dc2599 Merge branch 'master' into Develop
# Conflicts:
#	cps/admin.py
4 years ago
Ozzieisaacs b29b5b7ac1 Merge remote-tracking branch 'github/fix-admin-view-log-file' 4 years ago
Ghighi Eftimie fc79cdfaa2 fix mismerge 4 years ago
Ghighi Eftimie 647e954e8a fix admin view of error log 4 years ago
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
4 years ago
Ozzieisaacs cd9bb56db5 Cleanup Kobo integration 4 years ago
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
4 years ago
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
4 years ago
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
4 years ago
Ozzieisaacs cabad83418 moved language selection back, default value for restriction columns
Merge branch 'master' into Develop

# Conflicts:
#	cps/editbooks.py
4 years ago
Ozzieisaacs 24ae7350f5 Fix # #1127 (user template show random books in detail view not saved) 4 years ago
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)
4 years ago
Ozzieisaacs d9adb4fc94 Improvements for limit tags 4 years ago
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
4 years ago
Ozzieisaacs 1da4efec86 Merge branch 'master' into Develop 4 years ago
Ozzieisaacs 1c18a788f4 Merge remote-tracking branch 'tags_restrict/master' into Develop 4 years ago
Ozzieisaacs 5887f0fe6b Fix for #768 (If email server is configured, admins can send user passwords, also domains can be denied from registration) 4 years ago
Ozzieisaacs 01381488f4 Fixes from tests 4 years ago
ground7 54c4f40188 added LDAP import
update defaults
4 years ago
Ozzieisaacs f705889c23 Inital Kobo 4 years ago
Ozzieisaacs eabc6e23be Test Email now send to user's email address (#834)
Added forgot/reset password routine (#1098, #1063)
4 years ago
Ozzieisaacs 86fe970651 More fixes for googledrive 4 years ago
Andrew Roberts efcee0a7b7 added reverse proxy configuration form and handler 4 years ago
Ozzieisaacs 8af178c19c Fix for gdrive not working #1081 5 years ago
Ozzieisaacs a4416c202d Merge remote-tracking branch 'rename/develop' 5 years ago
zelazna 3764c33a3a Add the posibility to change the username 5 years ago
Ozzieisaacs f543d7f486 Fix #1016 5 years ago
Vincent Kriek 38a255e069 Add automatic epub to kepub conversion using kepubify 5 years ago
Ozzieisaacs 3e008ef29b Fix update dates shown in local time format again
Fix "to update" history is shown again
5 years ago
Ozzieisaacs 38f3c2d5b9 Reenabled multiple oauth provider
deleted duplicate download counting function
5 years ago
Ozzieisaacs c6542fdec6 New Oauth code 5 years ago
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
5 years ago
Ozzieisaacs d82289e303 Deactivate ldap
Fix setup for pypi
5 years ago
Daniel Pavel a836df9a5a more robust disposing of database session
avoid spamming the log with debug messages from libraries
5 years ago
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
5 years ago
Ozzieisaacs e734bb120a Merge remote-tracking branch 'github/config_sql' into Develop 5 years ago
Daniel Pavel 006e596c72 Moved config class into separate file.
Moved Goodreads and LDAP services into separate package.
5 years ago
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
5 years ago