Ozzie Isaacs
4a0dde0371
Merge remote-tracking branch 'cover_images/thumbnails' into cover_thumbnail
...
# Conflicts:
# cps/admin.py
# cps/config_sql.py
# cps/helper.py
# cps/tasks/upload.py
# cps/updater.py
# cps/web.py
2022-02-08 19:55:20 +01:00
Ozzie Isaacs
895f68033f
Improved detection of changed database
2022-02-06 14:22:55 +01:00
mmonkey
032fced9c7
Merge branch 'develop' into thumbnails
2022-01-28 23:15:50 -06:00
mmonkey
18ce310b30
Merge branch Develop into thumbnails
2022-01-26 23:51:50 -06:00
Ozzie Isaacs
6339d25af0
Bugfixes from testrun
2022-01-26 18:38:39 +01:00
Ozzie Isaacs
127bf98aac
Merge branch 'master' into Develop
...
# Conflicts:
# cps/templates/detail.html
# test/Calibre-Web TestSummary_Linux.html
2022-01-23 17:51:54 +01:00
Ozzie Isaacs
bc7a305285
Deleted book formats remove book from synced to kobo table
...
updated teststatus
2022-01-23 13:11:02 +01:00
Ozzie Isaacs
0feb62c142
Improvements delete user (delete also depending entries in tables)
...
Fixes kobo sync with sync only selected shelfs
2022-01-09 17:43:20 +01:00
Ozzie Isaacs
cd5711e651
Merge branch 'master' into Develop
...
# Conflicts:
# cps/web.py
2021-12-04 20:56:04 +01:00
Ozzie Isaacs
a1d372630d
Added missing language bit ( fixes #2187 )
...
Added handling of wrong .jpg cover file content
Guest sorting options are now stored in the session
Updated teststatus
2021-11-23 19:32:48 +01:00
Ozzieisaacs
6deb527769
Merge branch 'master' into Develop
2021-11-21 09:14:36 +01:00
Ozzieisaacs
9273843062
Removed double declared functions
2021-11-21 09:14:16 +01:00
Ozzieisaacs
8e5bb02a28
Merge author rename
2021-11-20 13:28:45 +04:00
Ozzie Isaacs
4c7b5999f7
Archived Flag available in book list array
2021-10-24 10:57:29 +02:00
Ozzie Isaacs
3be47d6e57
edit_books prepared for kobo sync
2021-10-09 14:57:23 +02:00
Ozzie Isaacs
ed26d34961
Code cleaning (remove python2)
2021-10-04 19:23:24 +02:00
Ozzie Isaacs
5edde53fed
Improved sync for kobo with additional table
2021-10-03 09:58:45 +02:00
mmonkey
0bd544704d
Added series cover thumbnail generation. Better cache file handling.
2021-09-25 03:04:38 -05:00
mmonkey
be28a91315
Simplified all of the thumbnail generation and loading.
2021-09-24 03:11:14 -05:00
mmonkey
d648785471
Review feedback fixes
2021-09-17 01:42:56 -05:00
mmonkey
04a5db5c1d
Resolve merge conflicts
2021-09-16 22:58:54 -05:00
Ozzie Isaacs
3946ef8f0d
Merge branch 'master' into Develop
...
# Conflicts:
# cps.py
# cps/web.py
2021-08-27 16:16:24 +02:00
Ozzie Isaacs
32e27712f0
Added lxml to needed requirements
...
Improved displaying of series title, book of series, comments and custom comments
2021-08-27 09:43:32 +02:00
Ozzie Isaacs
aa9fdd2ada
Merge branch 'master' into Develop
2021-08-18 20:32:33 +02:00
Ozzie Isaacs
28ca39ca13
Add logging of user sessions
2021-08-15 12:43:19 +02:00
Ozzie Isaacs
302679719d
Merge branch 'master' into Develop
...
# Conflicts:
# cps/admin.py
# cps/converter.py
# cps/subproc_wrapper.py
# test/Calibre-Web TestSummary_Linux.html
2021-07-30 16:33:06 +02:00
Ozzie Isaacs
a63baa1758
better logged in session protection
2021-07-30 16:28:37 +02:00
Ozzie Isaacs
a1a8a0cf29
Logout if logged out and don't allow to get logged in afterwards
2021-07-25 05:24:03 +02:00
Ozzie Isaacs
93e8c5be32
Fixes for flask version 2.1
...
Fixes for compatibility with sqlalchemy 2.0
2021-06-05 18:41:42 +02:00
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)
2021-05-26 14:50:44 +02:00
Ozzie Isaacs
d95838309e
Added config option for shelf sync behavior
2021-05-15 10:45:51 +02:00
Ozzieisaacs
8dc11e89bd
Merge remote-tracking branch 'koko_sync/feature/kobo-shelf' into Develop
2021-05-02 09:43:47 +02:00
Ozzie Isaacs
144c2b5fc7
Renaming ipadress - ip_address
...
Bugfix user table
Result testrun
Updated cn translation
2021-04-26 19:03:01 +02:00
Ozzie Isaacs
2d73f541c0
Bugfix sort books list and user list
...
Prevent transferring password hash to client
2021-04-08 19:37:08 +02:00
Ozzie Isaacs
f4e134742b
Fix updater
...
Bugfixes from testruns
Update Testresults
2021-03-24 18:46:03 +01:00
Ozzie Isaacs
9864d932e0
Changed user.nickname to user.name
...
Added function to view downloads of all users for admins
2021-03-21 18:55:02 +01:00
Ozzie Isaacs
1e7a2c400b
Fixed misstyping
2021-03-20 14:06:15 +01:00
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
2021-03-20 11:32:50 +01:00
Ozzie Isaacs
5d8d796807
Compatibility for sqlalchemy 2.0
2021-03-20 10:09:08 +01:00
Ozzie Isaacs
8c751eb532
Some code cosmetics
2021-03-14 15:06:09 +01:00
Ozzie Isaacs
725fc658f8
Some code cosmetics
2021-03-14 13:28:52 +01:00
alfred82santa
69b7d94774
Fixes and remove shelf kobo sync flag when kobo sync disabled
2021-02-07 00:19:24 +01:00
alfred82santa
a3f17deb17
Added options in order to synchronize only selected shelf on Kobo device
2021-02-06 20:29:43 +01:00
Ozzie Isaacs
0b32738f4e
Fix Store UI settings in flask session for guest user ( #1820 )
...
Updated testresults
Fix Filepicker (absolute instead of abs)
2021-01-24 07:31:40 +01:00
Ozzie Isaacs
e09f2c9beb
Added Password change on cli
2021-01-17 09:17:46 +01:00
Ozzieisaacs
5cce01215f
Code refactoring ub.session.commit()
...
Code cosmentics admin.py
2021-01-03 09:53:34 +01:00
Ozzieisaacs
27dcbcd7e1
paged and orderable shelfs
...
Fix for non writable settings db with non configured calibre-web
2020-12-27 10:24:51 +01:00
Ozzieisaacs
1905e0ee6f
refactoring to prevent web.py being the middle of the universe
2020-12-12 11:23:17 +01:00
OzzieIsaacs
d6fbcdb09d
Fix merge problem (ub prefix in ub.py)
2020-12-08 13:56:17 +01:00
OzzieIsaacs
8f36128fe3
Merge branch 'session' into Develop
2020-12-08 11:49:39 +01:00
