Ozzieisaacs
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
5 years ago
Ozzieisaacs
d597e05fa9
Merge remote-tracking branch 'reading_state' into Develop
...
# Conflicts:
# cps/kobo.py
5 years ago
Ozzieisaacs
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
5 years ago
Michael Shavit
8e1641dac9
Add support for syncing Kobo reading state.
5 years ago
Michael Shavit
57d37ffba8
Add schema support for more reading states to the ReadBook table.
5 years ago
Ozzieisaacs
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
5 years ago
Ozzieisaacs
372c284ad4
Merge branch 'master' into Develop
5 years ago
Michael Shavit
7d99e21d0d
Merge remote-tracking branch 'original/Develop' into kobo_book_delete
5 years ago
Ozzieisaacs
ba6b5f8fd1
Merge branch 'master' into Develop
5 years ago
Josh O'Brien
8f518993a4
Merge branch 'master' into master
5 years ago
Ozzieisaacs
ed0bdbf31d
Fix for #1199 (missing referrer)
5 years ago
Ozzieisaacs
b152d3e06d
Merge remote-tracking branch 'auth_token/fix/reverse-proxy-authentication-with-bearer-token'
5 years ago
André Frimberger
33cdf20cd5
Remove trailing whitespaces
5 years ago
Ozzieisaacs
8b1444ebc2
Improved testability
...
Less content exposed with restricted content
Tornado restart and stop working with systemd
5 years ago
Ozzieisaacs
2ea45b1fdc
Removed shebang on non executable scripts
5 years ago
André Frimberger
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.
5 years ago
Ozzieisaacs
50ba2e329a
Merge branch 'master' into Develop
...
# Conflicts:
# cps/shelf.py
5 years ago
Ozzie Isaacs
e04aa80fd6
Fix #1181 and Fix #1182 handle removed "is_xhr" on werkzeug version 1.0.0
5 years ago
Josh O'Brien
9b49125776
English Language Updates
...
Changes to provide consistency for English language.
5 years ago
Ozzieisaacs
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
5 years ago
Ozzieisaacs
e44494aad0
Kobo sync enable/disable working
5 years ago
Michael Shavit
4547c328bc
Delete/Restore book from Kobo device upon (un)archiving of a book in the web UI.
5 years ago
Michael Shavit
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.
5 years ago
Ozzieisaacs
cd9bb56db5
Cleanup Kobo integration
5 years ago
Ozzieisaacs
1d7e52c198
Merge with develop:
...
- No. of unread books correct calculated
- logviewer handles stream output correct
- Id for testablility in email server setup
5 years ago
Ozzieisaacs
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
5 years ago
Ozzieisaacs
2798dd5916
Merge remote-tracking branch 'fix/kobo' into Develop
...
# Conflicts:
# cps/db.py
# cps/web.py
5 years ago
Ozzieisaacs
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
5 years ago
Ozzieisaacs
cabad83418
moved language selection back, default value for restriction columns
...
Merge branch 'master' into Develop
# Conflicts:
# cps/editbooks.py
5 years ago
Ozzieisaacs
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)
5 years ago
Ozzieisaacs
c78c63e1d5
Merge remote-tracking branch 'fix_reconnect'
...
# Conflicts:
# cps/web.py
5 years ago
Ozzieisaacs
48495f0d66
Merge branch 'master' into Develop
...
# Conflicts:
# cps/helper.py
# cps/templates/user_edit.html
# cps/web.py
5 years ago
Ozzieisaacs
513ac6cfb4
Fix for #768 (If email server is configured, admins can send user passwords, also domains can be denied from registration)
...
Fixes from tests
Fix response opds with read/unread
changed db_reconnect
Changed output for error 500 (now including error message)
Fix in task queue after 20 messages
5 years ago
Ozzieisaacs
1da4efec86
Merge branch 'master' into Develop
5 years ago
Ozzieisaacs
1c630eb604
fixes from tests
5 years ago
Ozzieisaacs
1c18a788f4
Merge remote-tracking branch 'tags_restrict/master' into Develop
5 years ago
Ozzieisaacs
01381488f4
Fixes from tests
5 years ago
Ozzieisaacs
62e8bee2a8
Fix response opds with read/unread
...
changed db_reconnect
Changed output for error 500 (now including error message)
Fix in task queue after 20 messages
5 years ago
Michael Shavit
c238367b64
Reload database on every call to v1/library/sync. This fixes an issue where side-loaded books appear in the sync response with no download urls.
5 years ago
Michael Shavit
cdcb8a50d1
Fix /reconnect endpoint, which was broken by 006e596c72
5 years ago
Michael Shavit
520c695401
Fix /reconnect endpoint, which was broken by 006e596c72
5 years ago
Ozzieisaacs
f2c07d8f81
Update Kobo sync
5 years ago
Michael Shavit
27d084ce39
Remove the KoboUserKey-based Authentication.
...
Instead, the user generates the api_endpoint url to set on their device
by visiting http://.../kobo_auth/generate_auth_token .
The generated url will contain a RemoteAuthorizationToken that will be
included on all subsequent requests from the device to the kobo/
endpoints. (In contrast, the device is authenticated using a session cookie on
requests to the download endpoint).
Also use Flask.url_for to generate download urls.
5 years ago
Ozzieisaacs
f705889c23
Inital Kobo
5 years ago
Ozzieisaacs
eabc6e23be
Test Email now send to user's email address ( #834 )
...
Added forgot/reset password routine (#1098 , #1063 )
5 years ago
Ozzieisaacs
2215bf3d7f
Implemented #1083 (Advanced search for extensions)
5 years ago
Andrew Roberts
3dc372c573
fixed typo
5 years ago
Andrew Roberts
af7dbbf1e4
added logic for reverse proxy login
5 years ago
Michael Shavit
0b709f7dfb
Merge branch 'master' into kobo
5 years ago
Michael Shavit
9ede01f130
* Add a UserKeyToken to the User table for Kobo authorization.
...
* Add proper authorization checks on the new Kobo endpoints.
Important Note: As a side-effect, all CalibreWeb API calls can be
authorized using this token (i.e without a username&password).
5 years ago