Ozzieisaacs
47641eee59
Merge branch 'master' into Develop
4 years ago
Ozzieisaacs
42abe28cc1
Fix for #1389 (import ldap users with whitespaces)
4 years ago
Ozzieisaacs
16a3deec2c
Merge branch 'master' into Develop
...
# Conflicts:
# cps/helper.py
4 years ago
OzzieIsaacs
a9085752c1
Fix error "email" not in to_save
4 years ago
Ozzieisaacs
75fb7c2e95
Allowing upload extensions ( #1119 )
4 years ago
Ozzieisaacs
0a02caad04
Improvements
4 years ago
Ozzieisaacs
ff75bdba9e
Merge branch 'master' into Develop
4 years ago
Ozzieisaacs
a437c603c6
Merge remote-tracking branch 'kepubify/Develop' into Develop
...
# Conflicts:
# cps/admin.py
# cps/helper.py
# cps/templates/config_edit.html
# cps/web.py
4 years ago
Ozzieisaacs
4e940f7fa0
Added response header for improving security
4 years ago
Knepherbird
69fde7dead
Update web.py
...
Set db.Publishers query to order by name column, because publishers.sort column is empty.
4 years ago
Ozzieisaacs
48f4b12c0e
Merge branch 'master' into Develop
...
# Conflicts:
# cps/editbooks.py
4 years ago
Ozzieisaacs
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
4 years ago
Ozzieisaacs
b95f6563cc
Merge remote-tracking branch 'read-config/remove-duplicate-read-status-without-filter' into Develop
4 years ago
Ozzieisaacs
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
4 years ago
Ozzieisaacs
bea7223a0a
Renabled cbrimage extraction (via unrar and rarfile)
4 years ago
Ozzieisaacs
2d92818613
Code cosmetics
4 years ago
Ozzieisaacs
d9dde36c74
Merge remote-tracking branch 'improve_read/sort-book-name' search results are ordered according to sort field in book title
4 years ago
Ozzieisaacs
9f0c0b34af
Merge remote-tracking branch 'order_category/master'
4 years ago
Ozzieisaacs
87ec44aed5
Merge remote-tracking branch 'improve_reaad/keep-focus-on-search-input'
4 years ago
Ozzieisaacs
456550a943
Bugfix view shelfs on detiled page
...
bugfix datetime in archive mode
4 years ago
Ozzieisaacs
7b789b3701
Fix opds with shelves
...
Fix errorhandler ldap without ldap
4 years ago
Ozzieisaacs
0480d493cf
Fix opds login with ldap, if ldap server is down
4 years ago
Ozzieisaacs
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
4 years ago
Ozzieisaacs
7393b69757
Fix for #1326 (typo)
4 years ago
Ozzieisaacs
8bd1903d98
Fix for #1326 (opds feed user login not working -> download was not possible)
4 years ago
Ozzieisaacs
95ca1e6a9d
Fix for #1319
4 years ago
celogeek
f9b4505843
Sort search result by Books sort
...
It is far easier to search for a
series or anything and see
books in sort order
4 years ago
celogeek
ca2bcc647d
Handle read config
...
Allow advance search
Remove duplicate status on show
4 years ago
pthiben
a5fe08e84c
Fix button color that now matches HEAD on master
...
Update name for HTML Series that changed with HEAD
4 years ago
pthiben
1e3a948977
fix linter errors
...
Fix the sorting
Save the sorting state
Remove unnecessary filter
Add support for grid view
4 years ago
Ozzieisaacs
06fde4fcd0
Fix #1311 (Enable LDAP Anonymous Login)
4 years ago
Ozzieisaacs
9e159ed5ab
Merge branch 'master' into Develop
...
# Conflicts:
# cps/config_sql.py
# cps/ub.py
# cps/web.py
4 years ago
aribes
f926e58891
Changing ordering logic when showing books from a category
4 years ago
Ozzieisaacs
a784c6bd52
Fixes for oauth login after programming basic tests
4 years ago
Ozzieisaacs
ce4f1258b5
Fix #1293 (error 500 on search without query)
4 years ago
Ozzieisaacs
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
4 years ago
Ozzieisaacs
a194216568
Merge remote-tracking branch 'origin/master'
4 years ago
Ozzieisaacs
8bee424cc0
Merge remote-tracking branch 'ldap/master'
...
# Conflicts:
# cps/admin.py
# cps/templates/admin.html
# cps/templates/config_edit.html
# cps/web.py
4 years ago
Ozzieisaacs
5864637f1c
Merge branch 'master' into Develop
4 years ago
Ozzieisaacs
e99f5bcced
Merge remote-tracking branch 'english/master'
4 years ago
Ozzieisaacs
bab14a1fbf
Update shelfs handling, bugfix changed updater
4 years ago
Ozzieisaacs
0c27ff11b9
Update Updater
4 years ago
Josh O'Brien
c870f6e87d
English Language V2
4 years ago
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
4 years ago
Ozzieisaacs
d597e05fa9
Merge remote-tracking branch 'reading_state' into Develop
...
# Conflicts:
# cps/kobo.py
4 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
ground7
6555d5869f
attempt regular login if ldap login fails as fallback
5 years ago
ground7
54c4f40188
added LDAP import
...
update defaults
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
Ozzieisaacs
54079b36ae
Fix #1095 (epub viewer not working if only viewer rule wa sapplied)
5 years ago
Ozzieisaacs
a4416c202d
Merge remote-tracking branch 'rename/develop'
5 years ago
Ghighi Eftimie
f782dc1857
fix for search title
5 years ago
Ozzieisaacs
c8c2d6659c
Merge remote-tracking branch 'public_reconnect/master'
5 years ago
zelazna
3764c33a3a
Add the posibility to change the username
5 years ago