mirrors/calibre-web
1
0
Fork 0
mirror of https://github.com/janeczku/calibre-web synced 2024-12-01 13:59:57 +00:00
Code Issues Releases Wiki Activity
4,194 Commits 4 Branches 24 Tags 102 MiB
c4a38087d9
Commit Graph

238 Commits

Author SHA1 Message Date
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
547ea93dc9 First fix for #2325 (edit book table with readonly database) 2022-03-12 10:19:21 +01:00
Ozzie Isaacs
34478079d8 Prevent local variable 'from_book' referenced before assignment during merge of books 
Merge books source book: Each book in own row
Merge books, sources are deleted before dialog shows up again
 2022-03-09 14:45:51 +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
7c623941de Bugfixes after testrun 
Enabled re-encode of bookformats
 2022-02-07 13:55:18 +01:00
Ozzie Isaacs
0c3c0c0664 Improved logging of book title on upload 2022-02-06 16:33:12 +01:00
Ozzie Isaacs
5b3015619d Save book read status on edit in books table 2022-02-05 15:36:18 +01:00
Ozzie Isaacs
cfa6b405da Upload files to gdrive with author rename working 2022-02-05 13:21:06 +01:00
Ozzie Isaacs
26a8ac1425 Mass rename author before last stage 2022-02-05 09:06:14 +01:00
Ozzie Isaacs
0bc15636f2 Bugfixes for renaming authors on gdrive 2022-02-01 20:08:42 +01:00
Ozzie Isaacs
61bfeae936 Merge branch 'master' into Develop 2022-01-31 19:20:02 +01:00
Ozzie Isaacs
23e47ba4e6 Fix for #2299 (scholarly requires Internet connection at startup) 2022-01-31 18:09:23 +01:00
Ozzie Isaacs
1e04b51148 Renaming of co-authors which are authors in another book 2022-01-30 15:16:42 +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
35f6f4c727 Deleted book formats remove book from synced to kobo table 
updated teststatus
 2022-01-24 18:47:34 +01: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
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
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
df67079573 Fixes for kobosync with multiple users (#2230) 2022-01-08 19:03:59 +01:00
Ozzie Isaacs
6d839d5cc7 Bugfixes from testrun 2022-01-04 21:12:59 +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
2e815147fb Merge branch 'master' into Develop 
# Conflicts:
#	cps/kobo_sync_status.py
#	test/Calibre-Web TestSummary_Linux.html
 2021-12-19 10:29:56 +01:00
Ozzie Isaacs
42bf40d7bb Change 2 timestamps to utctime 2021-12-12 19:54:17 +01:00
Ozzie Isaacs
9d9acb058d Add button to force full kobo sync 2021-12-06 21:02:06 +01:00
Ozzie Isaacs
f78d2245aa Fixes from testrun 2021-12-05 18:48:21 +01:00
Ozzie Isaacs
d217676350 Upated testresult 
Bugfix book table
 2021-12-05 13:09:41 +01:00
Ozzie Isaacs
cd5711e651 Merge branch 'master' into Develop 
# Conflicts:
#	cps/web.py
 2021-12-04 20:56:04 +01:00
Ozzie Isaacs
87e526642c Bugfix edit series_index 
Bugfix invalid languages
 2021-11-27 18:23:06 +01:00
Ozzie Isaacs
7f9da94a18 Tie visibility of upload buttons to upload right only 2021-11-27 17:43:51 +01:00
Ozzie Isaacs
cbb9edac19 Bugfix search in books list 
Fix renaming upper to lowercase letters
Update test results
 2021-11-21 13:23:34 +01:00
Ozzieisaacs
8e5bb02a28 Merge author rename 2021-11-20 13:28:45 +04:00
Ozzieisaacs
4fd4cf4355 Merge branch 'master' into Develop 
# Conflicts:
#	cps/static/css/style.css
#	cps/web.py
 2021-11-13 17:41:16 +04:00
Ozzieisaacs
baba205bce Rename everything on rename authors 2021-11-11 18:46:32 +04:00
Ozzieisaacs
27e8fbd248 Show dependencies in about section from automatic dependency check 
Bugfix and refactored dependency check
Added output of googledrive dependencies as fallback option
 2021-11-06 20:58:51 +04:00
Ozzie Isaacs
a8317d900b Bugfix for edit custom ratings in list edit mode 
Bugfix for deleting custom enum in list edit mode
 2021-10-30 15:50:17 +02:00
Ozzie Isaacs
f6a2b8a9ef Read and archive bit visible in book table 2021-10-24 21:32:19 +02:00
Ozzie Isaacs
bb20979c71 Merge branch 'master' into Develop 2021-10-24 09:49:42 +02:00
Ozzie Isaacs
917909cfdb Refactored books detail page 2021-10-24 09:48:29 +02:00
Ozzie Isaacs
fe4db16a7e html editor in books list 2021-10-21 20:13:04 +02:00
Ozzie Isaacs
1e1d3a7c81 Enable edit of enum column in books list 2021-10-17 14:05:18 +02:00
Ozzie Isaacs
9d5e9b28ae Enabled editing of "number" custom_columns in books list 2021-10-16 20:46:16 +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
3f6a466ca7 Further language support fixes (displaying "non locale" languages translated) 2021-09-29 19:00:02 +02:00
mmonkey
04a5db5c1d Resolve merge conflicts 2021-09-16 22:58:54 -05:00
Ozzie Isaacs
d4cfad6363 Fixed several text problems from tasks 
Fixed task update
 2021-08-28 11:32:13 +02:00
Ozzie Isaacs
5c19a8aacc Bugfix edit comments 
Testupdate
 2021-08-28 08:24:38 +02:00
Ozzie Isaacs
91e6d94c83 Improved displaying of username and task title in tasks 2021-08-27 14:27:35 +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
47d94d9bd6 Search metadata without installed google scholar working (fix #2024) 2021-06-29 18:38:02 +02:00
Ozzie Isaacs
0e2dca5f4d Fix upload of books uppercase extensions (#2038) 2021-06-26 20:14:52 +02:00
Ozzie Isaacs
a79600c81f Mass change book title and author (fix #1996) 2021-05-28 18:22:29 +02:00
Ozzie Isaacs
a62fca1e55 Merge branch 'master' into Develop 2021-05-22 11:28:59 +02:00
Ozzie Isaacs
bd4fde9e63 Fix #1992 handle invalid numbers of books seriesindex 2021-05-19 19:54:44 +02:00
Ozzie Isaacs
251780bed6 Added google scholar as metadata provider 2021-05-16 13:24:42 +02:00
Ozzie Isaacs
20b84a9459 Unified translations 
Update translations for release
 2021-05-16 09:37:45 +02:00
Ozzie Isaacs
4745fc0db1 Bugfix search for publish dates and custom column dates 
Bugfix save umplauts in comments unescaped (as calibre does)
Improved testability
 2021-05-15 07:51:32 +02:00
Ozzie Isaacs
6bf360fbfb Added "comments" type to supported custom columns 2021-05-13 14:00:01 +02:00
Ozzie Isaacs
b0cc52e0aa Enable custom column datetime (adv. search not working yet) #1984 2021-05-13 10:39:36 +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
78071841cc After Deleting a book the list page is still displayed #1938 2021-04-07 18:19: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
665210e506 Fixes for book edit with title sort and author sort 2021-04-04 14:01:06 +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
1c42c4c969 Update bootstrap-table 
Fixes for book edit
 2021-04-02 17:11:16 +02:00
Ozzie Isaacs
c4f0fc8f7b Update tests 
Fixes upload book
 2021-03-23 17:57:49 +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
59ebc1af8a Code refactoring 2021-03-21 08:20:04 +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
fcf9e7a1ef Upload pdf fixes: 
Handle no title
Handle no author
Fix import of more than one language
Add missing pdf upload publisher handling
 2021-03-17 19:06:51 +01:00
Ozzie Isaacs
9a963bbe79 Refactored code 
Testrun
 2021-03-15 13:10:17 +01:00
Ozzie Isaacs
e5f754ed0e improved session handling 2021-01-11 14:18:01 +01:00
Ozzie Isaacs
4a9b01e93b Added IntegrityError to catched error 2021-01-10 10:23:14 +01:00
Ozzieisaacs
5cce01215f Code refactoring ub.session.commit() 
Code cosmentics admin.py
 2021-01-03 09:53:34 +01:00
Ozzieisaacs
1905e0ee6f refactoring to prevent web.py being the middle of the universe 2020-12-12 11:23:17 +01:00
Ozzieisaacs
b637a63e71 Refactored exception logging 2020-12-12 08:11:00 +01:00
Ozzieisaacs
d9b22fd513 log exceptions only in debug mode 2020-12-11 16:46:02 +01:00
OzzieIsaacs
983e3b2274 Bugfix allowed formats for comics 
Bugfix editing archived books
 2020-12-09 19:02:10 +01:00
Ozzieisaacs
15bb0ce990 Fix for #1439 (send kepub file instead of epub for kobo epub3 request) 
Fix archived books are editable
 2020-12-04 19:23:36 +01:00
Ozzieisaacs
3372070a58 Fix change title regex 
Merge branch 'Develop' into master
 2020-12-02 11:09:55 +01:00
OzzieIsaacs
9afdab8c52 Fix from merge convert_from _to 2020-11-22 11:57:10 +01:00
Ozzieisaacs
ecea7e7493 Revert "Fix browser caching problem on change cover" 
This reverts commit b9536812f4.
 2020-11-22 10:06:54 +01:00
Ozzieisaacs
b9536812f4 Fix browser caching problem on change cover 2020-11-22 09:09:41 +01:00
Ozzieisaacs
eed2f0a430 Merge remote-tracking branch 'comic/master' into master 2020-11-22 08:45:02 +01:00
Ozzieisaacs
42c13ae135 Fix for #1718 (fetch of metadata from google without cover leads to exception) 2020-11-20 20:35:07 +01:00
Ozzieisaacs
400f6e02a5 Fix #1668 (upload of books with language set to different than UI language and not showing all books) 
Fix for only showing external port if kobo is really activated in admin menu
 2020-11-07 11:44:02 +01:00
cbartondock
bc52f90ed4 Merge remote-tracking branch 'upstream/master' 2020-11-02 11:36:45 -05:00
Ozzieisaacs
00b422807b Merge remote-tracking branch 'sec_fixes/edit_auth' into master 2020-10-31 20:04:12 +01:00
jvoisin
e7f7775efa Require edit permissions to edit books, even via ajax 2020-10-29 14:52:20 +01:00
jvoisin
19b2a334e4 Remove unused imports 2020-10-27 11:06:43 +01:00
cbartondock
1d83a6a898 distinguish convert from and convert to extensions 2020-10-16 11:51:59 -04:00
Ozzieisaacs
0d64692c84 Fix for convert + email task with gdrive 2020-09-30 19:29:57 +02:00
Ozzieisaacs
9a678c41fe Fix error from merge 2020-09-26 09:42:40 +02:00
Ozzieisaacs
7c8f6ce62f Merge branch 'master' into Develop 
# Conflicts:
#	cps/comic.py
#	cps/editbooks.py
#	cps/isoLanguages.py
 2020-09-26 07:54:38 +02:00
Ozzieisaacs
422c1893c0 Fix for the fix cover_url 2020-09-24 11:02:12 +02:00