Commit Graph

231 Commits (1e7a2c400ba6c6a6b661c1a086d85a95cd813806)

Author SHA1 Message Date
Ozzie Isaacs 1e7a2c400b Fixed misstyping 3 years ago
Ozzie Isaacs dd30ac4fbd Added thumbnails
Merge remote-tracking branch 'cover/thumbnails' into development

# Conflicts:
#	cps/admin.py
#	cps/templates/layout.html
#	cps/ub.py
#	cps/web.py
Update join for sqlalchemy 1.4
3 years ago
Ozzie Isaacs 5d8d796807 Compatibility for sqlalchemy 2.0 3 years ago
Ozzie Isaacs 8c751eb532 Some code cosmetics 3 years ago
Ozzie Isaacs 725fc658f8 Some code cosmetics 3 years ago
Ozzie Isaacs 0b32738f4e Fix Store UI settings in flask session for guest user (#1820)
Updated testresults
Fix Filepicker (absolute instead of abs)
3 years ago
Ozzie Isaacs e09f2c9beb Added Password change on cli 3 years ago
Ozzieisaacs 5cce01215f Code refactoring ub.session.commit()
Code cosmentics admin.py
4 years ago
Ozzieisaacs 27dcbcd7e1 paged and orderable shelfs
Fix for non writable settings db with non configured calibre-web
4 years ago
Ozzieisaacs 1905e0ee6f refactoring to prevent web.py being the middle of the universe 4 years ago
OzzieIsaacs d6fbcdb09d Fix merge problem (ub prefix in ub.py) 4 years ago
OzzieIsaacs 8f36128fe3 Merge branch 'session' into Develop 4 years ago
Ozzieisaacs 5e3618716d Fix missing session rollback on commit error 4 years ago
Ozzieisaacs 777c2726d3 Changed session_handing 4 years ago
Ozzieisaacs 2e67bd2407 Fix add to shelf from search 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
Ozzie Isaacs ef1736b571 Fix error on guest user (view settings missing) 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
OzzieIsaacs f9c6fb30bf Excluded series type again, as it causes problems upon reconnect 4 years ago
Ozzie Isaacs 25fc6f1937 Further fixes for #1530 (Handle improper migrated database with config_mature_content_tags, allowed_tags, denied_tags, denied_column_value, allowed_column_value NULL instead of "") 4 years ago
Ozzie Isaacs 93a0217d5f Fix for #1530 (Handle improper migrated database with config_mature_content_tags NULL instead of "") 4 years ago
Ozzieisaacs df01022f49 Added save user view settings 4 years ago
Ozzieisaacs ccca5d4d1c Merge branch 'master' into Develop
# Conflicts:
#	cps/templates/layout.html
4 years ago
Ozzieisaacs 88d2c60ee8 Catch some errors related to non writable settings db 4 years ago
Ozzieisaacs d44f283a05 View status in books table is stored 4 years ago
Ozzieisaacs 827b0c6e50 Changed pubdate to timestamp 4 years ago
Ozzieisaacs b852fb0e26 Merge branch 'Develop' 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 273572f44c Merge branch 'master' into Develop
# Conflicts:
#	cps/ub.py
4 years ago
Ozzieisaacs ac37483d47 Fix for #1391 (kobo sync errors out if read/unread books had been present in app.db during initial database migration) 4 years ago
Ozzieisaacs 41960ada4a Autodetect binaries 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 fb8b6310d5 Fix from tests 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 fb18ab1ca5 Fix #866 (Recent book sidebar element can't be removed anymore) 4 years ago
Ozzieisaacs 2d92818613 Code cosmetics 4 years ago
Ozzieisaacs 24c743d23d Code cosmetics 4 years ago
Ozzieisaacs 7bb5afa585 Merge remote-tracking branch 'kobo/shelves' into Develop 4 years ago
Ozzieisaacs 9e159ed5ab Merge branch 'master' into Develop
# Conflicts:
#	cps/config_sql.py
#	cps/ub.py
#	cps/web.py
4 years ago
pthiben 4ef7615d88 Merge remote-tracking branch 'origin/feature/add-cover-serie-view' into feature/add-cover-serie-view
# Conflicts:
#	cps/ub.py
4 years ago
pthiben 77c2783a3e fix linter errors
Fix the sorting
Save the sorting state
Remove unnecessary filter
Add support for grid view
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
pthiben 5b1dfc123f fix linter errors
Fix the sorting
Save the sorting state
Remove unnecessary filter
Add support for grid view
4 years ago
Michael Shavit 41a3623fcc [Kobo] Add Shelf/Collection support.
Implements the v1/library/tags set of endpoints to sync CalibreWeb
shelves with the Kobo device.
Drive-by: Refactors shelf.py to consolidate how user permissions are checked.
Drive-by: Fix issue with the sync endpoint that arrises when a book is
hard-deleted.
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
Michael Shavit 8e1641dac9 Add support for syncing Kobo reading state. 4 years ago