Commit Graph

2083 Commits (master)

Author SHA1 Message Date
OzzieIsaacs 4b14cc6a74 Merge remote-tracking branch 'oauth/oauth-typo' into Develop 4 years ago
OzzieIsaacs b65095fd0f Merge remote-tracking branch 'google_oauth/patch-1' into Develop 4 years ago
OzzieIsaacs 28733179d2 Merge remote-tracking branch 'caliblur/editMetaFix' into Develop 4 years ago
OzzieIsaacs 960d23ca50 Merge remote-tracking branch 'caliblur/blurPaginationFix' into Develop 4 years ago
Michael Knepher 057f70ea9c Add author sort 4 years ago
blitzmann 3e378bd665 Some more clean up 4 years ago
blitzmann c120138f26 Fixes for pagination ugliness for caliBlur! style 4 years ago
blitzmann 31b20362ec caliBlur! style: Fixes issue with edit metadata button not getting styled correctly 4 years ago
blitzmann e7eb5b6ea6 Improvements to task processing
* Moves clean up to separate function for organization
* moves the `self.dequeued.append(item)` immediately after `self.queue.get()` so that we don't wait for it to show up

(cherry picked from commit bc9372e88f0c8855694431f811702d7fb899a97e)
4 years ago
OzzieIsaacs 9e5cad0dc8 Merge new worker thread 4 years ago
blitzmann 4cb82ea9bd Revert testing condition that decreased number of tasks kept 4 years ago
blitzmann 572ac4a17b Fix for deleting old, completed tasks
(cherry picked from commit e066d7a4b0f47d3327696a11795cdc923ff0f6f3)
4 years ago
Ozzie Isaacs dc5191f8ba Added unrar binary is found on windows 4 years ago
Ozzie Isaacs 8ab5710098 Updated testresuts Windows 4 years ago
OzzieIsaacs 61d628d596 oauth problem solved 4 years ago
Sean Leonard 078fc25845
Remove Google+ OAuth scope
The scope is no longer available per https://developers.google.com/+/api-shutdown

