Ozzie Isaacs
8cc849488b
Code cosmetics
2021-03-21 07:15:38 +01:00
Ozzie Isaacs
d3f8153b90
Merge branch 'master' into development
2021-03-20 19:34:16 +01:00
Ozzie Isaacs
b1b7ee65b4
Refactored advanced search
2021-03-20 18:10:27 +01:00
Ozzie Isaacs
6889456662
Merge remote-tracking branch 'adv_search/master' into master
2021-03-20 17:48:21 +01:00
Ozzie Isaacs
5d8d796807
Compatibility for sqlalchemy 2.0
2021-03-20 10:09:08 +01:00
Ozzie Isaacs
f3d88fc746
Update sqlalchemy 1.4 working
2021-03-20 09:31:29 +01:00
Ozzie Isaacs
d87ccae6c9
Merge branch 'master' into development
...
# Conflicts:
# cps/server.py
# test/Calibre-Web TestSummary_Linux.html
2021-03-19 20:33:38 +01:00
Ozzie Isaacs
2760a7816d
Fix metadata recognition fb2 files
2021-03-19 20:32:15 +01:00
Ozzie Isaacs
8f5c649d0f
Updated dependency comicapi (removed pypdf2)
...
Updated dependency pyPDF2 ->pyPDF3
Fixed broken updater in case of http error
Bugfixes from testrun
Bugfix load cover for BasicMetadata
2021-03-19 13:35:52 +01:00
Ozzie Isaacs
fcf9e7a1ef
Upload pdf fixes:
...
Handle no title
Handle no author
Fix import of more than one language
Add missing pdf upload publisher handling
2021-03-17 19:06:51 +01:00
Ozzie Isaacs
2be7b6480a
Merge remote-tracking branch 'pdf/XMP_Metadata3' into master
2021-03-17 19:05:26 +01:00
cbartondock
f5ded86c02
removed extraneous logs
2021-03-16 19:18:57 -04:00
rra
8abfaf0ffd
Parse XMP metadata in separate function, add exception, try multiple metadata formats
2021-03-16 17:53:33 +01:00
Ozzie Isaacs
b070ba142f
Selects are working in user management with generic confirm dialog
2021-03-16 15:52:31 +01:00
Ozzie Isaacs
bd7c6828bf
Selects are working in user management
2021-03-16 15:03:38 +01:00
cbartondock
d0671ec58c
Merge branch 'master' of https://github.com/janeczku/calibre-web
2021-03-15 21:09:51 -04:00
cbartondock
1e40ffd1cc
merge changes
2021-03-15 21:08:41 -04:00
Ozzie Isaacs
da2c3e9ed7
Edit user mass change checkbox working
2021-03-15 16:46:27 +01:00
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