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
Ozzieisaacs
5e3618716d
Fix missing session rollback on commit error
2020-12-07 19:53:34 +01:00
Ozzieisaacs
777c2726d3
Changed session_handing
2020-12-07 08:52:52 +01:00
Ozzieisaacs
2e67bd2407
Fix add to shelf from search
2020-10-10 10:32:53 +02:00
Ozzieisaacs
cc0b0196f4
Store UI settings in flask session for guest user
2020-09-27 19:12:10 +02:00
Ozzieisaacs
6dfa171b4e
Added id's for testing
...
moved downloaded books section
2020-09-27 16:00:17 +02:00
Ozzieisaacs
497fbdcdfc
Save view settings
2020-09-27 12:37:41 +02:00
Ozzie Isaacs
ef1736b571
Fix error on guest user (view settings missing)
2020-08-24 20:38:06 +02:00
OzzieIsaacs
f2add3f788
Migration of view settings working in User database
...
Book Merge gives now feedback on what is done
2020-08-22 10:27:09 +02:00
OzzieIsaacs
ad144922fb
Merge with master
2020-08-22 09:23:29 +02:00
OzzieIsaacs
f9c6fb30bf
Excluded series type again, as it causes problems upon reconnect
2020-08-14 19:43:54 +02:00
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 "")
2020-07-22 18:44:11 +02:00
Ozzie Isaacs
93a0217d5f
Fix for #1530 (Handle improper migrated database with config_mature_content_tags NULL instead of "")
2020-07-20 20:28:10 +02:00
Ozzieisaacs
df01022f49
Added save user view settings
2020-07-08 21:18:38 +02:00
Ozzieisaacs
ccca5d4d1c
Merge branch 'master' into Develop
...
# Conflicts:
# cps/templates/layout.html
2020-06-28 12:11:46 +02:00
Ozzieisaacs
88d2c60ee8
Catch some errors related to non writable settings db
2020-06-27 13:22:16 +02:00
Ozzieisaacs
d44f283a05
View status in books table is stored
2020-06-12 16:15:54 +02:00
Ozzieisaacs
827b0c6e50
Changed pubdate to timestamp
2020-06-06 09:52:35 +02:00
Ozzieisaacs
b852fb0e26
Merge branch 'Develop'
2020-05-25 21:30:21 +02:00
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)
2020-05-21 09:28:35 +02:00