Fixes #1472 
Fixes #1573
4 years ago
Marvel Renju 67eb4b317a Fix typo
google oauth provider obtain link was pointing to github
4 years ago
blitzmann 6322919bc7 Merge branch 'Develop' into tasks
# Conflicts:
#	cps/db.py
4 years ago
blitzmann b81b8a1dea Fix registration email 4 years ago
blitzmann f3a3797850 Fail the convert task if the email subtask fails 4 years ago
blitzmann 5ec1283bb1 Remove threading for the calibre DB class 4 years ago
blitzmann 8634b0c6f0 Remove left over placeholder code 4 years ago
Ozzie Isaacs d89830af61 Fix anonymous user has no modified_flag error 4 years ago
Ozzie Isaacs ef1736b571 Fix error on guest user (view settings missing) 4 years ago
blitzmann 04081f62c4 Delete old worker thread class / logic 4 years ago
blitzmann 0f28dc5e55 Remove the queue stuff for CalibreDB (is no longer used) 4 years ago
blitzmann 508f49df18 Remove completed tasks and sort the tasks by date added when calling `.tasks` 4 years ago
blitzmann bec280c6b1 Add some error handling 4 years ago
blitzmann 6a8ae9c0c4 Merge remote-tracking branch 'upstream/master' into tasks
# Conflicts:
#	cps/helper.py
4 years ago
blitzmann ac22483f98 Add error handling to the email task within the convert task 4 years ago
blitzmann 59d56d5c83 py27 support (I think) and some clean up 4 years ago
OzzieIsaacs cdaad2fb4a Merge branch 'master' into Develop 4 years ago
OzzieIsaacs 843279bacb Merge remote-tracking branch 'jef/jef/download-kobo' into master 4 years ago
blitzmann a000de0270 Some clean up 4 years ago
blitzmann bf41b04cfa Remove convert task from db.py - with the fixed from #1565, this no longer seems to be needed 4 years ago
blitzmann 9ce2e8ea53 Fix progress indication for emails that have been completed. 4 years ago
OzzieIsaacs f066926fc9 Merge branch 'master' into Develop 4 years ago
OzzieIsaacs 4c38b0ab10 Prepare for save name sort order 4 years ago
OzzieIsaacs cf35c9dcef Merge remote-tracking branch 'name/patch-2' into master 4 years ago
OzzieIsaacs 45ff9394f2 Fix comma separated author names during for upload 4 years ago
blitzmann 414043ded1 Remove references to old worker, turn off calibre_db task queue (for now until I can determine if it's needed still), and attempt to re-implement email progress tracking (not working at the moment) 4 years ago
blitzmann 2533c9c14e Continue converting tasks - email and upload tasks 4 years ago
blitzmann f10f0dada6 First working PoC with a new task structure 4 years ago
OzzieIsaacs 282859bc1b Merge remote-tracking branch 'github/master' into master 4 years ago
OzzieIsaacs a3ae97a5a3 Fix #1574 (author name not shown in change book order in shelfs) 4 years ago
OzzieIsaacs ed8275a20b Fix #1574 (author name not shown in change book order in shelfs) 4 years ago
OzzieIsaacs f2add3f788 Migration of view settings working in User database
Book Merge gives now feedback on what is done
4 years ago
OzzieIsaacs ad144922fb Merge with master 4 years ago
OzzieIsaacs b9c0f2a3d3 Merge remote-tracking branch 'origin/master' into master 4 years ago
OzzieIsaacs 0cc07362b8 Fix for #1573 4 years ago
Brandon Ingli 4ee5dcaff3
Elevate Log Messages in web.py
Elevates login failure log messages and register failure log messages from INFO to WARNING, "Unknown Error" to ERROR, and fixes misspelling of "address" in web.py log messages. Misspelling remains in variable names to avoid breaking changes.
4 years ago
Ozzie Isaacs 4d44746a88 Change settings database gdrive watch to JSON 4 years ago
OzzieIsaacs 1535bdbcd8 Merge remote-tracking branch 'memorydatabase/issue/1564' 4 years ago
OzzieIsaacs f9c6fb30bf Excluded series type again, as it causes problems upon reconnect 4 years ago
Ozzie Isaacs 94ad93ebd7 Added series like custom columns #1501 4 years ago
blitzmann 0e1ec5034e Fix for #1564 - using memory database in multiple threads.
See also: https://docs.sqlalchemy.org/en/13/dialects/sqlite.html#using-a-memory-database-in-multiple-threads
4 years ago
OzzieIsaacs b309c1fc91 Fix filenames (Escape "\") for searching calibre excecutable on windows 4 years ago
Ryan Holmes 969105b205
Trim whitespace from filename
This avoids an OSError when the book's metadata has whitespace at the end of it.
4 years ago
Ryan Holmes 28bfb06c67
Revert the deletion of another line
This was done by mistake, whoops!
4 years ago
Ryan Holmes 704dcb3e58
Move assignment of `new_coverpath`
With the assignment originally being within the try, if the try failed, the exception wouldn't have access to the value
4 years ago
Ren Wei 4c6f5096be get metadata, typo, if no result from google, it will display the noresult msg, regardless of the others results. 4 years ago
Ozzie Isaacs 1a1d105fae Fix #1538 (Floating point numbers showing 2 decimals on details page 4 years ago
Ozzie Isaacs 42a0639bb5 Fix #1533 (Invalid LDAP Cert Path no longer crashes app) 4 years ago
Ozzie Isaacs e27b08203d Fix #1531 (white background on transparent cover instead of black one) 4 years ago
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 "") 4 years ago
Ozzie Isaacs 0ccc3f7252 Fixes for windows (moving files not allowed -> Close pdf after metadata extracting, add os.path.normcase to path while renaming folders, as thi caused also trouble
Added hint for missing ghostcript on cover extraction
4 years ago
Ozzie Isaacs 66acd1821d Update Gdrive integration (Error Handling on Callback and wording) 4 years ago
Ozzie Isaacs 93a0217d5f Fix for #1530 (Handle improper migrated database with config_mature_content_tags NULL instead of "") 4 years ago
Jef LeCompte 711a697570
Merge remote-tracking branch 'upstream/master' into jef/download-kobo 4 years ago
Ozzieisaacs f8139f3198 Store last selected view for sidebar (not for categories, series, publishers, ..)
Started making search paged
4 years ago
Ozzieisaacs df01022f49 Added save user view settings 4 years ago
Ozzieisaacs 450411a732 #1344 (Support Multiple authors, but not showing up on Kobo reader)
Fix for #1439 (reading progress was not stored, as user login was wrong)
4 years ago
Ozzieisaacs f80c67828b Fix #1500 (Custom ratings of increment 0.5 are allowed) 4 years ago
Ozzieisaacs d1889a5e06 Fix #1502 (program info only visible in about section if user is admin) 4 years ago
Ozzieisaacs 12263ff02f Fix #1423 (OverflowError thrown during sync on some Linux Systems if one of the timestamps is outside range 1970 to 2038) 4 years ago
Ozzieisaacs 76f914cbc2 Fixed logging in SyncToken 4 years ago
Ozzieisaacs c1f5252b3f Fix #1509 (OSError thrown during sync on Windows if one of the timestamps is outside range 1970 to 2038) 4 years ago
Ozzieisaacs 20c6f79a44 Changed behavior delete books with subfolders (additional warning message, but book is deleted) 4 years ago
Ozzieisaacs ee6f1405d4 Fix #1456 (Added route to robots.txt) 4 years ago
Ozzieisaacs ee3541d74e Fix kobo links for reverse proxies with subdomains (and docker?) #1470 4 years ago
Jef LeCompte e048388213
feat(api): include external port option
Signed-off-by: Jef LeCompte <jeffreylec@gmail.com>
4 years ago
Ozzieisaacs 3ff3431b17 Merge branch 'master' into Develop 4 years ago
Ozzieisaacs 8608ff11f7 Fix #1507 (Password generation on python2 working again) 4 years ago
Michael Knepher 7e0d9fbace series_index filter to show x.0 as x 4 years ago
Ozzieisaacs c6c9cfea22 Merging books basically working 4 years ago
Ozzieisaacs a758976c69 Merge branch 'master' into Develop 4 years ago
OzzieIsaacs 601464083b Fix for task wrap around 4 years ago
Ozzieisaacs ccca5d4d1c Merge branch 'master' into Develop
# Conflicts:
#	cps/templates/layout.html
4 years ago
Ozzieisaacs ba10657829 Add fix for read only gdrive file 4 years ago
Ozzieisaacs 6315655f93 Re-add missing po files 4 years ago
Ozzieisaacs 533cb23b73 Merge remote-tracking branch 'next/bug/login-next-get-param' 4 years ago
Ozzieisaacs 852f252d13 Prevent invalid variable
Make text in kobo_auth_screen consistent
4 years ago
Ozzieisaacs 080042882f Merge remote-tracking branch 'cz/master' 4 years ago
Ozzieisaacs dde5b08c47 Re enabled gevent as dependency
Fix #1399 (Calibre-web starting with installed and not activated gdrive denpendencies without internet connection again)
4 years ago
Ozzieisaacs 88d2c60ee8 Catch some errors related to non writable settings db 4 years ago
Ghighi Eftimie eeff5a5d43 fix for hidden input 'next' on login form 4 years ago
Michael Knepher 67dd4a72b0 Add series info to all book "meta" displays 4 years ago
Ozzieisaacs a0b8cc21cc Fix #1503 (js error on login screen) 4 years ago
Ozzieisaacs 329a7a03a5 Fix for errors editing/uploading books with duplicate tags/authors/language names
Additional parsing of epubs for cover files
Fix for change of database with linked read_column and read column isn't present any more
4 years ago
Ozzieisaacs d0a3503d74 Fix #1493 (stay logged in with enabled remember token, use remember token) 4 years ago
Ozzieisaacs 59b78f9984 enable disabling of remember_me function 5 years ago
Ozzieisaacs bf75f16169 Updated Chinese translation 5 years ago
Ozzieisaacs 2f833dc457 Fix login with remember me token 5 years ago
Ozzieisaacs 22344a3971 Improvements for delete book 5 years ago
Ozzieisaacs 8dde6ba60f UI improvements table buttons 5 years ago
Ozzieisaacs d44f283a05 View status in books table is stored 5 years ago
Ozzieisaacs c18d5786dd Improved validation check 5 years ago
Ozzieisaacs f26ccfe16c Table edit: validator routine to prevent empty fields working 5 years ago
Ozzieisaacs 1c681ee378 Improvements for books table editor 5 years ago
Ozzieisaacs 94b5ec91cc Title in table translatable
Edit some elements in table possible
Checkbox state is kept over page change in book table
Fix missing div in layout
5 years ago
Ozzieisaacs 6bfbf3ee41 Update layout 5 years ago
Ozzieisaacs 7b4306b1d6 UI improvements (same colors of buttons, etc.)
Changed Editable default value
5 years ago
Ozzieisaacs 4516cc0d65 Listen button only visible if user has read permissions
Audioformat fix
Table edit functions only available if user has edit rights
5 years ago
Ozzieisaacs 308784c601 Hide listen button if user has no read/listen permissions 5 years ago
Ozzieisaacs 9145c9a52c Fix #1397 (Reenabled m4a, m4b audio playback) 5 years ago
Ozzieisaacs 4038cb5b85 Internal paged Search prepared
Search for table list is working
5 years ago
Ozzieisaacs 628658972c Merge branch 'master' into Develop 5 years ago
Ozzieisaacs db0fe9a755 Fix for #1474 (old comicapi with installed unrar, but missing unrar-lib) 5 years ago
Ozzieisaacs fdf10e3d2e Fix #1473 (reconnect not working via web-route access) 5 years ago
Ozzieisaacs ded3e06a9b Updated french translation 5 years ago
Ozzieisaacs 0dd0605a1f Book list for merging 5 years ago
Ozzieisaacs 827b0c6e50 Changed pubdate to timestamp 5 years ago
Ozzieisaacs d1b533848d Changed pubdate to timestamp 5 years ago
Ozzieisaacs 13ae28edab Fix #1449 (Shelf download menu wasn't working for books with more than one format) 5 years ago
Ozzieisaacs 82253219e8 Fix #1449 (Shelf download menu wasn't working for books with more than one format) 5 years ago
Ozzieisaacs 94592b74a6 Merge branch 'master' into Develop 5 years ago
Ozzieisaacs eef2112e1e #1430 (changed color of rating stars) 5 years ago
Ozzieisaacs b83d56eff2 Version bump 5 years ago
Ozzieisaacs 4c539b6db4 Fix #1448 (Public shelfs are accessible even if not logged in) 5 years ago
OzzieIsaacs 2ad329e64c Preparation for release 5 years ago
Ozzieisaacs 4de89ec6ce Merge remote-tracking branch 'it/patch-14' 5 years ago
Ozzieisaacs fc885c8fa2 Merge remote-tracking branch 'cz/patch-1' 5 years ago
Ozzieisaacs ef2c98ba39 Fix #1453 (error unrar binary not found) 5 years ago
ElQuimm 41d922867e
updated italian version of message.po
Thank you.
5 years ago
Ozzieisaacs 89223760e6 Merge branch 'master' into Develop 5 years ago
Ozzieisaacs 9a8a1f75ca For for error unrar binary not found 5 years ago
flying-sausages 52e8e7e4b0
Some czech translations 5 years ago
Ozzieisaacs 7d08cde8b8 Update error handling cover upload 5 years ago
Ozzieisaacs d3c2bf7dd4 Merge remote-tracking branch 'es/patch-1' 5 years ago
Michael Knepher 54cf3652b0 Add series name and index to book cover info 5 years ago
Ozzieisaacs 5607d2086d Added error handling for cover upload 5 years ago
Ozzieisaacs 27ed918896 Enabled search for archived books 5 years ago
Ozzieisaacs 9b2df9cfd9 Fix #1441 (list copy function not available on python2, crashes edit metadata) 5 years ago
Wolviex dde7cf18f7 removed extra reference to calibre_db (calibre_db.calibre_db..) typo? 5 years ago
Rafael Roa 48aadbf716
Update messages.po 5 years ago
Ozzieisaacs 5514af60e5 Merge remote-tracking branch 'it/patch-13' 5 years ago
ElQuimm e8449eb02f
Updated version of italian message.po
Thank you.
5 years ago
Ozzieisaacs 9ea21a7ecb Possible fix for #1436 5 years ago
Ozzieisaacs fec86c2862 Update Grid/list view of series 5 years ago
Ozzieisaacs 11e5d4c5b7 Merge remote-tracking branch 'es/patch-2' 5 years ago
Ozzieisaacs b852fb0e26 Merge branch 'Develop' 5 years ago
Ozzieisaacs 0fc18bf3b1 Fix for #1398 (prevent empty series_index field) 5 years ago
Rafael Roa d4be584782
Update messages.po
Here is the whole file traslated
5 years ago
Ozzieisaacs 6f9c08f906 Fix typo RarExecutable 5 years ago
Ozzieisaacs 70c666c380 Upload book without reload complete library 5 years ago
Ozzieisaacs 46197d82b5 Edit and Upload books refactored 5 years ago
Ozzie Isaacs e4eab17595 Fix version detect of binaries on windows 5 years ago
Ozzieisaacs cf10244f20 Fix for failed recovery of config_logfile 5 years ago
Ozzieisaacs 570684d308 Fix custom bool column not visible in adv search if linked to read status 5 years ago
Ozzieisaacs 244db8d894 Fix from tests advanced search for custom columns 5 years ago
Ozzieisaacs 96d6018ecc Added ability to view comicapi version
Changed required comicapi version
Unified "cannot" and "Cannot" texts
Removed annoying "was already removed" string from log
5 years ago
OzzieIsaacs 73ad6dd0c4 Fix kobo sync (sync tags) 5 years ago
OzzieIsaacs d0e15da352 Fix lcase function 5 years ago
Ozzieisaacs b1b293a3ec Fix order_authors 5 years ago
Ozzieisaacs 5f0660a4e5 Refactored helper.py and db.py 5 years ago
Ozzieisaacs ec3a3a73ef Merge branch 'master' into Develop 5 years ago
Ozzieisaacs 087c4c5929 Merge remote-tracking branch 'opds/master' 5 years ago
Ozzieisaacs e0ee2e0801 Merge remote-tracking branch 'typo/master' 5 years ago
Michael Knepher c79a9e9858 Fix typo "Shelfs" to "Shelves" 5 years ago
OzzieIsaacs b7535b9526 Merging master branch
- fix title sort function
- fix focus on search
5 years ago
OzzieIsaacs 0cf1cc5587 Fixes from tests 5 years ago
Ozzieisaacs 098dab889a Fixed title sorting routine 5 years ago
Ozzieisaacs cc856c7cd1 Merge remote-tracking branch 'search_focus/activate-search-focus-if-search-in-progress' 5 years ago
Ozzieisaacs a20a155d39 Merge remote-tracking branch 'typo/patch-2' into Develop 5 years ago
Ozzieisaacs 1a458fe39f Fix for #1407 converting books should now be possible again 5 years ago
celogeek 051ffdda35
activate search focus if search in progress 5 years ago
OzzieIsaacs a48418364c Fiexes from tests 5 years ago
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) 5 years ago
Knepherbird 5cceeb6ef2
Fix: correct property typo
Correcting 'box-sizeing' to 'box-sizing'
5 years ago
Ozzieisaacs 29b94c5615 Fix for #1407 (to many read books lead to to large sql query) -> only fix for linked calibre-column 5 years ago
Ozzieisaacs 81fc1eccd3 Fix for #1407 (to many read books lead to to large sql query) -> only fix for linked calibre-column 5 years ago
Braincoke 22fae51c9d Fix XML parsing error when using OPDS feeds
Using the OPDS feeds with MoonReader yielded the following error:
"Error parsing XML: unbound prefix".
This was due to a missing namespace in the feed.xml template.
See https://github.com/janeczku/calibre-web/issues/1403 for more
information.
5 years ago
Ozzieisaacs 4332f7a640 Better detection of localhost for kobo sync (possibly related to #1400) 5 years ago
Ozzieisaacs d0e603e62d Better detection of localhost for kobo sync 5 years ago
Ozzieisaacs 38c28f4358 Merge branch 'master' into Develop
# Conflicts:
#	cps/admin.py
#	cps/constants.py
#	cps/static/css/caliBlur.min.css
#	cps/uploader.py
5 years ago
Ozzieisaacs 742799b4ac Added missing float custom column to search form 5 years ago
Ozzieisaacs 5405dc5141 Fix for #1387 (saving settings with enabled gdrive metadata watch led to crash) 5 years ago
Ozzieisaacs 013793f989 Fix for #1391 (Kobo sync not working if series is given, but no series_index) 5 years ago
Ozzieisaacs 2468cf63cc Fix for #1397 (changed supported audio files)
Changed max gevent version
Fix for #1397 (changed supported audio files)
5 years ago
Ozzieisaacs 8e9b5d7e50 Merge remote-tracking branch 'caliblur/master' 5 years ago
Ozzieisaacs a33515d907 Merge remote-tracking branch 'refactor/refactor_uploader' 5 years ago
Ozzieisaacs a276a33081 Merge remote-tracking branch 'nl/master' 5 years ago
h1f0x e325c3dbf6 fixed div selection in caliBlur.js 5 years ago
h1f0x b3fef625a8 Fixed Calibur views: series, authors, publishers, ratings, file formats, detail view 5 years ago
Ozzieisaacs 13994a5f96 Merge branch 'master' into Develop 5 years ago
Ozzieisaacs e8ac62cdd8 Moved password replace to prevent incomplete session 5 years ago
Ozzieisaacs 1bc7134ec2 Fix error 500 on reset password in debug mode 5 years ago
Ozzieisaacs 273572f44c Merge branch 'master' into Develop
# Conflicts:
#	cps/ub.py
5 years ago
Ozzieisaacs ac37483d47 Fix for #1391 (kobo sync errors out if read/unread books had been present in app.db during initial database migration) 5 years ago
Ozzieisaacs 0cc2b49296 Merge branch 'master' into Develop
# Conflicts:
#	cps/templates/book_edit.html
5 years ago