Commit Graph

166 Commits (04a5db5c1de3277486baa06534683fd646fe2d40)

Author SHA1 Message Date
mmonkey 04a5db5c1d Resolve merge conflicts 3 years ago
Ozzie Isaacs a32b36bf81 Fixed missing joins for sorting according to series in read/unread and rated views 3 years ago
Ozzie Isaacs 018f3ca250 Sort authors additionally to series and series_index (Fix #2001)
Sqlalchemy version2 is now a global flag
3 years ago
Ozzie Isaacs 93e8c5be32 Fixes for flask version 2.1
Fixes for compatibility with sqlalchemy 2.0
3 years ago
Ozzie Isaacs a47d6cd937 Fix confirm dialog database change
Gdrive setup basically working again
Moved basicconfig behind login
Database setup separated from other setup
Config page is using ajax (flask >2 and slow computers)
3 years ago
Ozzie Isaacs 6bf360fbfb Added "comments" type to supported custom columns 3 years ago
Ozzie Isaacs b0cc52e0aa Enable custom column datetime (adv. search not working yet) #1984 3 years ago
Ozzieisaacs 541c8c4b93 Improved error handling for disapearing custom column linked to visiblility restrictions 3 years ago
Ozzie Isaacs bb4749c65b Result for testrun
Added mass delete of users
refactores user table refresh
Bugfix for sorting with selected users
Bugfix delete books #1938
3 years ago
Ozzie Isaacs 6e5a1a1f4d Merge remote-tracking branch 'add_Babelio/patch-1' into master 3 years ago
Ozzie Isaacs 39bbee0eeb Books sort with non Books table column working #1938 3 years ago
malletfils 3973362457
Update db.py
Just adding support for Babelio (french website about books) in the link section
3 years ago
Ozzie Isaacs 90f2b3fb21 Refactored list checkbox sort 3 years ago
Ozzieisaacs b6177b27f4 Sorting of users in table according to selection possible 3 years ago
Ozzie Isaacs 2d73f541c0 Bugfix sort books list and user list
Prevent transferring password hash to client
3 years ago
Ozzie Isaacs 8acd1f1fe4 Code refactoring and improved error handling for edit user list
Update teststatus
3 years ago
Ozzie Isaacs 2b17bf4114 Update tests
Fixes upload book
3 years ago
Ozzie Isaacs fc85586809 Bugfixes for sqlalchemy 1.4.0 3 years ago
Ozzie Isaacs 9864d932e0 Changed user.nickname to user.name
Added function to view downloads of all users for admins
3 years ago
Ozzie Isaacs 59ebc1af8a Code refactoring 3 years ago
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 f3d88fc746 Update sqlalchemy 1.4 working 3 years ago
Ozzie Isaacs f52fa41439 Fix restart server
Some code cosmetics
3 years ago
Zaroz 5511925ba2
Removed elif "url" identifier format type
Removed elif "url" identifier format type, since else output is identical
3 years ago
Zaroz 940c9c45d7
Updated db.py
changed __repr__ else statement to allow for custom id entries
3 years ago
jvoisin bc876a159e Declare variables before using them
It should fix the following stacktrace:

```
[2021-02-18 14:46:14,771] ERROR {cps:1891} Exception on / [GET]
Traceback (most recent call last):
  File "/opt/calibre/vendor/flask/app.py", line 2447, in wsgi_app
    response = self.full_dispatch_request()
  File "/opt/calibre/vendor/flask/app.py", line 1952, in full_dispatch_request
    rv = self.handle_user_exception(e)
  File "/opt/calibre/vendor/flask/app.py", line 1821, in handle_user_exception
    reraise(exc_type, exc_value, tb)
  File "/opt/calibre/vendor/flask/_compat.py", line 39, in reraise
    raise value
  File "/opt/calibre/vendor/flask/app.py", line 1950, in full_dispatch_request
    rv = self.dispatch_request()
  File "/opt/calibre/vendor/flask/app.py", line 1936, in dispatch_request
    return self.view_functions[rule.endpoint](**req.view_args)
  File "/opt/calibre/cps/usermanagement.py", line 38, in decorated_view
    return login_required(func)(*args, **kwargs)
  File "/opt/calibre/vendor/flask_login/utils.py", line 272, in decorated_view
    return func(*args, **kwargs)
  File "/opt/calibre/cps/web.py", line 719, in index
    return render_books_list("newest", sort_param, 1, page)
  File "/opt/calibre/cps/web.py", line 422, in render_books_list
    entries, random, pagination = calibre_db.fill_indexpage(page, 0, db.Books, True, order)
  File "/opt/calibre/cps/db.py", line 610, in fill_indexpage
    return self.fill_indexpage_with_archived_books(page, pagesize, database, db_filter, order, False, *join)
  File "/opt/calibre/cps/db.py", line 635, in fill_indexpage_with_archived_books
    #    book = self.order_authors(book)
UnboundLocalError: local variable 'entries' referenced before assignment
```
3 years ago
Ozzie Isaacs a9cedb3fca Add logger to db.py 3 years ago
Ozzie Isaacs e5f754ed0e improved session handling 3 years ago
Ozzie Isaacs 6f9e52792a No autoflush on metadata.db change 3 years ago
Ozzieisaacs 27dcbcd7e1 paged and orderable shelfs
Fix for non writable settings db with non configured calibre-web
3 years ago
Ozzieisaacs b637a63e71 Refactored exception logging 3 years ago
OzzieIsaacs 8f36128fe3 Merge branch 'session' into Develop 3 years ago
Ozzieisaacs f677dcb1f4 Fix missing optional parameter initSession 3 years ago
Ozzieisaacs 1a9b220ec2 Session no longer expires on commit (only in worker thread) 3 years ago
Ozzieisaacs d15d252af7 Session no longer expires on commit 3 years ago
Ozzieisaacs 777c2726d3 Changed session_handing 3 years ago
jvoisin 2c99e71626 Remove a superfluous space 4 years ago
Ozzieisaacs e16c0caebb Fix opds search 4 years ago
Ozzieisaacs 2e67bd2407 Fix add to shelf from search 4 years ago
OzzieIsaacs d70ded0993 Fix for search 4 years ago
OzzieIsaacs bb03026589 Fixes from merge problems 4 years ago
OzzieIsaacs 3b8e5ddfb3 Merge remote-tracking branch 'worker/db' into Develop
# Conflicts:
#	cps/tasks/convert.py
4 years ago
Ozzieisaacs 6e6f144b7a Paginated search and advanced search
Wraparound on books list deactivated
4 years ago
Ozzieisaacs 7c8f6ce62f Merge branch 'master' into Develop
# Conflicts:
#	cps/comic.py
#	cps/editbooks.py
#	cps/isoLanguages.py
4 years ago
Ozzieisaacs 2d712a3841 Fix #1612 4 years ago
blitzmann 0480edce2a Clarify need for WeakSet 4 years ago
Alexander Yakovlev 4eded82102
Add ISFDB 4 years ago
Alexander Yakovlev ec4ff83465
Add ISSN tags 4 years ago