Commit Graph

905 Commits (4517f5b0cb6aa36b3f0f50286612f4d4587e4857)

Author SHA1 Message Date
Ozzieisaacs 046a074c3a Catch attribute error on ldap import user
Fixes for Login with Windows AD
4 years ago
Ozzieisaacs 7c96fac95c Removed unnecessary parameters 4 years ago
Ozzieisaacs a3ef53102d Fix warning message on ldap import 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 4feb26eefb Added series order option (#1715)
Added authors order option (#1301)
Added tooltips for ordering options
Fixed ratings, formats, languages order option
4 years ago
Ozzieisaacs 2da7cd2064 Merge remote-tracking branch 'it/patch-18' into master 4 years ago
Ozzieisaacs 560ade00b4 Fix browser caching problem on change cover 4 years ago
verglor 2343c79126 Use djvu_html5 to read djvu format in browser 4 years ago
verglor 50441bae62 Fix missing audio icon for other audio formats than mp3 4 years ago
Ozzieisaacs 0771546dad Log exception on user import 4 years ago
Ozzieisaacs 130701a7bb Merge remote-tracking branch 'sec_fixes/admin_update' into master 4 years ago
Ozzieisaacs 1b0b4c4cc5 Merge remote-tracking branch 'sec_fixes/ldap' into master 4 years ago
jvoisin fa82745f64 Put import_ldap_users behind a login 4 years ago
jvoisin 19b2a334e4 Remove unused imports 4 years ago
Ozzieisaacs bc0416cbb4 Fix for #1660 (advanced search for custom columns working, headline for advanced search working) 4 years ago
Ozzieisaacs 2814617e4b Fix for #1660 (Pagination in advanced search not working, error 500 for no filter in advanced search)
Fix #1666 (Pagination in search not working)
4 years ago
Ozzieisaacs 52489a484a Merge remote-tracking branch 'Knepherbird/master' into master
# Conflicts:
#	cps/jinjia.py
#	cps/templates/detail.html
#	cps/templates/discover.html
#	cps/templates/index.html
#	cps/web.py
4 years ago
Ghighi Eftimie 6dadc6fb1e same fix but hopefully better 4 years ago
Ozzieisaacs 2e67bd2407 Fix add to shelf from search 4 years ago
OzzieIsaacs d70ded0993 Fix for search 4 years ago
Ozzieisaacs 6e6f144b7a Paginated search and advanced search
Wraparound on books list deactivated
4 years ago
OzzieIsaacs 376001100a Bugfixes from last testrun 4 years ago
Ozzieisaacs cc0b0196f4 Store UI settings in flask session for guest user 4 years ago
Ozzieisaacs 6dfa171b4e Added id's for testing
moved downloaded books section
4 years ago
Ozzieisaacs 497fbdcdfc Save view settings 4 years ago
Ozzieisaacs 7c8f6ce62f Merge branch 'master' into Develop
# Conflicts:
#	cps/comic.py
#	cps/editbooks.py
#	cps/isoLanguages.py
4 years ago
Ozzieisaacs 9a896ea81e Removed logging of headers as it caused trouble while showing logfile in UI 4 years ago
Ozzieisaacs 8f743b70a4 Revert the tolino stuff 4 years ago
Ozzieisaacs a761017116 Additional debug output for #1527 4 years ago
Ozzieisaacs f06cc25a99 Fix for immediate logout with next="/logout"
Fix tolino per default with deactivated Strict-Transport-Security
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
Michael Knepher 057f70ea9c Add author sort 4 years ago
OzzieIsaacs 9e5cad0dc8 Merge new worker thread 4 years ago
OzzieIsaacs 61d628d596 oauth problem solved 4 years ago
blitzmann 6322919bc7 Merge branch 'Develop' into tasks
# Conflicts:
#	cps/db.py
4 years ago
Ozzie Isaacs d89830af61 Fix anonymous user has no modified_flag error 4 years ago
blitzmann 6a8ae9c0c4 Merge remote-tracking branch 'upstream/master' into tasks
# Conflicts:
#	cps/helper.py
4 years ago
OzzieIsaacs f066926fc9 Merge branch 'master' into Develop 4 years ago
OzzieIsaacs 4c38b0ab10 Prepare for save name sort order 4 years ago
blitzmann 414043ded1 Remove references to old worker, turn off calibre_db task queue (for now until I can determine if it's needed still), and attempt to re-implement email progress tracking (not working at the moment) 4 years ago
blitzmann 2533c9c14e Continue converting tasks - email and upload tasks 4 years ago
blitzmann f10f0dada6 First working PoC with a new task structure 4 years ago
OzzieIsaacs f2add3f788 Migration of view settings working in User database
Book Merge gives now feedback on what is done
4 years ago
OzzieIsaacs ad144922fb Merge with master 4 years ago
Brandon Ingli 4ee5dcaff3
Elevate Log Messages in web.py
Elevates login failure log messages and register failure log messages from INFO to WARNING, "Unknown Error" to ERROR, and fixes misspelling of "address" in web.py log messages. Misspelling remains in variable names to avoid breaking changes.
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
Ozzieisaacs f8139f3198 Store last selected view for sidebar (not for categories, series, publishers, ..)
Started making search paged
4 years ago
Ozzieisaacs df01022f49 Added save user view settings 4 years ago
Ozzieisaacs f80c67828b Fix #1500 (Custom ratings of increment 0.5 are allowed) 4 years ago
Ozzieisaacs ee6f1405d4 Fix #1456 (Added route to robots.txt) 4 years ago
Ozzieisaacs ccca5d4d1c Merge branch 'master' into Develop
# Conflicts:
#	cps/templates/layout.html
4 years ago
Ghighi Eftimie eeff5a5d43 fix for hidden input 'next' on login form 4 years ago
Michael Knepher 67dd4a72b0 Add series info to all book "meta" displays 4 years ago
Ozzieisaacs 329a7a03a5 Fix for errors editing/uploading books with duplicate tags/authors/language names
Additional parsing of epubs for cover files
Fix for change of database with linked read_column and read column isn't present any more
4 years ago
Ozzieisaacs d0a3503d74 Fix #1493 (stay logged in with enabled remember token, use remember token) 4 years ago
Ozzieisaacs 59b78f9984 enable disabling of remember_me function 4 years ago
Ozzieisaacs 2f833dc457 Fix login with remember me token 4 years ago
Ozzieisaacs d44f283a05 View status in books table is stored 4 years ago
Ozzieisaacs c18d5786dd Improved validation check 4 years ago
Ozzieisaacs 1c681ee378 Improvements for books table editor 4 years ago
Ozzieisaacs 94b5ec91cc Title in table translatable
Edit some elements in table possible
Checkbox state is kept over page change in book table
Fix missing div in layout
4 years ago
Ozzieisaacs 4038cb5b85 Internal paged Search prepared
Search for table list is working
4 years ago
Ozzieisaacs 628658972c Merge branch 'master' into Develop 4 years ago
Ozzieisaacs fdf10e3d2e Fix #1473 (reconnect not working via web-route access) 4 years ago
Ozzieisaacs 0dd0605a1f Book list for merging 4 years ago
Ozzieisaacs d1b533848d Changed pubdate to timestamp 4 years ago
Ozzieisaacs 89223760e6 Merge branch 'master' into Develop 4 years ago
Ozzieisaacs 27ed918896 Enabled search for archived books 4 years ago
Wolviex dde7cf18f7 removed extra reference to calibre_db (calibre_db.calibre_db..) typo? 4 years ago
Ozzieisaacs b852fb0e26 Merge branch 'Develop' 4 years ago
Ozzieisaacs cf10244f20 Fix for failed recovery of config_logfile 4 years ago
Ozzieisaacs 570684d308 Fix custom bool column not visible in adv search if linked to read status 4 years ago
Ozzieisaacs 244db8d894 Fix from tests advanced search for custom columns 4 years ago
OzzieIsaacs d0e15da352 Fix lcase function 4 years ago
Ozzieisaacs b1b293a3ec Fix order_authors 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 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 29b94c5615 Fix for #1407 (to many read books lead to to large sql query) -> only fix for linked calibre-column 4 years ago
Ozzieisaacs 81fc1eccd3 Fix for #1407 (to many read books lead to to large sql query) -> only fix for linked calibre-column 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 2468cf63cc Fix for #1397 (changed supported audio files)
Changed max gevent version
Fix for #1397 (changed supported audio files)
4 years ago
Ozzieisaacs e787f9dd9f Automatic username (#1172) 4 years ago
Ozzieisaacs 47641eee59 Merge branch 'master' into Develop 4 years ago
Ozzieisaacs 42abe28cc1 Fix for #1389 (import ldap users with whitespaces) 4 years ago
Ozzieisaacs 16a3deec2c Merge branch 'master' into Develop
# Conflicts:
#	cps/helper.py
4 years ago
OzzieIsaacs a9085752c1 Fix error "email" not in to_save 4 years ago
Ozzieisaacs 75fb7c2e95 Allowing upload extensions (#1119) 4 years ago
Ozzieisaacs 0a02caad04 Improvements 4 years ago
Ozzieisaacs ff75bdba9e Merge branch 'master' into Develop 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 4e940f7fa0 Added response header for improving security 4 years ago
Knepherbird 69fde7dead
Update web.py
Set db.Publishers query to order by name column, because publishers.sort column is empty.
4 years ago
Ozzieisaacs 48f4b12c0e Merge branch 'master' into Develop
# Conflicts:
#	cps/editbooks.py
4 years ago
Ozzieisaacs 0a92d79ec0 Merge remote-tracking branch 'cover-series/feature/add-cover-serie-view' into Develop
# Conflicts:
#	cps/static/css/style.css
#	cps/ub.py
#	cps/web.py
4 years ago
Ozzieisaacs b95f6563cc Merge remote-tracking branch 'read-config/remove-duplicate-read-status-without-filter' into Develop 4 years ago
Ozzieisaacs b160a8de0b Merge branch 'master' into Develop
# Conflicts:
#	cps/__init__.py
#	cps/comic.py
#	cps/editbooks.py
#	cps/helper.py
#	cps/kobo.py
#	cps/translations/nl/LC_MESSAGES/messages.mo
#	cps/translations/nl/LC_MESSAGES/messages.po
#	cps/ub.py
#	cps/uploader.py
#	cps/web.py
4 years ago
Ozzieisaacs bea7223a0a Renabled cbrimage extraction (via unrar and rarfile) 4 years ago
Ozzieisaacs 2d92818613 Code cosmetics 4 years ago
Ozzieisaacs d9dde36c74 Merge remote-tracking branch 'improve_read/sort-book-name' search results are ordered according to sort field in book title 4 years ago
Ozzieisaacs 9f0c0b34af Merge remote-tracking branch 'order_category/master' 4 years ago
Ozzieisaacs 87ec44aed5 Merge remote-tracking branch 'improve_reaad/keep-focus-on-search-input' 4 years ago
Ozzieisaacs 456550a943 Bugfix view shelfs on detiled page
bugfix datetime in archive mode
4 years ago
Ozzieisaacs 7b789b3701 Fix opds with shelves
Fix errorhandler ldap without ldap
4 years ago
Ozzieisaacs 0480d493cf Fix opds login with ldap, if ldap server is down 4 years ago
Ozzieisaacs b4d7733e0a Merge branch 'master' into Develop
# Conflicts:
#	cps/templates/list.html
#	cps/translations/cs/LC_MESSAGES/messages.po
#	cps/translations/de/LC_MESSAGES/messages.po
#	cps/translations/es/LC_MESSAGES/messages.po
#	cps/translations/fi/LC_MESSAGES/messages.po
#	cps/translations/fr/LC_MESSAGES/messages.po
#	cps/translations/hu/LC_MESSAGES/messages.po
#	cps/translations/it/LC_MESSAGES/messages.po
#	cps/translations/ja/LC_MESSAGES/messages.po
#	cps/translations/km/LC_MESSAGES/messages.po
#	cps/translations/nl/LC_MESSAGES/messages.po
#	cps/translations/pl/LC_MESSAGES/messages.po
#	cps/translations/ru/LC_MESSAGES/messages.po
#	cps/translations/sv/LC_MESSAGES/messages.po
#	cps/translations/uk/LC_MESSAGES/messages.po
#	cps/translations/zh_Hans_CN/LC_MESSAGES/messages.po
#	messages.pot
4 years ago
Ozzieisaacs 7393b69757 Fix for #1326 (typo) 4 years ago
Ozzieisaacs 8bd1903d98 Fix for #1326 (opds feed user login not working -> download was not possible) 4 years ago
Ozzieisaacs 95ca1e6a9d Fix for #1319 4 years ago
celogeek f9b4505843
Sort search result by Books sort
It is far easier to search for a
series or anything and see
books in sort order
4 years ago
celogeek ca2bcc647d
Handle read config
Allow advance search
Remove duplicate status on show
4 years ago
pthiben a5fe08e84c Fix button color that now matches HEAD on master
Update name for HTML Series that changed with HEAD
4 years ago
pthiben 1e3a948977 fix linter errors
Fix the sorting
Save the sorting state
Remove unnecessary filter
Add support for grid view
4 years ago
Ozzieisaacs 06fde4fcd0 Fix #1311 (Enable LDAP Anonymous Login) 4 years ago
Ozzieisaacs 9e159ed5ab Merge branch 'master' into Develop
# Conflicts:
#	cps/config_sql.py
#	cps/ub.py
#	cps/web.py
4 years ago
aribes f926e58891 Changing ordering logic when showing books from a category 4 years ago
Ozzieisaacs a784c6bd52 Fixes for oauth login after programming basic tests 4 years ago
Ozzieisaacs ce4f1258b5 Fix #1293 (error 500 on search without query) 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 5864637f1c Merge branch 'master' into Develop 4 years ago
Ozzieisaacs e99f5bcced Merge remote-tracking branch 'english/master' 4 years ago
Ozzieisaacs bab14a1fbf Update shelfs handling, bugfix changed updater 4 years ago
Ozzieisaacs 0c27ff11b9 Update Updater 4 years ago
Josh O'Brien c870f6e87d English Language V2 4 years ago
Ozzieisaacs 09e7d76c6f Merge remote-tracking branch 'kobo_book_delete' into Develop
# Conflicts:
#	cps/kobo.py
#	cps/services/SyncToken.py
#	cps/templates/book_edit.html
#	cps/ub.py
4 years ago
Ozzieisaacs d597e05fa9 Merge remote-tracking branch 'reading_state' into Develop
# Conflicts:
#	cps/kobo.py
4 years ago
Ozzieisaacs d267338837 Fixes for Kobo sync
Better output on upload cover
Fix for download after access to opds/fileformat
Fix osd search link
Added ratings to opds feed
Change for kobo sync for testing
4 years ago
Michael Shavit 8e1641dac9 Add support for syncing Kobo reading state. 4 years ago
Michael Shavit 57d37ffba8 Add schema support for more reading states to the ReadBook table. 4 years ago
Ozzieisaacs 9fc0c3b3de Merge remote-tracking branch 'English_texts/master'
# Conflicts:
#	cps/templates/config_edit.html
#	cps/templates/config_view_edit.html
#	cps/templates/layout.html
#	cps/templates/search_form.html
#	cps/templates/user_edit.html
4 years ago
Ozzieisaacs 372c284ad4 Merge branch 'master' into Develop 4 years ago
Michael Shavit 7d99e21d0d Merge remote-tracking branch 'original/Develop' into kobo_book_delete 4 years ago
Ozzieisaacs ba6b5f8fd1 Merge branch 'master' into Develop 4 years ago
Josh O'Brien 8f518993a4
Merge branch 'master' into master 4 years ago
Ozzieisaacs ed0bdbf31d Fix for #1199 (missing referrer) 4 years ago
Ozzieisaacs b152d3e06d Merge remote-tracking branch 'auth_token/fix/reverse-proxy-authentication-with-bearer-token' 4 years ago
André Frimberger 33cdf20cd5
Remove trailing whitespaces 4 years ago
Ozzieisaacs 8b1444ebc2 Improved testability
Less content exposed with restricted content
Tornado restart and stop working with systemd
4 years ago
Ozzieisaacs 2ea45b1fdc Removed shebang on non executable scripts 4 years ago
André Frimberger 7a608b4fb0
fix binascii.Error with reverse proxy bearer token
When an authenticating reverse proxy (e.g. Keycloak Gatekeeper) adds a Bearer token in the Authorization header, every request fails with HTTP status code 500.  The corresponding error in the logs is: binascii.Error: Incorrect padding. 
Despite "reverse_proxy_header_login" is enabled, calibre-web tries first to base64decode the bearer token and fails. This patch just reverses the order in which the authentication methods  are checked.
4 years ago
Ozzieisaacs 50ba2e329a Merge branch 'master' into Develop
# Conflicts:
#	cps/shelf.py
4 years ago
Ozzie Isaacs e04aa80fd6 Fix #1181 and Fix #1182 handle removed "is_xhr" on werkzeug version 1.0.0 4 years ago
Josh O'Brien 9b49125776 English Language Updates
Changes to provide consistency for English language.
4 years ago
Ozzieisaacs b33a2ac90d Fix #1170 Auth-digest Header no longer crashs calibre-web
Fix #1161 Shelfs are reordering again
Update Sortable.js to 2.10.1
Code cosmetics
4 years ago
Ozzieisaacs e44494aad0 Kobo sync enable/disable working 4 years ago
Michael Shavit 4547c328bc Delete/Restore book from Kobo device upon (un)archiving of a book in the web UI. 4 years ago