mirrors/calibre-web
1
0
Fork 0
mirror of https://github.com/janeczku/calibre-web synced 2024-11-10 03:50:01 +00:00
Code Issues Releases Wiki Activity
3,835 Commits 3 Branches 23 Tags 101 MiB
dbac685985
Commit Graph

309 Commits

Author SHA1 Message Date
Ozzie Isaacs
afaf496fbe Merge branch 'master' into cover_thumbnail 
# Conflicts:
#	cps/db.py
#	cps/templates/author.html
#	cps/templates/discover.html
#	cps/templates/index.html
#	cps/templates/search.html
#	cps/templates/shelf.html
#	cps/web.py
#	requirements.txt
#	test/Calibre-Web TestSummary_Linux.html
 2022-04-02 11:57:18 +02:00
Ozzie Isaacs
14a6e7c42c Deactivated several functions for kindle tolino and kobo. Opening books now working for ebook readers 2022-03-25 18:30:12 +01:00
Ozzie Isaacs
ec53570118 Merge branch 'master' into cover_thumbnail 
# Conflicts:
#	cps/editbooks.py
#	test/Calibre-Web TestSummary_Linux.html
 2022-03-20 17:15:40 +01:00
Ozzie Isaacs
8cb5989c97 Catch additional error on not existing custom column linked to read column (#2341) 
Prevent metadata changes are lost on edit books with errors (#2326)
Better log output
Renamed log message on database delete
 2022-03-20 11:55:12 +01:00
Ozzie Isaacs
06e8845641 Implement delete thumbnail entry 
Implement delete cache_dir on database change
 2022-03-16 20:31:25 +01:00
Ozzie Isaacs
034ab73ccc Added environment variables for reconnect 2022-03-16 16:57:18 +01:00
Ozzie Isaacs
d9a83e0638 Merge branch 'master' into cover_thumbnail 
# Conflicts:
#	cps/editbooks.py
#	cps/helper.py
#	cps/web.py
#	test/Calibre-Web TestSummary_Linux.html
 2022-03-14 19:41:47 +01:00
Ozzie Isaacs
8f3bb2e338 Bugfixes from testrun 2022-03-14 17:12:35 +01:00
Ozzie Isaacs
4545f4a20d Better epub cover parsing with multiple cover-image items 
Code cosmetics
renamed variables
refactored xml page generation
refactored prepare author
 2022-03-13 19:00:37 +01:00
Ozzie Isaacs
296f76b5fb Fixes after testrun 
Code cosmetics
 2022-03-13 10:23:13 +01:00
Ozzie Isaacs
4379669cf8 Database error is more detailed 
renamed debug_or_exception to error_or_exception
 2022-03-12 17:14:54 +01:00
Ozzie Isaacs
d80297e1a8 Bugfix sorting user table 2022-03-12 10:00:38 +01:00
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
Ozzie Isaacs
6ca08a7cc1 Prevent delete of everything if database wasn't really changed 2022-02-05 15:12:23 +01:00
Ozzie Isaacs
7254ce6c81 Prevent delete of everything if database wasn't really changed 2022-02-05 15:11:50 +01:00
Ozzie Isaacs
f6b46bb170 Code cosmetics 2022-01-29 21:22:39 +01:00
Ozzie Isaacs
39ac37861f Added option to enable reconnect 
Added option to perform dry run of updater
Added possibility to exclude files from updater
 2022-01-29 14:47:45 +01:00
mmonkey
18ce310b30 Merge branch Develop into thumbnails 2022-01-26 23:51:50 -06:00
Ozzie Isaacs
3b216bfa07 Kobo sync token is now also created if accessed from localhost(fixes #1990) 
Create kobo sync token button is now "unclicked" after closing dialog
Additional localhost route is catched
If book format is deleted this also deletes the book synced to kobo status
 2022-01-24 18:47:34 +01:00
Ozzie Isaacs
d759df0df6 Kobo sync token is now also created if accessed from localhost(fixes #1990) 
Create kobo sync token button is now "unclicked" after closing dialog
Additional localhost route is catched
If book format is deleted this also deletes the book synced to kobo status
 2022-01-22 18:23:43 +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
Ozzieisaacs
785726deee Migrated some routes to POST 
- delete shelf, import ldap users
- delete_kobo token, kobo force full sync
- shutdown, reconnect, shutdown
 2021-12-30 14:45:30 +01:00
Ozzie Isaacs
b85627da5c Fix for adding/deleting visibility restrictions on custom columns/tags 2021-12-19 11:29:54 +01:00
Ozzie Isaacs
9d9acb058d Add button to force full kobo sync 2021-12-06 21:02:06 +01:00
Ozzie Isaacs
bd01e840ca Delete books in shelfs, downloaded books, kobo sync status, etc on database change (fixes #620) 2021-12-04 11:50:25 +01:00
Ozzieisaacs
6cb713d62c Added filtering of languages 
Bugfix show all allowed languages in user settings in case restrictions currently apply
 2021-11-21 10:21:45 +01:00
Ozzie Isaacs
6aad9378b8 Fix visiblility upload right on enabled upload feature 2021-11-20 12:44:34 +01:00
cbartondock
c6bf62a6eb The recent changes to content security policy broke custom theming. I fixed it by adding a trusted hosts field to Server Configuration 2021-10-22 15:35:10 -04:00
Ozzie Isaacs
50d703e2d8 Chunked reading status on kobo sync 
Bugfix loading text on shelf delete
Bugfix sort books list according to selection without selection
 2021-10-16 11:28:35 +02:00
Ozzie Isaacs
ac54899415 Bugfixes kobo sync 2021-10-10 10:23:58 +02:00
Ozzie Isaacs
25f608d109 Bugfixes from testrun (load images from gdrive) 
Fix locale for new users
 2021-10-09 09:37:10 +02:00
Ozzie Isaacs
aca5324914 Bugfix arrange shelf 
Bugfix remote login
Bugfix perform Update
 2021-10-06 22:06:33 +02:00
Ozzie Isaacs
d8f9e2feb2 Bugfixes for user import with default locale and default language 
Bugfixes from testrun
 2021-10-06 18:41:01 +02:00
Ozzie Isaacs
ed26d34961 Code cleaning (remove python2) 2021-10-04 19:23:24 +02:00
mmonkey
cd3791f5f4 Always use full-sized image for book edit and details pages 2021-09-30 01:43:31 -05:00
mmonkey
46205a1f83 Made long running tasks cancellable. Added cancel button to cancellable tasks in the task list. Added APP_MODE env variable for determining if the app is running in development, test, or production. 2021-09-29 02:40:12 -05:00
mmonkey
26071d4e7a Added Scheduled Tasks Settings 2021-09-26 02:02:48 -05:00
Ozzie Isaacs
2e25e797dd Fix #2002 (Added missing default locale and default language view upon importing ldap user) 2021-09-25 14:08:49 +02:00
mmonkey
0bd544704d Added series cover thumbnail generation. Better cache file handling. 2021-09-25 03:04:38 -05:00
mmonkey
9a08bcd2bc Started addressing some PR comments 2021-09-16 23:20:11 -05:00
mmonkey
04a5db5c1d Resolve merge conflicts 2021-09-16 22:58:54 -05:00
Ozzie Isaacs
e3db2796c9 Merge branch 'master' into Develop 
# Conflicts:
#	test/Calibre-Web TestSummary_Linux.html
 2021-08-30 20:18:21 +02:00
Ozzie Isaacs
42ef049b63 Catch error on ldap import 2021-08-30 20:17:56 +02: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
d25cfb7499 Fix for #2097 (Quotes are now handled properly in UI-editable tables) 2021-08-26 18:03:59 +02:00
Ozzie Isaacs
ceec1051d5 Added option to save books with no nenglish characters 
Imporvements on metadata search
 2021-08-01 13:50:17 +02:00
Ozzie Isaacs
250cafe814 Merge branch 'master' into Develop 2021-07-30 21:00:01 +02:00
Ozzie Isaacs
16633ef1d3 Fix #2029 (Import LDAP User with "." in the name) 2021-07-30 20:45:33 +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
9a8c342e61 Fix deleting user (deleting shelfs and so on failed before) 2021-07-23 20:03:20 +02:00
Ozzie Isaacs
a27314464a Merge branch 'master' into Develop 2021-07-11 08:50:14 +02:00
Ozzie Isaacs
87f07003f4 Removed invalid code 
Sqlalchemy 2.0 compatibility for kobo sync
 2021-07-11 08:49:47 +02:00
Ozzie Isaacs
a56e071a19 Fix #2043 (Multiuser kobo sync with restrict to shelfs working) 
Sync only selected shelfs is stored correct on creating user
 2021-07-10 17:09:04 +02:00
Ozzie Isaacs
430ccd9ab1 Merge branch 'master' into Develop 2021-06-29 18:52:02 +02:00
Ozzie Isaacs
792d4a65bc Fix typo 2021-06-29 18:24:35 +02:00
Ozzie Isaacs
1833e8fdb4 Success message after database change 2021-06-12 08:48:55 +02:00
Ozzie Isaacs
1a0bf45c34 Check file/folder permissions before update 2021-06-06 12:16:47 +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
a62fca1e55 Merge branch 'master' into Develop 2021-05-22 11:28:59 +02:00
Ozzie Isaacs
c85cfa90a4 Update testresults on windows 
Added encoding on fb2 upload
 2021-05-19 19:21:09 +02:00
Ozzie Isaacs
e15324d2cd Merge branch 'master' into Develop 2021-05-16 09:38:00 +02:00
Ozzie Isaacs
20b84a9459 Unified translations 
Update translations for release
 2021-05-16 09:37:45 +02:00
Ozzie Isaacs
d95838309e Added config option for shelf sync behavior 2021-05-15 10:45:51 +02:00
Ozzieisaacs
02fc698f1c Some little code refactoring 2021-05-02 10:05:25 +02:00
Ozzieisaacs
541c8c4b93 Improved error handling for disapearing custom column linked to visiblility restrictions 2021-05-01 20:52:48 +02:00
Ozzieisaacs
b97373bf37 Improved error handling for disapearing custom column linked to read status 2021-05-01 18:42:57 +02:00
Ozzieisaacs
c0b561cb5a Better input check for custom_columns 2021-05-01 17:10:29 +02:00
Ozzieisaacs
5470acd3af Fix #1964 (RefreshError with unconfigured gdrive) 2021-05-01 12:45:28 +02:00
Ozzie Isaacs
64696fe973 Bugfixes edit user list (Fix #1938) 2021-05-01 08:36:39 +02:00
Ozzie Isaacs
ed2fa4cdd8 Update error handling for user list (#1938) 2021-04-28 20:49:16 +02:00
Ozzie Isaacs
4e3a5ca33b Added additional debug messages, catch additional errors in updater 2021-04-25 11:30:53 +02:00
Ozzie Isaacs
97e4707f72 user list column value and tags editor (#1938) 
Bugfixes for massedit in user list (#1938)
Changed no. of debug messages
 2021-04-25 10:43:01 +02:00
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
 2021-04-21 19:23:56 +02:00
Ozzie Isaacs
67775bc797 Update requirements 
Catch error for invalid oauth tokens
Fixes for displaying error messages on deleting books from list
Fixes for displaying error messages on deleting bookformats
 2021-04-13 19:08:02 +02:00
Ozzie Isaacs
d32b2ca524 Prevent traceback after delete user 
flash message in case last admin role is removed #1938
 2021-04-12 19:04:27 +02:00
Ozzie Isaacs
90f2b3fb21 Refactored list checkbox sort 2021-04-12 18:39:09 +02:00
Ozzieisaacs
b6177b27f4 Sorting of users in table according to selection possible 2021-04-11 19:59:20 +02:00
Ozzieisaacs
ae97e87506 Delete user working from user table (#1938) 
Comment in helper
 2021-04-10 11:32:25 +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
7561eabe52 Implement Backend to deny editing Guest rights restriction #1938 2021-04-07 18:56:17 +02:00
Ozzie Isaacs
067fb1b0b7 Prevent delete Guest user and redirect to admin page after user delete 2021-04-07 18:47:48 +02:00
Ozzie Isaacs
8acd1f1fe4 Code refactoring and improved error handling for edit user list 
Update teststatus
 2021-04-06 17:29:42 +02:00
Ozzie Isaacs
91b9370a21 Merge branch 'master' into development 
# Conflicts:
#	cps/static/css/libs/bootstrap-table.min.css
#	cps/static/js/libs/bootstrap-table/bootstrap-table-editable.min.js
#	cps/static/js/libs/bootstrap-table/bootstrap-table.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-af-ZA.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-ar-SA.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-bg-BG.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-ca-ES.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-cs-CZ.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-da-DK.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-de-DE.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-el-GR.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-en-US.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-es-AR.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-es-CL.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-es-CR.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-es-ES.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-es-MX.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-es-NI.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-es-SP.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-et-EE.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-eu-EU.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-fa-IR.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-fi-FI.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-fr-BE.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-fr-CH.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-fr-FR.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-fr-LU.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-he-IL.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-hr-HR.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-hu-HU.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-id-ID.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-it-IT.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-ja-JP.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-ka-GE.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-ko-KR.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-ms-MY.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-nb-NO.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-nl-BE.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-nl-NL.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-pl-PL.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-pt-BR.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-pt-PT.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-ro-RO.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-ru-RU.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-sk-SK.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-sr-Cyrl-RS.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-sr-Latn-RS.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-sv-SE.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-th-TH.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-tr-TR.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-uk-UA.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-ur-PK.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-uz-Latn-UZ.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-vi-VN.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-zh-CN.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-zh-TW.min.js
 2021-04-02 17:13:22 +02:00
Ozzie Isaacs
6e406311c3 Fix #1928 (ldap_import_user_filter missing in to_save) 2021-04-02 08:40:29 +02:00
Ozzie Isaacs
99520d54a5 Added ability to send emails via gmail (#1905) 
Gmail email sending
 2021-03-28 14:51:01 +02:00
Ozzie Isaacs
8f91437701 Implementation for gmail server with OAuth2 started 2021-03-27 16:36:24 +01:00
Ozzie Isaacs
0b7c679dba Changed test email message (fix #657) 2021-03-27 09:48:43 +01:00
Ozzie Isaacs
aab3cdc58a Changed test email message 2021-03-27 09:47:43 +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
436f60caa9 refactored some functions 2021-03-21 14:17:07 +01:00
Ozzie Isaacs
e9530eda9d Bugfix from refactoring 2021-03-21 13:46:13 +01:00
Ozzie Isaacs
59ebc1af8a Code refactoring 2021-03-21 08:20:04 +01:00
Ozzie Isaacs
10731696df Merge branch 'development' into cover_thumb 
# Conflicts:
#	cps/admin.py
 2021-03-21 07:29:35 +01:00
Ozzie Isaacs
8cc849488b Code cosmetics 2021-03-21 07:15:38 +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
b070ba142f Selects are working in user management with generic confirm dialog 2021-03-16 15:52:31 +01:00
Ozzie Isaacs
53ee0aaee1 Some functions refactored 2021-03-14 17:34:47 +01:00