1
0
mirror of https://github.com/janeczku/calibre-web synced 2024-11-01 07:36:20 +00:00
Commit Graph

460 Commits

Author SHA1 Message Date
Ozzie Isaacs
8ee34bf428 Bugfixes for password policy 2023-02-15 19:53:35 +01:00
Ozzie Isaacs
508e2b4d0a Merge branch 'master' into Develop
# Conflicts:
#	cps/admin.py
#	cps/config_sql.py
#	cps/search.py
#	cps/templates/admin.html
#	cps/web.py
#	setup.cfg
#	test/Calibre-Web TestSummary_Linux.html
2023-01-28 18:52:50 +01:00
Ozzie Isaacs
43ee85fbb5 Removed unnecessary Unicode "u" 2023-01-21 15:23:18 +01:00
Ozzie Isaacs
8022b1bb36 Merge remote-tracking branch 'english/master' 2023-01-21 15:19:59 +01:00
Josh O'Brien
b3335f6733 English Language Updates - V3 2023-01-04 13:30:13 +11:00
Ozzie Isaacs
c10708ed07 Backup metadata 4th step 2022-09-19 22:39:40 +02:00
Ozzie Isaacs
26be5ee237 Backup metadata 3rd step 2022-09-19 18:56:31 +02:00
Ozzieisaacs
ca0ee5d391 backup metadata first step 2022-09-10 18:26:52 +02:00
Ozzie Isaacs
89d226e36b Allow deletion of kindle email address and force e-mail address to be valid 2022-08-28 15:54:43 +02:00
gjutras
c974cd048e minor formatting 2022-08-02 19:51:31 -04:00
gjutras
24e9bf2728
Merge branch 'janeczku:master' into master 2022-08-01 16:38:46 -04:00
Ozzie Isaacs
68e21e1098 Fix #2495, Fix #2494 (Convert for not existent file no longer fails) 2022-07-31 11:28:11 +02:00
gjutras
ff46af9c49 fix indentation and spaces 2022-07-10 17:23:20 -04:00
gjutras
0a7345186d Merge branch 'janeczku-master'
# Conflicts:
#	cps/helper.py
#	cps/tasks/convert.py
#	cps/templates/user_edit.html
2022-07-08 16:42:14 -04:00
Ozzie Isaacs
3bde8a5d95 Encrypt passwords 2022-07-02 17:45:24 +02:00
Kian-Meng Ang
c4104ddaf4 Fix typos 2022-07-01 21:26:06 +08:00
Ozzieisaacs
c5fc30a1be Bugfix error message missing custom read status column
Bugfix password validation
2022-06-17 14:49:42 +02:00
Ozzieisaacs
4ef8c35fb7 Bugfies password validation from testrun 2022-06-16 14:16:00 +02:00
Ozzie Isaacs
89d522e389 Fix for #2445 (book read status can't be set if custom column is linked and read status was set before) 2022-06-11 11:35:02 +02:00
Ozzie Isaacs
91df265d40 Fix for #2437 (advanced search for read status crashes calibre-web) 2022-06-08 17:17:07 +02:00
leexia
3b7cd38d5e Fix grammar mistake 2022-05-16 13:59:35 +08:00
Ozzie Isaacs
fbac3e38ac Eenabled send epubs to E-Reader devices 2022-05-08 12:55:54 +02:00
Ozzie Isaacs
056ecf0d90 Fix for #2394 2022-05-04 19:23:08 +02:00
Ozzieisaacs
ae5053e072 Added missing translation strings
Update German Translation
2022-05-01 13:24:11 +02:00
Ozzie Isaacs
12f3a13d1d Fix typo
Fix missing maim.py file in update pypi package
Bugfix after last testrun
2022-05-01 10:25:38 +02:00
Ozzie Isaacs
e8e4d87d39 Bugfix session commit
Bugfix get_locale
Bugfix reconnect database schedule
Bugfix no permission error message logging
Bugfix updater
2022-04-30 10:17:41 +02:00
Ozzie Isaacs
a968ddaef2 Bugfixes after testrun 2022-04-28 21:09:03 +02:00
Ozzie Isaacs
2e007a160e reenable startup logging
Bugfixes from refactoring and merge
2022-04-26 14:45:06 +02:00
Ozzie Isaacs
e7464f2694 Refactored web.py to shrink size of file 2022-04-26 11:49:06 +02:00
Ozzie Isaacs
ae9a970782 Add button to update cover cache (for usecase sideloaded changed cover)
Bugfix logig start background schedue
2022-04-25 08:24:14 +02:00
Ozzie Isaacs
1e723dff3a Make texts in Background thread translatable 2022-04-24 18:40:50 +02:00
Ozzie Isaacs
069dc2766f Update optional-requirements
Bugfix with serializing tasks
Bugfix order of tasks (id was used instead of task_id)
Code cosmetics
2022-04-23 20:03:59 +02:00
Ozzie Isaacs
2f5b9e41ac Reduce number visible System tasks in Tasks list 2022-04-22 20:31:03 +02:00
Ozzie Isaacs
9a8093db31 Thumbnail is generated directly after a book is added 2022-04-22 16:13:51 +02:00
Ozzie Isaacs
fe5d684d2c Merge branch 'master' into cover_thumbnail 2022-04-13 18:37:44 +02:00
Ozzie Isaacs
83b99fcb1a Fix cover upload url with spaces at the end
Support image/jpg as upload format mimetype, remove redundant check of mimetype
2022-04-12 19:33:00 +02:00
Ozzie Isaacs
3d2e7e847e Merge branch 'master' into cover_thumbnail
# Conflicts:
#	setup.cfg
#	test/Calibre-Web TestSummary_Linux.html
2022-04-05 19:11:11 +02:00
Ozzie Isaacs
8adae6ed0c Handle permission errors for static files (Fix for #2358)
Version bump
2022-04-03 20:26:43 +02:00
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
834edadc28 Possible fix for #2350 and #2351 (databse locked)
Fix for #2309 (long unicode filenames could get to long)
2022-03-29 18:30:05 +02:00
gjutras
cb0d9ec95c Allow kindle_email to be CSV to allow sending to multiple kindles 2022-03-28 19:59:59 -04:00
Ozzie Isaacs
73d359af05 Bugfix logging with gdrive
Update optional-requirements.txt
2022-03-28 19:02:12 +02:00
Ozzie Isaacs
2f949ce1dd Enabled search for text based custom column content in simple search (fix for #2279) 2022-03-28 14:09:28 +02: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
399ddc5d6f Update testresults 2022-03-15 18:45:14 +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
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
3b5e5f9b90 Undo check of read checkbox in case of error
Display error message in details modal dialog
Bugfix set archive bit in booktable
Translate error message readstatus change
2022-03-12 22:16:33 +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
598618e428 Fix rename_files_on_change return handling
Updated test result
2022-03-01 16:36:46 +01:00
Ozzie Isaacs
965352c8d9 Don't allow redirects on cover uploads, catch more addresses which resolve to localhost 2022-02-26 08:05:35 +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
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
111ab121b1 Bugfix upload file with existing author 2022-01-30 21:27:06 +01:00
Ozzie Isaacs
1e04b51148 Renaming of co-authors which are authors in another book 2022-01-30 15:16:42 +01:00
Ozzie Isaacs
3ae1b97d72 Fix renaming title and author in the same request 2022-01-30 13:44:53 +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
3c4cd22d9e Renaming files on gdrive seem to work 2022-01-25 21:14:21 +01:00
Ozzie Isaacs
128db26301 Resolved merge conflicts 2022-01-24 18:49:21 +01:00
Ozzie Isaacs
d8f5bdea6d Refactor rename author/title on gdrive 2022-01-23 19:31:56 +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
ede273a8f9 Added variable to allow loading cover from localhost 2022-01-23 13:43:35 +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
de1bc3f9af Fix #2265 (add book to shelf on popup for book details)
Updated testresults
2022-01-17 17:46:57 +01:00
Ozzieisaacs
47f5e2ffb4 Remove python2 urllib imports
Fix for "javascript:" script links in identifier
2021-12-30 14:45:31 +01:00
Ozzieisaacs
7eb875f388 Improvement for gdrive rename authors 2021-12-28 17:13:18 +01:00
Ozzieisaacs
bdedec90dd Catch more Gdrive errors (#2233) 2021-12-23 11:13:08 +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
592288cb22 Fix inverted "convert to English characters" setting 2021-12-19 08:04:13 +01:00
Ozzie Isaacs
6e15280fac Start renaming author names on gdrive 2021-12-05 19:01:23 +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
91a21ababe Allow download of archived books 2021-12-04 11:16:33 +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
Ozzie Isaacs
5ede079401 Handling of invalid cover files on upload 2021-11-20 13:45:41 +01:00
Ozzieisaacs
8e5bb02a28 Merge author rename 2021-11-20 13:28:45 +04:00
Ozzieisaacs
baba205bce Rename everything on rename authors 2021-11-11 18:46:32 +04:00
Ozzie Isaacs
ed26d34961 Code cleaning (remove python2) 2021-10-04 19:23:24 +02: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
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
8bee2b9552 Added CACHE_DIR env variable, graceful handling when APScheduler is not installed 2021-09-19 22:45:19 -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
86ef1d47e8 Bugfixes from testrun 2021-08-30 08:02:21 +02:00
Ozzieisaacs
10e212fcde Merge branch 'master' into Develop 2021-08-29 10:44:13 +02:00
Ozzie Isaacs
d4cfad6363 Fixed several text problems from tasks
Fixed task update
2021-08-28 11:32:13 +02:00
Ozzie Isaacs
3a24561ca2 Removed additional " from convert message 2021-08-28 10:32:40 +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
91e6d94c83 Improved displaying of username and task title in tasks 2021-08-27 14:27:35 +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