2343c79126
Use djvu_html5 to read djvu format in browser
2020-11-15 13:19:37 +01:00
50441bae62
Fix missing audio icon for other audio formats than mp3
2020-11-10 18:08:22 +01:00
0771546dad
Log exception on user import
2020-11-01 18:25:38 +01:00
130701a7bb
Merge remote-tracking branch 'sec_fixes/admin_update' into master
2020-10-31 20:02:42 +01:00
1b0b4c4cc5
Merge remote-tracking branch 'sec_fixes/ldap' into master
2020-10-31 19:29:17 +01:00
fa82745f64
Put import_ldap_users behind a login
2020-10-27 19:26:04 +01:00
19b2a334e4
Remove unused imports
2020-10-27 11:06:43 +01:00
bc0416cbb4
Fix for #1660 (advanced search for custom columns working, headline for advanced search working)
2020-10-16 20:24:15 +02:00
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
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
6dadc6fb1e
same fix but hopefully better
2020-10-10 13:15:02 +03:00
2e67bd2407
Fix add to shelf from search
2020-10-10 10:32:53 +02:00
d70ded0993
Fix for search
2020-10-10 07:47:27 +02:00
6e6f144b7a
Paginated search and advanced search
...
Wraparound on books list deactivated
2020-10-04 19:23:06 +02:00
376001100a
Bugfixes from last testrun
2020-09-28 21:24:47 +02:00
cc0b0196f4
Store UI settings in flask session for guest user
2020-09-27 19:12:10 +02:00
6dfa171b4e
Added id's for testing
...
moved downloaded books section
2020-09-27 16:00:17 +02:00
497fbdcdfc
Save view settings
2020-09-27 12:37:41 +02:00
7c8f6ce62f
Merge branch 'master' into Develop
...
# Conflicts:
# cps/comic.py
# cps/editbooks.py
# cps/isoLanguages.py
2020-09-26 07:54:38 +02:00
9a896ea81e
Removed logging of headers as it caused trouble while showing logfile in UI
2020-09-26 07:51:29 +02:00
8f743b70a4
Revert the tolino stuff
2020-09-22 20:25:58 +02:00
a761017116
Additional debug output for #1527
2020-09-21 19:09:02 +02:00
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
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
057f70ea9c
Add author sort
2020-08-29 18:53:00 -07:00
9e5cad0dc8
Merge new worker thread
2020-08-29 11:14:52 +02:00
61d628d596
oauth problem solved
2020-08-26 18:22:56 +02:00
6322919bc7
Merge branch 'Develop' into tasks
...
# Conflicts:
# cps/db.py
2020-08-25 00:15:41 -04:00
d89830af61
Fix anonymous user has no modified_flag error
2020-08-24 21:00:13 +02:00
6a8ae9c0c4
Merge remote-tracking branch 'upstream/master' into tasks
...
# Conflicts:
# cps/helper.py
2020-08-23 21:38:56 -04:00
f066926fc9
Merge branch 'master' into Develop
2020-08-23 10:56:10 +02:00
4c38b0ab10
Prepare for save name sort order
2020-08-23 10:56:00 +02:00
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
2533c9c14e
Continue converting tasks - email and upload tasks
2020-08-22 22:44:28 -04:00
f10f0dada6
First working PoC with a new task structure
2020-08-22 16:31:00 -04:00
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
ad144922fb
Merge with master
2020-08-22 09:23:29 +02:00
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
1ca4583896
feat(ldap): add a field that allows to override LDAP User Object Filter when a user is imported
2020-07-23 12:12:00 +02:00
f8139f3198
Store last selected view for sidebar (not for categories, series, publishers, ..)
...
Started making search paged
2020-07-11 12:09:34 +02:00
df01022f49
Added save user view settings
2020-07-08 21:18:38 +02:00
f80c67828b
Fix #1500 (Custom ratings of increment 0.5 are allowed)
2020-07-05 14:35:57 +02:00
ee6f1405d4
Fix #1456 (Added route to robots.txt)
2020-07-04 21:22:19 +02:00
ccca5d4d1c
Merge branch 'master' into Develop
...
# Conflicts:
# cps/templates/layout.html
2020-06-28 12:11:46 +02:00
eeff5a5d43
fix for hidden input 'next' on login form
2020-06-27 12:00:08 +03:00
67dd4a72b0
Add series info to all book "meta" displays
2020-06-26 12:26:36 -07:00
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
2020-06-22 19:11:58 +02:00
d0a3503d74
Fix #1493 (stay logged in with enabled remember token, use remember token)
2020-06-20 19:02:23 +02:00
59b78f9984
enable disabling of remember_me function
2020-06-20 15:41:26 +02:00
2f833dc457
Fix login with remember me token
2020-06-20 13:46:12 +02:00
d44f283a05
View status in books table is stored
2020-06-12 16:15:54 +02:00
c18d5786dd
Improved validation check
2020-06-12 13:45:07 +02:00
1c681ee378
Improvements for books table editor
2020-06-11 21:19:09 +02:00
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
2020-06-11 08:48:23 +02:00
4038cb5b85
Internal paged Search prepared
...
Search for table list is working
2020-06-08 17:34:03 +02:00
628658972c
Merge branch 'master' into Develop
2020-06-07 19:39:17 +02:00
fdf10e3d2e
Fix #1473 (reconnect not working via web-route access)
2020-06-07 14:11:41 +02:00
0dd0605a1f
Book list for merging
2020-06-06 21:21:10 +02:00
d1b533848d
Changed pubdate to timestamp
2020-06-05 20:13:39 +02:00
89223760e6
Merge branch 'master' into Develop
2020-06-01 10:58:49 +02:00
27ed918896
Enabled search for archived books
2020-05-27 19:19:17 +02:00
dde7cf18f7
removed extra reference to calibre_db (calibre_db.calibre_db..) typo?
2020-05-27 01:41:15 -07:00
b852fb0e26
Merge branch 'Develop'
2020-05-25 21:30:21 +02:00
cf10244f20
Fix for failed recovery of config_logfile
2020-05-24 09:59:45 +02:00
570684d308
Fix custom bool column not visible in adv search if linked to read status
2020-05-23 21:26:39 +02:00
244db8d894
Fix from tests advanced search for custom columns
2020-05-23 21:17:58 +02:00
d0e15da352
Fix lcase function
2020-05-23 12:51:48 +02:00
b1b293a3ec
Fix order_authors
2020-05-23 11:09:50 +02:00
5f0660a4e5
Refactored helper.py and db.py
2020-05-23 10:16:29 +02:00
0cf1cc5587
Fixes from tests
2020-05-21 22:26:19 +02:00
1a458fe39f
Fix for #1407 converting books should now be possible again
2020-05-21 18:16:11 +02:00
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)
2020-05-21 09:28:35 +02:00
29b94c5615
Fix for #1407 (to many read books lead to to large sql query) -> only fix for linked calibre-column
2020-05-19 21:36:22 +02:00
81fc1eccd3
Fix for #1407 (to many read books lead to to large sql query) -> only fix for linked calibre-column
2020-05-19 21:35:56 +02:00
38c28f4358
Merge branch 'master' into Develop
...
# Conflicts:
# cps/admin.py
# cps/constants.py
# cps/static/css/caliBlur.min.css
# cps/uploader.py
2020-05-17 16:22:58 +02:00
2468cf63cc
Fix for #1397 (changed supported audio files)
...
Changed max gevent version
Fix for #1397 (changed supported audio files)
2020-05-17 10:07:36 +02:00
e787f9dd9f
Automatic username ( #1172 )
2020-05-12 17:23:58 +02:00
47641eee59
Merge branch 'master' into Develop
2020-05-12 16:16:04 +02:00
42abe28cc1
Fix for #1389 (import ldap users with whitespaces)
2020-05-12 16:13:56 +02:00
16a3deec2c
Merge branch 'master' into Develop
...
# Conflicts:
# cps/helper.py
2020-05-10 19:24:55 +02:00
a9085752c1
Fix error "email" not in to_save
2020-05-10 10:26:22 +02:00
75fb7c2e95
Allowing upload extensions ( #1119 )
2020-05-09 16:54:22 +02:00
0a02caad04
Improvements
2020-05-09 11:01:00 +02:00
ff75bdba9e
Merge branch 'master' into Develop
2020-05-08 19:05:08 +02:00
a437c603c6
Merge remote-tracking branch 'kepubify/Develop' into Develop
...
# Conflicts:
# cps/admin.py
# cps/helper.py
# cps/templates/config_edit.html
# cps/web.py
2020-05-08 14:53:21 +02:00
4e940f7fa0
Added response header for improving security
2020-05-08 14:49:12 +02:00
69fde7dead
Update web.py
...
Set db.Publishers query to order by name column, because publishers.sort column is empty.
2020-05-07 13:55:59 -07:00
48f4b12c0e
Merge branch 'master' into Develop
...
# Conflicts:
# cps/editbooks.py
2020-05-06 18:47:33 +02:00
0a92d79ec0
Merge remote-tracking branch 'cover-series/feature/add-cover-serie-view' into Develop
...
# Conflicts:
# cps/static/css/style.css
# cps/ub.py
# cps/web.py
2020-05-01 17:25:13 +02:00
b95f6563cc
Merge remote-tracking branch 'read-config/remove-duplicate-read-status-without-filter' into Develop
2020-05-01 17:19:13 +02:00
b160a8de0b
Merge branch 'master' into Develop
...
# Conflicts:
# cps/__init__.py
# cps/comic.py
# cps/editbooks.py
# cps/helper.py
# cps/kobo.py
# cps/translations/nl/LC_MESSAGES/messages.mo
# cps/translations/nl/LC_MESSAGES/messages.po
# cps/ub.py
# cps/uploader.py
# cps/web.py
2020-04-30 18:08:28 +02:00
bea7223a0a
Renabled cbrimage extraction (via unrar and rarfile)
2020-04-28 16:50:08 +02:00
2d92818613
Code cosmetics
2020-04-27 20:01:13 +02:00
d9dde36c74
Merge remote-tracking branch 'improve_read/sort-book-name' search results are ordered according to sort field in book title
2020-04-26 19:00:36 +02:00
9f0c0b34af
Merge remote-tracking branch 'order_category/master'
2020-04-26 18:50:28 +02:00
87ec44aed5
Merge remote-tracking branch 'improve_reaad/keep-focus-on-search-input'
2020-04-26 18:38:09 +02:00
456550a943
Bugfix view shelfs on detiled page
...
bugfix datetime in archive mode
2020-04-26 11:34:10 +02:00
7b789b3701
Fix opds with shelves
...
Fix errorhandler ldap without ldap
2020-04-26 08:40:53 +02:00
0480d493cf
Fix opds login with ldap, if ldap server is down
2020-04-25 21:12:07 +02:00
b4d7733e0a
Merge branch 'master' into Develop
...
# Conflicts:
# cps/templates/list.html
# cps/translations/cs/LC_MESSAGES/messages.po
# cps/translations/de/LC_MESSAGES/messages.po
# cps/translations/es/LC_MESSAGES/messages.po
# cps/translations/fi/LC_MESSAGES/messages.po
# cps/translations/fr/LC_MESSAGES/messages.po
# cps/translations/hu/LC_MESSAGES/messages.po
# cps/translations/it/LC_MESSAGES/messages.po
# cps/translations/ja/LC_MESSAGES/messages.po
# cps/translations/km/LC_MESSAGES/messages.po
# cps/translations/nl/LC_MESSAGES/messages.po
# cps/translations/pl/LC_MESSAGES/messages.po
# cps/translations/ru/LC_MESSAGES/messages.po
# cps/translations/sv/LC_MESSAGES/messages.po
# cps/translations/uk/LC_MESSAGES/messages.po
# cps/translations/zh_Hans_CN/LC_MESSAGES/messages.po
# messages.pot
2020-04-25 20:06:25 +02:00
7393b69757
Fix for #1326 (typo)
2020-04-24 19:25:11 +02:00
8bd1903d98
Fix for #1326 (opds feed user login not working -> download was not possible)
2020-04-24 18:37:29 +02:00
95ca1e6a9d
Fix for #1319
2020-04-20 18:56:39 +02:00
f9b4505843
Sort search result by Books sort
...
It is far easier to search for a
series or anything and see
books in sort order
2020-04-19 13:03:46 +02:00
ca2bcc647d
Handle read config
...
Allow advance search
Remove duplicate status on show
2020-04-19 12:50:58 +02:00
a5fe08e84c
Fix button color that now matches HEAD on master
...
Update name for HTML Series that changed with HEAD
2020-04-18 23:32:15 -04:00
1e3a948977
fix linter errors
...
Fix the sorting
Save the sorting state
Remove unnecessary filter
Add support for grid view
2020-04-18 23:22:51 -04:00
06fde4fcd0
Fix #1311 (Enable LDAP Anonymous Login)
2020-04-18 11:48:34 +02:00
9e159ed5ab
Merge branch 'master' into Develop
...
# Conflicts:
# cps/config_sql.py
# cps/ub.py
# cps/web.py
2020-04-16 20:12:27 +02:00
f926e58891
Changing ordering logic when showing books from a category
2020-04-16 11:37:04 +10:00
a784c6bd52
Fixes for oauth login after programming basic tests
2020-04-15 22:03:21 +02:00
ce4f1258b5
Fix #1293 (error 500 on search without query)
2020-04-14 19:27:18 +02:00
4749eccfa5
Added fix for python2 regex
...
Fix for python2 attributeError instead of TypeError on login with wrong openLDAP setting
Added default empty string on LDAPCertificate
Fix ldap as scheme for tls connection
Enabled add user on LDAP Authentication
LDAP config port is now number input
Added header for user import config
Added python ldap version to about section
Fix: It's no longer possible to login via fallback password as long as LDAP server is available
Fix: TypeError on bind is now catched and transformed to error message
Update Readme
Fixes for ldap
2020-04-14 10:58:32 +02:00
a194216568
Merge remote-tracking branch 'origin/master'
2020-04-05 19:10:27 +02:00
8bee424cc0
Merge remote-tracking branch 'ldap/master'
...
# Conflicts:
# cps/admin.py
# cps/templates/admin.html
# cps/templates/config_edit.html
# cps/web.py
2020-04-05 17:31:41 +02:00
5864637f1c
Merge branch 'master' into Develop
2020-04-04 06:22:17 +02:00
e99f5bcced
Merge remote-tracking branch 'english/master'
2020-04-03 19:46:26 +02:00
bab14a1fbf
Update shelfs handling, bugfix changed updater
2020-04-02 18:23:24 +02:00
0c27ff11b9
Update Updater
2020-04-01 18:45:16 +02:00
c870f6e87d
English Language V2
2020-03-19 13:10:10 +11:00
09e7d76c6f
Merge remote-tracking branch 'kobo_book_delete' into Develop
...
# Conflicts:
# cps/kobo.py
# cps/services/SyncToken.py
# cps/templates/book_edit.html
# cps/ub.py
2020-03-12 20:43:39 +01:00
d597e05fa9
Merge remote-tracking branch 'reading_state' into Develop
...
# Conflicts:
# cps/kobo.py
2020-03-12 20:35:24 +01:00
d267338837
Fixes for Kobo sync
...
Better output on upload cover
Fix for download after access to opds/fileformat
Fix osd search link
Added ratings to opds feed
Change for kobo sync for testing
2020-03-07 11:07:43 +01:00
8e1641dac9
Add support for syncing Kobo reading state.
2020-03-01 22:01:05 -05:00
57d37ffba8
Add schema support for more reading states to the ReadBook table.
2020-03-01 20:26:42 -05:00
9fc0c3b3de
Merge remote-tracking branch 'English_texts/master'
...
# Conflicts:
# cps/templates/config_edit.html
# cps/templates/config_view_edit.html
# cps/templates/layout.html
# cps/templates/search_form.html
# cps/templates/user_edit.html
2020-02-23 13:27:44 +01:00
372c284ad4
Merge branch 'master' into Develop
2020-02-22 16:24:06 +01:00
7d99e21d0d
Merge remote-tracking branch 'original/Develop' into kobo_book_delete
2020-02-17 14:49:42 -05:00
ba6b5f8fd1
Merge branch 'master' into Develop
2020-02-17 18:42:53 +01:00
8f518993a4
Merge branch 'master' into master
2020-02-18 00:21:59 +11:00
ed0bdbf31d
Fix for #1199 (missing referrer)
2020-02-16 19:39:32 +01:00
b152d3e06d
Merge remote-tracking branch 'auth_token/fix/reverse-proxy-authentication-with-bearer-token'
2020-02-16 19:24:28 +01:00
33cdf20cd5
Remove trailing whitespaces
2020-02-16 10:25:01 +01:00
8b1444ebc2
Improved testability
...
Less content exposed with restricted content
Tornado restart and stop working with systemd
2020-02-15 09:08:39 +01:00
2ea45b1fdc
Removed shebang on non executable scripts
2020-02-10 18:37:47 +01:00
7a608b4fb0
fix binascii.Error with reverse proxy bearer token
...
When an authenticating reverse proxy (e.g. Keycloak Gatekeeper) adds a Bearer token in the Authorization header, every request fails with HTTP status code 500. The corresponding error in the logs is: binascii.Error: Incorrect padding.
Despite "reverse_proxy_header_login" is enabled, calibre-web tries first to base64decode the bearer token and fails. This patch just reverses the order in which the authentication methods are checked.
2020-02-09 17:21:22 +01:00
50ba2e329a
Merge branch 'master' into Develop
...
# Conflicts:
# cps/shelf.py
2020-02-09 07:00:04 +01:00
e04aa80fd6
Fix #1181 and Fix #1182 handle removed "is_xhr" on werkzeug version 1.0.0
2020-02-08 14:40:13 +01:00
9b49125776
English Language Updates
...
Changes to provide consistency for English language.
2020-02-03 14:22:00 +11:00
b33a2ac90d
Fix #1170 Auth-digest Header no longer crashs calibre-web
...
Fix #1161 Shelfs are reordering again
Update Sortable.js to 2.10.1
Code cosmetics
2020-02-02 07:47:27 +01:00
e44494aad0
Kobo sync enable/disable working
2020-01-27 20:32:37 +01:00
4547c328bc
Delete/Restore book from Kobo device upon (un)archiving of a book in the web UI.
2020-01-26 00:29:36 -05:00
c0239a659c
Add UI support for archived books.
...
Archived books will no longer appear in any book lists or searches, and
may only be restored from the Archive view.
2020-01-26 00:27:54 -05:00
cd9bb56db5
Cleanup Kobo integration
2020-01-20 06:14:53 +01:00
1d7e52c198
Merge with develop:
...
- No. of unread books correct calculated
- logviewer handles stream output correct
- Id for testablility in email server setup
2020-01-13 18:37:29 +01:00
79a9ef4859
Make Kobo optional
...
move jsonschema dependency to optional-requirements.txt
Added version of jsonschema to about section
Added additional column to RemoteAuthToken table
Update configuration of Kobo sync protocol
2020-01-12 13:42:39 +01:00
2798dd5916
Merge remote-tracking branch 'fix/kobo' into Develop
...
# Conflicts:
# cps/db.py
# cps/web.py
2020-01-11 18:35:04 +01:00
8143c16c14
Added texts for allowed denied tags in configuration
...
Removed domain only restriction (now it's also possible to allow/deny name parts of users email)
Fix no. of displayed books in unread books section, with applied restrictions
2020-01-11 13:28:09 +01:00
cabad83418
moved language selection back, default value for restriction columns
...
Merge branch 'master' into Develop
# Conflicts:
# cps/editbooks.py
2020-01-05 16:20:36 +01:00
6a07cfba65
Merge remote-tracking branch 'proxy_login/1105-reverse-proxy-login'
...
Fix for creation of bool config settings (before: new bool columns where always created with true as default)
2020-01-05 13:38:51 +01:00
verglor
Ozzieisaacs
jvoisin
Ghighi Eftimie
Michael Knepher
blitzmann
Ozzie Isaacs
Brandon Ingli
Clément Poissonnier
Wolviex
celogeek
pthiben
aribes
Josh O'Brien
Michael Shavit
Josh O'Brien
André Frimberger