luisgulo/calibre-web
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
3128 commits 3 branches 21 tags 105 MiB
Commit graph

2671 commits

Author SHA1 Message Date
Ozzie Isaacs
f62d6abb69 Merge branch 'master' into development 
# Conflicts:
#	cps/server.py
#	test/Calibre-Web TestSummary_Linux.html
 2021-03-15 13:53:23 +01:00
Ozzie Isaacs
12ad7a6322 Suppress some errors 2021-03-15 13:52:44 +01:00
Ozzie Isaacs
b75247ea3a Suppress some errors 2021-03-15 13:48:05 +01:00
Ozzie Isaacs
9a963bbe79 Refactored code 
Testrun
 2021-03-15 13:10:17 +01:00
Ozzie Isaacs
994bc8b0e4 Removed dropdown button on single file listen/read (Fix #1840) 2021-03-15 09:06:40 +01:00
Ozzie Isaacs
2451605033 Merge remote-tracking branch 'djvu/read-djvu' into master 2021-03-15 08:43:25 +01:00
Ozzie Isaacs
10942527f3 Merge branch 'master' into development 
# Conflicts:
#	test/Calibre-Web TestSummary_Linux.html
 2021-03-15 08:22:12 +01:00
Ozzie Isaacs
4909ed5ccd Merge remote-tracking branch 'cliblur/master' into development 
# Conflicts:
#	cps/static/css/style.css
 2021-03-15 08:21:44 +01:00
Ozzie Isaacs
5cf5df68dc Merge remote-tracking branch 'cliblur/master' into master 2021-03-15 08:19:56 +01:00
Ozzie Isaacs
dd32cc99ea Merge remote-tracking branch 'es/patch-1' into master 2021-03-15 08:17:14 +01:00
Ozzie Isaacs
79092dc8eb Merge remote-tracking branch 'it/patch-21' into master 2021-03-15 08:11:41 +01:00
Ozzie Isaacs
6229e4610a Updated teststatus and bugfix convert ebooks 2021-03-15 08:10:42 +01:00
Northguy
bfe36d3f4a
change in color definition 
Making color the same as in:
.container-fluid .book .meta .author, .container-fluid .book .meta .author > a {
    color: hsla(0, 0%, 100%, .45)
}
 2021-03-15 00:12:02 +01:00
Northguy
d42bf44fad
Added same color for series name and series number 2021-03-14 23:46:33 +01:00
rra
33e352819c Merge remote-tracking branch 'upstream/master' into XMP_Metadata3 2021-03-14 19:58:26 +01:00
Ozzie Isaacs
53ee0aaee1 Some functions refactored 2021-03-14 17:34:47 +01:00
Ozzie Isaacs
42707a19bd Code cosmetics 2021-03-14 16:57:33 +01:00
Ozzie Isaacs
0888706790 Code cosmetics 2021-03-14 16:53:01 +01:00
Ozzie Isaacs
16453a05f8 Code cosmetics 2021-03-14 16:02:37 +01:00
Ozzie Isaacs
2fbb7466d3 Code cosmetics 2021-03-14 15:44:40 +01:00
Ozzie Isaacs
f29f94f45f Code cosmetics 2021-03-14 15:41:36 +01:00
Ozzie Isaacs
cd973868fc Code cosmetics 2021-03-14 15:29:34 +01:00
Ozzie Isaacs
3c35f02cac Code cosmetics 2021-03-14 15:18:45 +01:00
Ozzie Isaacs
22c93e2389 Merge branch 'master' into development 2021-03-14 15:06:20 +01:00
Ozzie Isaacs
8c751eb532 Some code cosmetics 2021-03-14 15:06:09 +01:00
Ozzie Isaacs
4df443e007 Some code cosmetics 2021-03-14 14:40:04 +01:00
Ozzie Isaacs
f52fa41439 Fix restart server 
Some code cosmetics
 2021-03-14 14:29:40 +01:00
Ozzie Isaacs
f77d72fd86 Merge branch 'master' into development 
# Conflicts:
#	cps/static/css/style.css
 2021-03-14 14:06:33 +01:00
Ozzie Isaacs
9b80c84794 Some code cosmetics 2021-03-14 14:05:36 +01:00
Ozzie Isaacs
725fc658f8 Some code cosmetics 2021-03-14 13:28:52 +01:00
alfred82santa
24bbf226a1 Sync reading state only for books on kobo shelves 2021-03-14 11:29:23 +01:00
cbartondock
83474da7b5 fixed being able to click through dropdown in advanced search results 2021-03-07 22:54:34 -05:00
cbartondock
9146e5f287 fixed advanced search mass add to shelves in caliblur 2021-03-07 19:53:54 -05:00
cbartondock
ff4502c63a Made shelf search user specific 2021-03-07 15:23:05 -05:00
cbartondock
9711bd8fe1 added actions boxes to drop downs 2021-03-06 22:34:39 -05:00
cbartondock
05139e53be advanced shelf search is working 2021-03-06 22:15:18 -05:00
cbartondock
870b2642a9 advanced shelf search is almost working 2021-03-06 21:54:39 -05:00
ElQuimm
d31b26ae7d
Updated italian message.po 
Have a nice day.
 2021-03-04 14:26:36 +01:00
Zaroz
5511925ba2
Removed elif "url" identifier format type 
Removed elif "url" identifier format type, since else output is identical
 2021-03-03 21:18:08 -06:00
Angel Docampo
f96b20717d
Updated spanish messages.po 
Corrected a grammatical error
 2021-03-04 00:01:03 +01:00
Zaroz
940c9c45d7
Updated db.py 
changed __repr__ else statement to allow for custom id entries
 2021-03-02 23:46:02 -06:00
Ozzie Isaacs
87d6008dfc Fix for #1870 (png was missing in supported picture formats for comic viewer) 2021-02-27 09:23:34 +01:00
Ozzie Isaacs
b9c0c8d2dc Update bootstrap table to 1.18.2 2021-02-20 20:03:39 +01:00
Ozzie Isaacs
81c30d5fd5 Add missing files from bootstrap editable 
Added user-table single-select header for locale and default-language
 2021-02-20 19:55:51 +01:00
Ozzie Isaacs
0aa33d88a5 Merge branch 'master' into development 2021-02-20 14:19:39 +01:00
Ozzie Isaacs
e64a504bb1 Working Locale and default language selection in user table edit 2021-02-20 14:18:27 +01:00
jvoisin
bc876a159e Declare variables before using them 
It should fix the following stacktrace:

```
[2021-02-18 14:46:14,771] ERROR {cps:1891} Exception on / [GET]
Traceback (most recent call last):
  File "/opt/calibre/vendor/flask/app.py", line 2447, in wsgi_app
    response = self.full_dispatch_request()
  File "/opt/calibre/vendor/flask/app.py", line 1952, in full_dispatch_request
    rv = self.handle_user_exception(e)
  File "/opt/calibre/vendor/flask/app.py", line 1821, in handle_user_exception
    reraise(exc_type, exc_value, tb)
  File "/opt/calibre/vendor/flask/_compat.py", line 39, in reraise
    raise value
  File "/opt/calibre/vendor/flask/app.py", line 1950, in full_dispatch_request
    rv = self.dispatch_request()
  File "/opt/calibre/vendor/flask/app.py", line 1936, in dispatch_request
    return self.view_functions[rule.endpoint](**req.view_args)
  File "/opt/calibre/cps/usermanagement.py", line 38, in decorated_view
    return login_required(func)(*args, **kwargs)
  File "/opt/calibre/vendor/flask_login/utils.py", line 272, in decorated_view
    return func(*args, **kwargs)
  File "/opt/calibre/cps/web.py", line 719, in index
    return render_books_list("newest", sort_param, 1, page)
  File "/opt/calibre/cps/web.py", line 422, in render_books_list
    entries, random, pagination = calibre_db.fill_indexpage(page, 0, db.Books, True, order)
  File "/opt/calibre/cps/db.py", line 610, in fill_indexpage
    return self.fill_indexpage_with_archived_books(page, pagesize, database, db_filter, order, False, *join)
  File "/opt/calibre/cps/db.py", line 635, in fill_indexpage_with_archived_books
    #    book = self.order_authors(book)
UnboundLocalError: local variable 'entries' referenced before assignment
```
 2021-02-18 17:02:58 +01:00
Ozzieisaacs
4aa1a838ed Removed f-strings, making it compatible with python 3.5 2021-02-15 14:17:05 +01:00
Ozzieisaacs
095a51edd0 Convert tabs to spaces in server.py (related to #1862) 2021-02-15 13:33:42 +01:00
Ozzie Isaacs
a3a11bdf3f Changed checkbox states are saved on server 2021-02-14 17:49:40 +01:00
Ozzie Isaacs
70b503f3d4 Merge branch 'master' into development 
# Conflicts:
#	test/Calibre-Web TestSummary_Linux.html
 2021-02-13 14:36:42 +01:00
Ozzie Isaacs
bbf609b880 Fix #1859 (Upload of jpg files without installed imagemagick doesn't work) 2021-02-13 14:34:41 +01:00
Ozzie Isaacs
0992bafe30 Bulk User management 2021-02-13 13:17:02 +01:00
Ozzie Isaacs
3c1b06872d Updated testresults 
Changed optional-requirements
Prevent redirect 308 on /<data> routes (#1854)
 2021-02-09 18:04:56 +01:00
Ozzie Isaacs
cefdd2f66c suppress asyncio message always on restart or shutdown 2021-02-08 20:39:21 +01:00
Ozzie Isaacs
5dac13b1da Revert change in ub.py 2021-02-08 20:17:02 +01:00
alfred82santa
6014b04b2a Use BookShelf added_date as date reference 2021-02-08 20:10:12 +01:00
Ozzie Isaacs
8aebf48193 Update handling for package data 2021-02-08 20:09:36 +01:00
Ozzie Isaacs
fbb905957b Prevent redirect 308 on /<data> routes 2021-02-08 20:09:36 +01:00
Ozzie Isaacs
e0ce135838 Move "create_engine" call 2021-02-08 20:09:36 +01:00
Ozzie Isaacs
60497c60c1 Update creating Home_Config variable for packaging support, added .HOMEDIR to ignored filename during update 2021-02-07 09:20:37 +01:00
Ozzie Isaacs
251a77c8b4 Merge branch 'master' into Development 
Improved packaging support
 2021-02-07 08:54:29 +01:00
alfred82santa
2b7c1345ee Fix disable shelf kobo sync 2021-02-07 00:21:51 +01:00
alfred82santa
69b7d94774 Fixes and remove shelf kobo sync flag when kobo sync disabled 2021-02-07 00:19:24 +01:00
alfred82santa
8fe762709b Fix mistake 2021-02-06 21:15:36 +01:00
alfred82santa
a3f17deb17 Added options in order to synchronize only selected shelf on Kobo device 2021-02-06 20:29:43 +01:00
Ozzie Isaacs
e6fb460071 New restart routine for executable files 
Fix log in updater
New source option updater available
 2021-02-06 09:42:27 +01:00
Ozzie Isaacs
6137fdeb33 Version bump 2021-02-02 19:11:02 +01:00
Ozzie Isaacs
4a4d02ea6a Added translations 2021-02-02 19:04:55 +01:00
Ozzie Isaacs
be26e5f152 Update Teststatus 
Update Version
 2021-02-02 18:52:31 +01:00
Ozzie Isaacs
127bfba135 fix wrong path in get_update_status js function 2021-02-01 19:00:10 +01:00
Ozzie Isaacs
7efae3c125 Renamed "Recently Added" to "Books" 2021-01-31 19:20:43 +01:00
Ozzie Isaacs
1e5af21000 Fix #1843 (get path to script via html file and known js file instead of randomly picking last one) 2021-01-31 19:01:34 +01:00
Ozzie Isaacs
33a0a4c173 Changed function for getting path in js file 2021-01-31 18:55:32 +01:00
Ozzie Isaacs
eeb7974e05 User table: 
Added button for single user edit
Added delete-trash-icon (not working)
Roles are displayed correct per user
Guest user is not visible if anonymous browsing is disabled
 2021-01-31 14:54:45 +01:00
Ozzie Isaacs
f45ea1a31c Merge branch 'master' into development 2021-01-31 13:21:47 +01:00
Ozzie Isaacs
a866dbaa80 Fix mimetype in comic reader 2021-01-31 11:21:09 +01:00
Ozzie Isaacs
62447d6b89 Basic User edit in tables 2021-01-31 10:17:57 +01:00
Ozzie Isaacs
ff16afbf0b Merge branch 'master' into development 2021-01-30 17:55:45 +01:00
Ozzie Isaacs
9d7ef25062 Fix Kobo sync & Update Teststatus 2021-01-30 17:55:17 +01:00
Ozzie Isaacs
88078d65e9 Fix #1482 (do not shorten title in book detail page) 2021-01-30 14:57:59 +01:00
Ozzie Isaacs
b07a97c17e Merge remote-tracking branch 'webp/comic-webp' into master 2021-01-30 14:56:26 +01:00
Ozzie Isaacs
41e7d65e2a Merge remote-tracking branch 'caliblur/master' into master 2021-01-30 14:54:16 +01:00
Ozzie Isaacs
7fa5865cf6 Merge remote-tracking branch 'autoconv/kepub_autoconv' into development 
# Conflicts:
#	cps/kobo.py
#	cps/kobo_auth.py
 2021-01-30 14:47:18 +01:00
Ozzie Isaacs
4a11dd1e16 Fix mistyping "option" 2021-01-28 20:20:59 +01:00
Ozzie Isaacs
34a474101f Fix #1838 (Log message on failed OPDS login) 2021-01-28 20:05:58 +01:00
Ozzie Isaacs
e6799e7a04 Improved detection of invalid email addresses (#1831) upon registering 2021-01-27 19:18:40 +01:00
Ozzie Isaacs
0f83f9992c Added swipe support for epub reader (fixes #925) 
Cleaned reader js include files
 2021-01-24 14:19:46 +01:00
Ozzie Isaacs
d2ad78eb40 Added swipe support for comic reader and txt reader (#925) 
Bugfix for txt file not present on serving file
 2021-01-24 11:28:17 +01:00
Ozzie Isaacs
0b32738f4e Fix Store UI settings in flask session for guest user (#1820) 
Updated testresults
Fix Filepicker (absolute instead of abs)
 2021-01-24 07:31:40 +01:00
Ozzie Isaacs
a9cedb3fca Add logger to db.py 2021-01-23 13:35:30 +01:00
Ozzie Isaacs
51f9cd4bb4 Fix english language names 2021-01-18 21:24:13 +01:00
Ozzie Isaacs
a1668e2411 Version Bump 2021-01-17 16:37:54 +01:00
Ozzie Isaacs
9418045a2c Updated Translation 
Version bump
Fixed errors in requirements file(s)
 2021-01-17 16:28:28 +01:00
Ozzie Isaacs
a7da6d210a Added hint for python 2 2021-01-17 10:30:56 +01:00
Ozzie Isaacs
e09f2c9beb Added Password change on cli 2021-01-17 09:17:46 +01:00
Ozzie Isaacs
4bc3c8d9ac Added missing mimetype (fix #1811) 2021-01-17 07:54:28 +01:00
Ozzie Isaacs
9acea8adf4 Fixed logging of exception in debug_or_exception handler for python version <3.8 2021-01-12 20:51:49 +01:00
Ozzie Isaacs
e5f754ed0e improved session handling 2021-01-11 14:18:01 +01:00
Ozzie Isaacs
263a8f9048 Added catching of missing invalid_request 2021-01-10 14:57:54 +01:00
Ozzie Isaacs
6f9e52792a No autoflush on metadata.db change 2021-01-10 11:01:54 +01:00
Ozzie Isaacs
4a9b01e93b Added IntegrityError to catched error 2021-01-10 10:23:14 +01:00
Ozzie Isaacs
b7de23e895 Merge remote-tracking branch 'fix/unused_imports' into master 2021-01-10 10:18:01 +01:00
jvoisin
b8ab66369e Remove some unused imports 2021-01-07 17:59:08 +01:00
jvoisin
54a78d5565 Remove duplicate id from the search form 2021-01-07 17:40:18 +01:00
mmonkey
b4324cd685 Merge remote-tracking branch 'upstream/master' into master 2021-01-04 12:24:11 -06:00
Ozzieisaacs
ca212c8737 Kobo sync limit set to 100 
Remove python2 support from readme
 2021-01-04 18:45:47 +01:00
Ozzieisaacs
a659f2e49d Improved logging for emails 
Removed private data from debug export
 2021-01-03 19:27:34 +01:00
OzzieIsaacs
760fbbb357 Fix shelf time_created vs. time_last_modified 2021-01-03 16:41:38 +01:00
OzzieIsaacs
56388145b5 Fixes from testrun 2021-01-03 15:40:17 +01:00
Ozzieisaacs
cd60db417c Code refactor shelf handling 2021-01-03 11:53:06 +01:00
Ozzieisaacs
5cce01215f Code refactoring ub.session.commit() 
Code cosmentics admin.py
 2021-01-03 09:53:34 +01:00
mmonkey
bc8bdfe385 Merge remote-tracking branch 'upstream/master' into master 2021-01-02 20:21:15 -06:00
Ozzieisaacs
4578af7a6d Fix export of logfiles (#1794) 2021-01-02 20:38:11 +01:00
Ozzieisaacs
9e1cdd8f57 Merge remote-tracking branch 'it/patch-20' into master 
# Conflicts:
#	cps/translations/it/LC_MESSAGES/messages.po
 2021-01-02 19:37:59 +01:00
OzzieIsaacs
682c3b834f Revert unrar5 experiment 2021-01-02 15:32:06 +01:00
OzzieIsaacs
9b50114852 Fixes from testrun 2021-01-02 07:51:55 +01:00
Ozzieisaacs
b100d198e8 Merge branch 'master' into Develop 
Remove relate to referrer for tag/custom column allow / deny dialog
 2020-12-31 15:12:37 +01:00
Ozzieisaacs
7849f2fb4b Remove relate to referrer for tag/custom column allow / deny dialog 2020-12-31 15:08:56 +01:00
Ozzieisaacs
b35ecddde3 Added Id on Filechooser dialog for testability 2020-12-31 09:54:40 +01:00
Ozzieisaacs
bde7921016 Fix modal path id for calibre db filepicker 
Fix SyncToken last-Book-id missing
 2020-12-30 10:05:15 +01:00
Ozzieisaacs
d33b0587cb Advanced search tags are now multiselects (#1240) 2020-12-28 13:44:17 +01:00
Ozzieisaacs
7e0ed537b7 irst steps Advanced search with mulitselects 2020-12-27 19:12:27 +01:00
Ozzieisaacs
1e351eb01d Search for read status 2020-12-27 18:59:33 +01:00
Ozzieisaacs
1a83bddf8c Merge bubble read status 2020-12-27 13:53:21 +01:00
Ozzieisaacs
2a63c35743 Activate serverside filepicker with parameter in unconfigured state 2020-12-27 11:27:15 +01:00
Ozzieisaacs
27dcbcd7e1 paged and orderable shelfs 
Fix for non writable settings db with non configured calibre-web
 2020-12-27 10:24:51 +01:00
mmonkey
0cf4c7b7b7 Merge remote-tracking branch 'upstream/master' into master 2020-12-24 03:01:55 -06:00
ElQuimm
623372387d
Update italian message.po 
Merry Christmas and Happy Holidays :-)
 2020-12-23 13:45:19 +01:00
OzzieIsaacs
abf0f4d699 Updated Testresult 
Fixed delete book call
 2020-12-23 10:08:54 +01:00
Ozzieisaacs
2bea447de5 Fix show archived books 2020-12-23 09:07:49 +01:00
Ozzieisaacs
f6538b6110 New delete user button 
refactored confirm dialogs
 2020-12-21 19:50:12 +01:00
Ozzieisaacs
2d3ae71a3d Fixed button for email config (Fix #1766) 2020-12-21 19:13:55 +01:00
Ozzieisaacs
9a20faf640 Revert accidentally deleted lines in caliblur! theme 2020-12-17 19:10:02 +01:00
andylizi
123493ee59
Fix #1255 (support webp in comic viewer) 2020-12-17 23:54:06 +08:00
mmonkey
2d498dd138 Preserve publisher links, and fix formatting in custom columns for CaliBlur theme. 2020-12-16 00:58:45 -06:00
Ozzieisaacs
62da469fd1 Shelfs are now paginated (sorting buttons are disabled) 
Changed gevent dependencys
 2020-12-13 18:32:44 +01:00
Ozzieisaacs
d64009e23e preparation for filtered and ordered shelfs 2020-12-13 13:54:09 +01:00
Ozzieisaacs
fd8b642d64 Code cosmetics css 
Code cosmetics js
Fixes for links with remote_login
 2020-12-13 09:53:18 +01:00
OzzieIsaacs
d5ed5cd665 Fixes from tests 2020-12-12 15:16:22 +01:00
OzzieIsaacs
fa95d064ff Fix get_sidebar_config 2020-12-12 12:03:11 +01:00
Ozzieisaacs
1905e0ee6f refactoring to prevent web.py being the middle of the universe 2020-12-12 11:23:17 +01:00
Ozzieisaacs
96b18faea1 Merge remote-tracking branch 'nl/master' into master 2020-12-12 10:06:16 +01:00
Ozzieisaacs
0d7f2e157a Update Download Debug package 
- include config
- bugfix for stream logger
 2020-12-12 10:02:11 +01:00
Marcel
2d66936d8b NL translation update 
NL translation update
 2020-12-12 09:24:01 +01:00
Ozzieisaacs
b637a63e71 Refactored exception logging 2020-12-12 08:11:00 +01:00
Ozzieisaacs
1ae778d81e Fix #1753 (errorhandling on route serve_book) 2020-12-12 06:49:44 +01:00
Ozzieisaacs
f4412ee96b Fix #1753 (errorhandling on route serve_book) 2020-12-12 06:41:12 +01:00
Ozzieisaacs
9130aceb5a Changed admin page 2020-12-11 20:55:09 +01:00
Ozzieisaacs
b8336c03c3 Changed admin page 2020-12-11 20:54:24 +01:00
Ozzieisaacs
76c3ade394 Changed logging in worker thread 2020-12-11 17:03:18 +01:00
Ozzieisaacs
d9b22fd513 log exceptions only in debug mode 2020-12-11 16:46:02 +01:00
Ozzieisaacs
88ea998f8b Only register gdrive callback if gdrive is enabled 
With enabled gdrive return on change if no watch callback is configured, instead of send request to google drive
 2020-12-11 15:56:42 +01:00
Ozzie Isaacs
db91577485 Use calibre-web folder in tempdir on upload cover and metadata backup 
fix upload cover on windows (slash vs. backslash)
 2020-12-11 13:34:29 +01:00
Ozzie Isaacs
5d9404863d Fix detection and removal of metadata.db ending in calibre-directory 
Update requirements
 2020-12-11 09:11:17 +01:00
Ozzieisaacs
d3986ca14a Server side file browser 2020-12-11 08:37:37 +01:00
Ozzieisaacs
2508c1abb2 Started implement server side filechooser 2020-12-10 14:41:45 +01:00
OzzieIsaacs
983e3b2274 Bugfix allowed formats for comics 
Bugfix editing archived books
 2020-12-09 19:02:10 +01:00
Ozzieisaacs
72a02e087c Update optional pydrive requirement 
Bugfix cover url download for Wand insted of Pillow
Fix for gdrive with unknown certificates
 2020-12-09 15:14:08 +01:00
Ozzieisaacs
352b4a0b73 Remove Pillow as dependency 2020-12-09 14:18:39 +01:00
Ozzieisaacs
d957b2d20f Fix detect correct encoding for txt-reader 2020-12-09 11:04:29 +01:00
Ozzieisaacs
dcab8af8ab Fixes for kobo sync 2020-12-09 09:41:23 +01:00
OzzieIsaacs
e1987c34d9 Revert expire on commit 2020-12-09 08:49:18 +01:00
OzzieIsaacs
a80a8aab1c Fix LDAP import user 2020-12-08 20:13:36 +01:00
OzzieIsaacs
d6fbcdb09d Fix merge problem (ub prefix in ub.py) 2020-12-08 13:56:17 +01:00
OzzieIsaacs
d39b28b011 Fix for existing book format with gdrive 2020-12-08 13:34:15 +01:00
OzzieIsaacs
8f36128fe3 Merge branch 'session' into Develop 2020-12-08 11:49:39 +01:00
OzzieIsaacs
986d4c99bd Fix oauth ub session 2020-12-08 11:24:20 +01:00
Ozzieisaacs
f677dcb1f4 Fix missing optional parameter initSession 2020-12-08 08:19:18 +01:00
Ozzieisaacs
1a9b220ec2 Session no longer expires on commit (only in worker thread) 2020-12-08 08:04:46 +01:00
Ozzieisaacs
d15d252af7 Session no longer expires on commit 2020-12-08 08:01:42 +01:00
Ozzieisaacs
5e3618716d Fix missing session rollback on commit error 2020-12-07 19:53:34 +01:00
Ozzieisaacs
f13522559d Fixed problems on startup with config session 2020-12-07 13:51:52 +01:00
Ozzieisaacs
777c2726d3 Changed session_handing 2020-12-07 08:52:52 +01:00
Ozzieisaacs
c25afdc203 Chunked sync 2020-12-06 13:21:25 +01:00
Ozzieisaacs
c25f6d7c38 Prefer kepub in kobo sync 2020-12-06 06:01:10 +01:00
Ozzieisaacs
388e46ee81 Merge remote-tracking branch 'prefer_kepub/prefer-kepub' into master (send kepub instead of epub) 2020-12-06 05:57:56 +01:00
Ozzieisaacs
242866948f Merge branch 'master' into Develop 2020-12-05 08:34:12 +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
a82911ea5d Fixed missing variable exception 2020-12-04 14:50:34 +01:00
Ozzieisaacs
9a8f20317b Update ldap import user -> improve error messages 2020-12-04 11:13:39 +01:00
Ozzieisaacs
b605a0f622 Update error message LDAP import user 2020-12-03 21:25:02 +01:00
Ozzieisaacs
046a074c3a Catch attribute error on ldap import user 
Fixes for Login with Windows AD
 2020-12-03 20:15:31 +01:00
Ozzieisaacs
7c96fac95c Removed unnecessary parameters 2020-12-03 17:33:30 +01:00
Ozzieisaacs
a3ef53102d Fix warning message on ldap import 2020-12-03 17:08:51 +01:00
Ozzieisaacs
68513b775b Wording 2020-12-03 16:20:31 +01:00
Ozzieisaacs
a79dcc93f6 Fixed description for LDAP filter 2020-12-03 16:19:42 +01:00
Ozzieisaacs
7aabfc573b Merge branch 'master' into Develop 
# Conflicts:
#	cps/admin.py
#	cps/config_sql.py
#	cps/templates/config_edit.html
#	cps/web.py
 2020-12-03 16:03:37 +01:00
Ozzieisaacs
56505457eb Merge remote-tracking branch 'ldap_import/feat/ldap-import-user-identifier' into master 
# Conflicts:
#	cps/admin.py
 2020-12-03 16:01:15 +01:00
Ozzieisaacs
5930c6d5fb remove parenthesis in LDAP Message 2020-12-03 14:22:37 +01:00
Ozzieisaacs
c3b9888b31 Fix #1739 (opds download with anonymous browsing enabled) -> download rights of guest user are now respected again 2020-12-03 09:42:41 +01:00
Ozzieisaacs
cb8dfdde4c Fix #1739 (opds download with anonymous browsing enabled) 2020-12-03 08:25:36 +01:00
Ozzieisaacs
8eb4b6288a Added id's for testablility 2020-12-02 18:19:30 +01:00
Ozzieisaacs
f18836be90 Fix for #1435 (download not allowed with for opds links, with ldap login and a cookie in the download request) 2020-12-02 14:19:49 +01:00
Ozzieisaacs
3372070a58 Fix change title regex 
Merge branch 'Develop' into master
 2020-12-02 11:09:55 +01:00
Ozzieisaacs
f99e2ebd13 Changed wording for tooltips 2020-12-02 09:08:56 +01:00
Ozzieisaacs
4feb26eefb Added series order option (#1715) 
Added authors order option (#1301)
Added tooltips for ordering options
Fixed ratings, formats, languages order option
 2020-12-01 14:51:25 +01:00
Ozzieisaacs
2da7cd2064 Merge remote-tracking branch 'it/patch-18' into master 2020-12-01 14:11:25 +01:00
Ozzieisaacs
9d7daf7afd Kobo links to /v1/products/books/external are responded 
Merge remote-tracking branch 'kobo/patch-1' into master
 2020-12-01 14:03:03 +01:00
Ozzieisaacs
cb1ebc1cd0 Drag 'n drop for files 2020-12-01 13:52:41 +01:00
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