Ozzieisaacs
6ad56a0859
Merge branch 'master' into Develop
2020-11-30 18:37:14 +01:00
Ozzieisaacs
8515781564
Fix #1727 (import rarfile 4.0 fails on python3.5)
2020-11-30 18:36:45 +01:00
ElQuimm
7e2bfbd255
update italian message.po
...
some minors changes.
2020-11-26 14:35:15 +01:00
Jennifer Thakar
e2325f7ba4
Forward Overdrive requests to Kobo Store
...
When loading books from OverDrive, Kobo readers make requests to `/v1/products/books/external/<overdrive ids>`.
This adds a route to forward these requests to the Kobo Store, so that OverDrive still works when using Calibre-Web's Kobo sync server.
2020-11-22 15:06:37 -08:00
OzzieIsaacs
9afdab8c52
Fix from merge convert_from _to
2020-11-22 11:57:10 +01:00
Ozzieisaacs
f620d4a9ca
Fix LDAP errors
2020-11-22 11:19:14 +01:00
Ozzieisaacs
fb1e763bbe
Fix browser caching problem on change cover
2020-11-22 10:07:25 +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
560ade00b4
Fix browser caching problem on change cover
2020-11-22 10:03:10 +01:00
Ozzieisaacs
81ea24ad54
Merge branch 'master' into df
2020-11-22 09:34:11 +01:00
Ozzieisaacs
747b25046a
Merge branch 'master' into Develop
2020-11-22 09:16:27 +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
31fe8cd263
Improvement for #1721 (shrinked generic cover)
2020-11-22 08:28:52 +01:00
Ozzieisaacs
a3fadbaa1a
Shrinked size of generic cover
2020-11-22 08:28:10 +01:00
Ozzieisaacs
e2be655d74
Update LDAP, fix Windows AD login ( #1697 )
2020-11-22 08:17:00 +01:00
Ozzieisaacs
6538aff02f
Merge branch 'master' into Develop
2020-11-22 08:08:27 +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
9bd51c650b
Add config options for client certificate authentication
2020-11-20 19:47:50 +01:00
Ozzieisaacs
ba1c1c87c4
Merge remote-tracking branch 'kobo/feature/use-kobo-specific-download-urls' into Develop
2020-11-20 19:47:25 +01:00
Ozzieisaacs
ceefba2743
Fix for #1550 (password prompt for LDAP and anonymous browsing)
2020-11-15 17:16:01 +01:00
Ozzieisaacs
32b7b39223
Added function to download debug information
2020-11-15 14:25:27 +01:00
verglor
2343c79126
Use djvu_html5 to read djvu format in browser
2020-11-15 13:19:37 +01:00
verglor
09a5a69f86
djvu_html5 0.3.0-beta1 static assets
2020-11-15 13:09:32 +01:00
Ozzieisaacs
4081895a78
exclude _pysqlite.so from being overwritten
2020-11-14 15:53:56 +01:00
Ozzieisaacs
013c4e9c35
Merge remote-tracking branch 'epub/recompute_epub' into master
2020-11-14 13:22:42 +01:00
Ozzieisaacs
067f289050
Merge remote-tracking branch 'comic/comic' into master
2020-11-14 13:21:56 +01:00
Ozzieisaacs
06511b92aa
Merge remote-tracking branch 'epub/GruberMarkus-patch-1' into master
2020-11-14 13:20:26 +01:00
Ozzieisaacs
32f4c9eabf
Merge remote-tracking branch 'fr/master' into master
2020-11-14 13:16:08 +01:00
Ozzieisaacs
14bc345883
Merge remote-tracking branch 'audio/fix-audio-icon' into master
2020-11-14 13:14:21 +01:00
Ozzieisaacs
d76b4fd7ea
Merge remote-tracking branch 'it/patch-17' into master
2020-11-14 13:12:36 +01:00
ElQuimm
83cdd7e9fb
update italian message.po
...
some minor update to the translation.
2020-11-13 11:17:46 +01:00
verglor
50441bae62
Fix missing audio icon for other audio formats than mp3
2020-11-10 18:08:22 +01:00
Martin
5b0766a9b0
Correct spelling
2020-11-10 10:06:37 +01:00
Martin
d979fe8e5f
fix fr translation : sed cryptage/chiffrement
2020-11-10 10:04:47 +01:00
Markus Gruber
f2c52fd278
Update jszip to 3.5.0. Update epub.js to 0.3.88.
...
Fixes several problems when viewing EPUBs in a browser, for example when jumping to a certain chapter in the table of contents does not work.
2020-11-09 15:47:27 +01:00
Ozzieisaacs
87d60308f2
Merge remote-tracking branch 'caliblur/issue/caliblur-981' into master
2020-11-08 19:29:10 +01:00
Ozzieisaacs
58d485cbb5
Fix #1702 (invalid timestamps during kobo sync caused by malformed database)
2020-11-07 12:49:39 +01:00
Ozzieisaacs
e99dd3310c
Exchanged douban apikey
2020-11-07 12:18:33 +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
jvoisin
700b0609df
Don't recompute metadata for epubs
2020-11-06 21:36:49 +01:00
cbartondock
bc52f90ed4
Merge remote-tracking branch 'upstream/master'
2020-11-02 11:36:45 -05:00
Ozzieisaacs
0771546dad
Log exception on user import
2020-11-01 18:25:38 +01:00
jvoisin
95a1a71a66
Minor refactor of comic.py
2020-10-31 22:28:24 +01:00
Ozzieisaacs
25da6aeeca
Merge remote-tracking branch 'sec_fixes/space' into master
2020-10-31 20:04:42 +01:00
Ozzieisaacs
00b422807b
Merge remote-tracking branch 'sec_fixes/edit_auth' into master
2020-10-31 20:04:12 +01:00
Ozzieisaacs
130701a7bb
Merge remote-tracking branch 'sec_fixes/admin_update' into master
2020-10-31 20:02:42 +01:00
Ozzieisaacs
ff88e68904
Add missing locale files
2020-10-31 19:58:22 +01:00
Ozzieisaacs
55fcf23d2b
Merge remote-tracking branch 'sec_fixes/negate' into master
2020-10-31 19:37:47 +01:00
Ozzieisaacs
1b0b4c4cc5
Merge remote-tracking branch 'sec_fixes/ldap' into master
2020-10-31 19:29:17 +01:00
Ozzieisaacs
cd57731593
Merge remote-tracking branch 'sec_fixes/unused_imports' into master
2020-10-31 19:24:46 +01:00
Ozzieisaacs
37a80b935d
Added greek translation
2020-10-31 19:20:00 +01:00
Ozzieisaacs
4d61aec153
Merge remote-tracking branch 'zh/trans' into master
2020-10-31 19:07:10 +01:00
Ozzieisaacs
1adf25d50b
Update Italian translation
2020-10-31 19:06:09 +01:00
Julian Naydichev
ae33aee3f6
When serving a download URL via KoboSync, use a URL that is specific to Kobo
2020-10-31 14:50:08 +01:00
jvoisin
2c99e71626
Remove a superfluous space
2020-10-29 18:17:32 +01:00
jvoisin
e7f7775efa
Require edit permissions to edit books, even via ajax
2020-10-29 14:52:20 +01:00
jvoisin
8b60a19577
Don't leak to non-admin users the current installed version
2020-10-29 14:03:18 +01:00
Ozzieisaacs
5701e08db9
Fix for #1668
2020-10-28 20:37:52 +01:00
jvoisin
d2617322c6
Negate a condition
...
- removes two levels of indentation
- makes it clear that if the wrong tokens are provided nothing will happen
- remove a useless nested function
2020-10-27 19:41:05 +01:00
jvoisin
fa82745f64
Put import_ldap_users behind a login
2020-10-27 19:26:04 +01:00
jvoisin
19b2a334e4
Remove unused imports
2020-10-27 11:06:43 +01:00
vagra
627c2adf08
SImple Chinese translation updated.
2020-10-26 22:56:58 +08:00
ElQuimm
e3e137ca50
updated italian message.po
2020-10-22 16:31:25 +02:00
cbartondock
0978be580f
Merge remote-tracking branch 'upstream/master'
2020-10-21 13:01:25 -04:00
Ozzieisaacs
5792838333
Add OSError to catched Gevent Error
2020-10-20 17:38:37 +02:00
Ozzieisaacs
f9995583a5
Merge remote-tracking branch 'translate/patch-1' into master
2020-10-20 17:12:25 +02:00
KN4CK3R
4cc68bd139
Fixed typo.
2020-10-20 13:45:01 +02:00
cbartondock
d2510ad1bc
Merge remote-tracking branch 'upstream/master'
2020-10-17 21:46:26 -04:00
celogeek
4d81d3613c
display the check when books are read
2020-10-17 16:49:57 +02:00
celogeek
7d28963a32
connect read books to all render
2020-10-17 16:49:38 +02:00
celogeek
b2594468b4
add helper to get all read books
2020-10-17 16:49:06 +02:00
celogeek
754b9832e9
fix height container
2020-10-17 13:30:19 +02:00
celogeek
097ac879ea
render read
2020-10-17 13:24:46 +02:00
Ozzieisaacs
bc0416cbb4
Fix for #1660 (advanced search for custom columns working, headline for advanced search working)
2020-10-16 20:24:15 +02:00
Ozzieisaacs
2814617e4b
Fix for #1660 (Pagination in advanced search not working, error 500 for no filter in advanced search)
...
Fix #1666 (Pagination in search not working)
2020-10-16 19:56:24 +02:00
cbartondock
da9dfd166d
fixed incorrect cover widths
2020-10-16 13:51:48 -04:00
cbartondock
1be07a42df
Flex display to fix columns issue
2020-10-16 13:41:48 -04:00
cbartondock
1d83a6a898
distinguish convert from and convert to extensions
2020-10-16 11:51:59 -04:00
Ghighi
2ff286b672
natural solution, pagination is changing on new page
2020-10-16 00:43:57 +03:00
Ozzie Isaacs
e8620a0986
Fix logging error on windows with invalid goodreads key/secret
2020-10-14 20:48:01 +02:00
Ozzieisaacs
5b67b687d3
Removed remaining code from view downloaded books in user section
...
Fixes for #1661
2020-10-13 19:45:27 +02:00
Ghighi Eftimie
9adcfa99f4
trigger infinite scroll script only on templates where .load-more class is present
2020-10-11 22:35:56 +03:00
Ghighi Eftimie
e723aaa5f6
fix for history state (+1 not needed)
2020-10-11 21:56:49 +03:00
Ozzie Isaacs
d128b037a5
Fix for editing files on windows
2020-10-11 18:01:26 +02:00
Ghighi Eftimie
f574f8faf0
better js check
2020-10-10 18:34:55 +03:00
Ghighi Eftimie
cedfa90d76
fix for #981
2020-10-10 17:51:46 +03:00
Ghighi Eftimie
f1e6f6e505
fixes for #1560
2020-10-10 14:58:06 +03:00
Ozzieisaacs
e16c0caebb
Fix opds search
2020-10-10 12:53:10 +02:00
Ozzieisaacs
52489a484a
Merge remote-tracking branch 'Knepherbird/master' into master
...
# Conflicts:
# cps/jinjia.py
# cps/templates/detail.html
# cps/templates/discover.html
# cps/templates/index.html
# cps/web.py
2020-10-10 12:47:49 +02:00
Ozzieisaacs
e1d5c2c578
Merge remote-tracking branch 'caliblur/issue/caliblur-1594' into master
2020-10-10 12:29:30 +02:00
Ozzieisaacs
49f49632ad
Renamed CalibLur.css
2020-10-10 12:22:52 +02:00
Ghighi Eftimie
6dadc6fb1e
same fix but hopefully better
2020-10-10 13:15:02 +03:00
Ozzieisaacs
a58a2f5fe4
Added missing file for tr locale of datepicker
2020-10-10 11:53:15 +02:00
Ghighi Eftimie
c33c6bbff0
fix for #1594
2020-10-10 12:39:52 +03:00
Ozzieisaacs
093f90d4c1
Update translation files
2020-10-10 11:38:40 +02:00
Ozzieisaacs
20ffa325d3
Fix #1642
2020-10-10 10:53:08 +02:00
OzzieIsaacs
df295e92ee
Merge remote-tracking branch 'origin/Develop' into Develop
2020-10-10 10:33:12 +02:00
Ozzieisaacs
2e67bd2407
Fix add to shelf from search
2020-10-10 10:32:53 +02:00
OzzieIsaacs
9aa01ee8cf
Merge branch 'master' into Develop
2020-10-10 10:14:33 +02:00
OzzieIsaacs
d70ded0993
Fix for search
2020-10-10 07:47:27 +02:00
OzzieIsaacs
bb03026589
Fixes from merge problems
2020-10-10 07:30:03 +02:00
Ozzieisaacs
1f4564da76
Merge remote-tracking branch 'es/patch-1' into master
2020-10-06 21:48:42 +02:00
OzzieIsaacs
3b8e5ddfb3
Merge remote-tracking branch 'worker/db' into Develop
...
# Conflicts:
# cps/tasks/convert.py
2020-10-06 21:40:47 +02:00
Nacho Soler
edc293f96a
Update
...
Add some missings translations
2020-10-06 16:43:00 +02:00
Ozzieisaacs
6e6f144b7a
Paginated search and advanced search
...
Wraparound on books list deactivated
2020-10-04 19:23:06 +02:00
Ozzieisaacs
e3f4f24c3e
Fixes for failed email and conversions with gdrive
2020-10-04 13:59:33 +02:00
Ozzieisaacs
eb37e3a52b
Fix UI Deelete Buttons in Edit Books page
...
Fix Conversion of multiple formats of one book in the queue with gdrive
2020-10-04 12:09:52 +02:00
Ozzieisaacs
95d540630e
Change ldap_certpath to file
2020-10-04 06:15:35 +02:00
Ozzieisaacs
23d66a0d68
Fix
2020-10-03 21:43:48 +02:00
Ozzieisaacs
0d64692c84
Fix for convert + email task with gdrive
2020-09-30 19:29:57 +02:00
OzzieIsaacs
376001100a
Bugfixes from last testrun
2020-09-28 21:24:47 +02:00
Ozzieisaacs
e2954249f8
Update chinese translation
2020-09-27 19:22:41 +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
b140073988
Merge branch 'master' into Develop
...
Fix #1629 (Gevent Tracebacks with SSL encryption)
2020-09-27 13:02:25 +02:00
Ozzieisaacs
c22bc857b0
Fix #1629 (Gevent Tracebacks with SSL encryption)
2020-09-27 13:00:07 +02:00
Ozzieisaacs
497fbdcdfc
Save view settings
2020-09-27 12:37:41 +02:00
Ozzieisaacs
861f1b2ca3
Merge branch 'master' into Develop
...
# Conflicts:
# test/Calibre-Web TestSummary_Linux.html
2020-09-27 08:54:32 +02:00
Ozzieisaacs
6108ef4c89
Version update to 0.6.10 Beta
2020-09-27 07:43:56 +02:00
OzzieIsaacs
a9c0bcb4a2
Updated testresults
...
Version bump for release
2020-09-27 07:15:03 +02:00
Ozzieisaacs
e61e94f0fa
Merge remote-tracking branch 'it/patch-15' into master
...
Updated Translations
2020-09-26 16:19:34 +02:00
Ozzieisaacs
85aac02593
Merge remote-tracking branch 'css/master' into master
2020-09-26 16:13:53 +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
9a896ea81e
Removed logging of headers as it caused trouble while showing logfile in UI
2020-09-26 07:51:29 +02:00
Ozzieisaacs
422c1893c0
Fix for the fix cover_url
2020-09-24 11:02:12 +02:00
ElQuimm
f1cb5276d7
Update italian message.po
...
removed typo line 127
2020-09-24 10:54:06 +02:00
Ozzieisaacs
bed1b24340
Fixes from test of upload restrictions
2020-09-24 10:54:02 +02:00
Ozzieisaacs
da909ff084
Fixes from test of upload restrictions
2020-09-23 20:50:34 +02:00
Ozzieisaacs
8f743b70a4
Revert the tolino stuff
2020-09-22 20:25:58 +02:00
Ozzieisaacs
a761017116
Additional debug output for #1527
2020-09-21 19:09:02 +02:00
Ozzieisaacs
f06cc25a99
Fix for immediate logout with next="/logout"
...
Fix tolino per default with deactivated Strict-Transport-Security
2020-09-21 18:34:39 +02:00
Ozzieisaacs
eff8480d5c
Show listen in browser formats in lowercase
2020-09-21 18:24:50 +02:00
ElQuimm
07a936c5e8
italian version of messages.po updated
2020-09-21 10:53:29 +02:00
Ryan Long
a6002a2c6c
1622_updated_css
2020-09-20 23:41:20 -04:00
Ozzieisaacs
7ba014ba49
Fix "is not a valid language" on upload of comic books
...
Fix metadata excration of comic books
updated bootstrap table
updated handling of upload formats restrictions
2020-09-20 15:05:52 +02:00
Ozzieisaacs
165c649f31
Fix "is not a valid language" on upload
2020-09-20 11:44:03 +02:00
Ozzieisaacs
4cf71dd336
Fix "is not a valid language" on upload
2020-09-20 11:41:44 +02:00
Ozzieisaacs
2d712a3841
Fix #1612
2020-09-20 10:03:05 +02:00
blitzmann
0480edce2a
Clarify need for WeakSet
2020-09-18 21:52:45 -04:00
Alexander Yakovlev
4eded82102
Add ISFDB
2020-09-15 17:39:13 +07:00
Alexander Yakovlev
ec4ff83465
Add ISSN tags
2020-09-15 13:50:34 +07:00
Alexander Yakovlev
8745b8b051
nice title for Litres tags
2020-09-15 13:47:57 +07:00
Alexander Yakovlev
4e28c3cadb
add Litres references
2020-09-15 13:41:01 +07:00
blitzmann
76c724c783
Remove global session object, this is now wrapped in the CalibreDB class
2020-09-13 21:37:47 -04:00
blitzmann
032cb59388
Fix resetting the session when first configuring the calibre-db on first boot up
2020-09-13 13:16:11 -04:00
OzzieIsaacs
e29247774c
Bugfixes for uploading books to GDrive with new worker
2020-09-12 13:55:36 +02:00
blitzmann
18d16f9a8b
Initial attempt at setting up CalibreDB as a class that carries the engine and DB connection, and the instance being the session
2020-09-11 22:52:40 -04:00
OzzieIsaacs
d137735be1
Fix #805 (First request to gdrive fails)
2020-09-11 20:56:54 +02:00
dickreckard
65929c02bc
isolanguage parsing of xmp data
2020-09-11 10:49:45 +00:00
root
22466d6b98
xmp data processing added to the uploader
2020-09-11 10:08:55 +00:00
dickreckard
23fe79c618
Update uploader.py
2020-09-11 03:42:19 +02:00
OzzieIsaacs
7929711fea
Improvements for file uploading format restriction
2020-09-08 20:57:39 +02:00
OzzieIsaacs
49a028a599
Bugfix not unlink generic cover on upload
2020-09-08 19:04:04 +02:00
OzzieIsaacs
670cbcd336
Merge branch 'master' into Develop
2020-09-07 21:33:11 +02:00
Ozzieisaacs
449d31e8a1
Refactored update_dir_structure_file
2020-09-07 21:26:59 +02:00
Ozzieisaacs
1450a21d00
Fix links to amazon ( #1461 )
2020-09-07 18:27:43 +02:00
Ozzieisaacs
ae15544aed
Merge branch 'master' into database_fix
...
# Conflicts:
# cps/editbooks.py
2020-09-07 18:21:33 +02:00
Ozzieisaacs
4b7a37cf7d
Bugfix empty email attachment size
2020-09-07 18:19:54 +02:00
dickreckard
cb7727900c
Update uploader.py
...
default cover changed from none to pdf_preview when metadata parsing fails
2020-09-07 13:30:03 +02:00
Ozzieisaacs
e012726cd4
Fix #1461 (parse Amazon_* identifiers)
2020-09-06 19:31:31 +02:00
Ozzieisaacs
f49688fdb9
Fix #1461 (parse Amazon_* identifiers)
2020-09-06 19:31:03 +02:00
Ozzieisaacs
e32b017431
Revert "Test revert global Session"
...
This reverts commit 393869e538
2020-09-06 10:59:34 +02:00
Ozzieisaacs
393869e538
Test revert global Session
2020-09-06 10:27:10 +02:00
Ozzieisaacs
d3bde0408f
Improvederror handling for editing identifier
2020-09-05 18:47:28 +02:00
Ozzieisaacs
34d3225984
Errorhandling edit identifier
2020-09-05 18:46:11 +02:00
Ozzieisaacs
eaed53e25b
Fix for author edit error (2 same sort_authors lead maybe to choose wrong one)
2020-09-05 18:23:14 +02:00
OzzieIsaacs
feacbe8ebd
Possible Fix for database crash after adding new format and accessing calibre database afterwards
2020-09-05 10:24:32 +02:00
norangebit
bdf6052388
Conversion to kepub when creating a sync token
2020-09-03 21:57:14 +02:00
Ozzieisaacs
ec0a0190e7
Merge remote-tracking branch 'polish/master' into master
2020-09-01 20:18:29 +02:00
norangebit
99d653eece
Add automatic conversion in kepub
...
Automatic conversion from epub to kepub of new book on Kobo sync.
2020-09-01 19:27:14 +02:00
OzzieIsaacs
f825c5ae83
Merge branch 'master' into Develop
2020-09-01 19:26:13 +02:00
OzzieIsaacs
173484c30e
Fix #1002 , #1581 (Public shelfs not accessible as guest user)
2020-09-01 19:25:57 +02:00
OzzieIsaacs
884270093b
Merge remote-tracking branch 'worker/tasks' into Develop
2020-08-31 13:00:13 +02:00
Dawid Gliwka
62e7ab8c2b
Update polish translation
2020-08-30 21:17:56 +02:00
blitzmann
ded480207b
Add link to convert task, fixes #1589
2020-08-30 13:54:51 -04:00
blitzmann
ef49e2b5b3
Revert daemon in favor of timeout
2020-08-30 13:49:45 -04:00
blitzmann
b0a055a870
Rename email.py -> mail.py to avoid shadowing standard email module
2020-08-30 13:31:59 -04:00
blitzmann
9b9e29a3b6
Implement worker thread as a daemon
2020-08-30 13:29:42 -04:00
OzzieIsaacs
1a9a436cbe
Fixed wrong translation string
...
Removed unused variables from callback in server.py
Update Testresults
2020-08-30 17:11:11 +02:00
OzzieIsaacs
62dd29d2f3
Renamed email to mail due to naming conflict in python2
2020-08-30 08:49:53 +02:00
OzzieIsaacs
d406d91856
Merge remote-tracking branch 'worker/tasks' into Develop
2020-08-30 08:32:09 +02:00
OzzieIsaacs
98494c610a
Merge branch 'master' into Develop
2020-08-30 08:31:35 +02:00
OzzieIsaacs
649a553fa4
Merge remote-tracking branch 'metadata/master' into master
2020-08-30 08:30:32 +02:00
OzzieIsaacs
e17a06d7bd
Merge remote-tracking branch 'oauth/oauth-typo' into master
2020-08-30 08:28:27 +02:00
OzzieIsaacs
4b14cc6a74
Merge remote-tracking branch 'oauth/oauth-typo' into Develop
2020-08-30 08:28:14 +02:00
OzzieIsaacs
b65095fd0f
Merge remote-tracking branch 'google_oauth/patch-1' into Develop
2020-08-30 08:26:34 +02:00
OzzieIsaacs
28733179d2
Merge remote-tracking branch 'caliblur/editMetaFix' into Develop
2020-08-30 08:25:17 +02:00
OzzieIsaacs
960d23ca50
Merge remote-tracking branch 'caliblur/blurPaginationFix' into Develop
2020-08-30 08:23:06 +02:00
Michael Knepher
057f70ea9c
Add author sort
2020-08-29 18:53:00 -07:00
blitzmann
3e378bd665
Some more clean up
2020-08-29 21:04:49 -04:00
blitzmann
c120138f26
Fixes for pagination ugliness for caliBlur! style
2020-08-29 20:58:30 -04:00
blitzmann
31b20362ec
caliBlur! style: Fixes issue with edit metadata button not getting styled correctly
2020-08-29 18:45:23 -04:00
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)
2020-08-29 12:25:33 -04:00
OzzieIsaacs
9e5cad0dc8
Merge new worker thread
2020-08-29 11:14:52 +02:00
blitzmann
4cb82ea9bd
Revert testing condition that decreased number of tasks kept
2020-08-27 21:49:55 -04:00
blitzmann
572ac4a17b
Fix for deleting old, completed tasks
...
(cherry picked from commit e066d7a4b0f47d3327696a11795cdc923ff0f6f3)
2020-08-27 21:46:20 -04:00
Ozzie Isaacs
dc5191f8ba
Added unrar binary is found on windows
2020-08-27 21:01:45 +02:00
Ozzie Isaacs
8ab5710098
Updated testresuts Windows
2020-08-26 21:43:58 +02:00
OzzieIsaacs
61d628d596
oauth problem solved
2020-08-26 18:22:56 +02:00
Sean Leonard
078fc25845
Remove Google+ OAuth scope
...
The scope is no longer available per https://developers.google.com/+/api-shutdown
Fixes #1472
Fixes #1573
2020-08-26 08:56:56 -07:00
Marvel Renju
67eb4b317a
Fix typo
...
google oauth provider obtain link was pointing to github
2020-08-26 03:15:39 +01:00
blitzmann
6322919bc7
Merge branch 'Develop' into tasks
...
# Conflicts:
# cps/db.py
2020-08-25 00:15:41 -04:00
blitzmann
b81b8a1dea
Fix registration email
2020-08-25 00:05:20 -04:00
blitzmann
f3a3797850
Fail the convert task if the email subtask fails
2020-08-24 21:28:55 -04:00
blitzmann
5ec1283bb1
Remove threading for the calibre DB class
2020-08-24 21:03:59 -04:00
blitzmann
8634b0c6f0
Remove left over placeholder code
2020-08-24 21:00:15 -04:00
Ozzie Isaacs
d89830af61
Fix anonymous user has no modified_flag error
2020-08-24 21:00:13 +02:00
Ozzie Isaacs
ef1736b571
Fix error on guest user (view settings missing)
2020-08-24 20:38:06 +02:00
Dave Mogle
d951ee4b83
Prefer kepub ( #1439 )
...
Only offer kepub download URL over Kobo sync API when available
2020-08-24 13:43:54 -04:00
blitzmann
04081f62c4
Delete old worker thread class / logic
2020-08-23 23:34:41 -04:00
blitzmann
0f28dc5e55
Remove the queue stuff for CalibreDB (is no longer used)
2020-08-23 23:17:07 -04:00
blitzmann
508f49df18
Remove completed tasks and sort the tasks by date added when calling .tasks
2020-08-23 23:00:23 -04:00
blitzmann
bec280c6b1
Add some error handling
2020-08-23 21:51:44 -04:00
blitzmann
6a8ae9c0c4
Merge remote-tracking branch 'upstream/master' into tasks
...
# Conflicts:
# cps/helper.py
2020-08-23 21:38:56 -04:00
blitzmann
ac22483f98
Add error handling to the email task within the convert task
2020-08-23 21:35:05 -04:00
blitzmann
59d56d5c83
py27 support (I think) and some clean up
2020-08-23 21:21:55 -04:00
OzzieIsaacs
cdaad2fb4a
Merge branch 'master' into Develop
2020-08-23 21:23:00 +02:00
OzzieIsaacs
843279bacb
Merge remote-tracking branch 'jef/jef/download-kobo' into master
2020-08-23 21:22:44 +02:00
blitzmann
a000de0270
Some clean up
2020-08-23 13:33:57 -04:00
blitzmann
bf41b04cfa
Remove convert task from db.py - with the fixed from #1565 , this no longer seems to be needed
2020-08-23 13:07:24 -04:00
blitzmann
9ce2e8ea53
Fix progress indication for emails that have been completed.
2020-08-23 12:58:24 -04:00
OzzieIsaacs
f066926fc9
Merge branch 'master' into Develop
2020-08-23 10:56:10 +02:00
OzzieIsaacs
4c38b0ab10
Prepare for save name sort order
2020-08-23 10:56:00 +02:00
OzzieIsaacs
cf35c9dcef
Merge remote-tracking branch 'name/patch-2' into master
2020-08-23 10:53:18 +02:00
OzzieIsaacs
45ff9394f2
Fix comma separated author names during for upload
2020-08-23 09:44:42 +02:00
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)
2020-08-22 23:35:48 -04:00
blitzmann
2533c9c14e
Continue converting tasks - email and upload tasks
2020-08-22 22:44:28 -04:00
blitzmann
f10f0dada6
First working PoC with a new task structure
2020-08-22 16:31:00 -04:00
OzzieIsaacs
282859bc1b
Merge remote-tracking branch 'github/master' into master
2020-08-22 15:38:40 +02:00
OzzieIsaacs
a3ae97a5a3
Fix #1574 (author name not shown in change book order in shelfs)
2020-08-22 15:37:40 +02:00
OzzieIsaacs
ed8275a20b
Fix #1574 (author name not shown in change book order in shelfs)
2020-08-22 15:35:21 +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
b9c0f2a3d3
Merge remote-tracking branch 'origin/master' into master
2020-08-21 19:27:19 +02:00
OzzieIsaacs
0cc07362b8
Fix for #1573
2020-08-21 19:26:58 +02:00
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.
2020-08-17 11:29:10 -05:00
Ozzie Isaacs
4d44746a88
Change settings database gdrive watch to JSON
2020-08-15 15:07:03 +02:00
OzzieIsaacs
1535bdbcd8
Merge remote-tracking branch 'memorydatabase/issue/1564'
2020-08-15 12:08:59 +02:00
OzzieIsaacs
f9c6fb30bf
Excluded series type again, as it causes problems upon reconnect
2020-08-14 19:43:54 +02:00
Ozzie Isaacs
94ad93ebd7
Added series like custom columns #1501
2020-08-11 18:56:34 +02:00
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
2020-08-11 12:44:55 -04:00
OzzieIsaacs
b309c1fc91
Fix filenames (Escape "\") for searching calibre excecutable on windows
2020-08-09 15:11:54 +02:00
Ryan Holmes
969105b205
Trim whitespace from filename
...
This avoids an OSError when the book's metadata has whitespace at the end of it.
2020-08-09 01:08:00 -04:00
Ryan Holmes
28bfb06c67
Revert the deletion of another line
...
This was done by mistake, whoops!
2020-08-09 00:57:30 -04:00
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
2020-08-09 00:55:56 -04:00
Ren Wei
4c6f5096be
get metadata, typo, if no result from google, it will display the noresult msg, regardless of the others results.
2020-08-01 15:12:20 +08:00
Ozzie Isaacs
1a1d105fae
Fix #1538 (Floating point numbers showing 2 decimals on details page
2020-07-23 19:31:48 +02:00
Ozzie Isaacs
42a0639bb5
Fix #1533 (Invalid LDAP Cert Path no longer crashes app)
2020-07-23 19:23:57 +02:00
