9e159ed5ab
Merge branch 'master' into Develop
...
# Conflicts:
# cps/config_sql.py
# cps/ub.py
# cps/web.py
5 years ago
f926e58891
Changing ordering logic when showing books from a category
5 years ago
a784c6bd52
Fixes for oauth login after programming basic tests
5 years ago
ce4f1258b5
Fix #1293 (error 500 on search without query)
5 years ago
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
5 years ago
a194216568
Merge remote-tracking branch 'origin/master'
5 years ago
8bee424cc0
Merge remote-tracking branch 'ldap/master'
...
# Conflicts:
# cps/admin.py
# cps/templates/admin.html
# cps/templates/config_edit.html
# cps/web.py
5 years ago
5864637f1c
Merge branch 'master' into Develop
5 years ago
e99f5bcced
Merge remote-tracking branch 'english/master'
5 years ago
bab14a1fbf
Update shelfs handling, bugfix changed updater
5 years ago
0c27ff11b9
Update Updater
5 years ago
c870f6e87d
English Language V2
5 years ago
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
d597e05fa9
Merge remote-tracking branch 'reading_state' into Develop
...
# Conflicts:
# cps/kobo.py
5 years ago
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
8e1641dac9
Add support for syncing Kobo reading state.
5 years ago
57d37ffba8
Add schema support for more reading states to the ReadBook table.
5 years ago
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
372c284ad4
Merge branch 'master' into Develop
5 years ago
7d99e21d0d
Merge remote-tracking branch 'original/Develop' into kobo_book_delete
5 years ago
ba6b5f8fd1
Merge branch 'master' into Develop
5 years ago
8f518993a4
Merge branch 'master' into master
5 years ago
ed0bdbf31d
Fix for #1199 (missing referrer)
5 years ago
b152d3e06d
Merge remote-tracking branch 'auth_token/fix/reverse-proxy-authentication-with-bearer-token'
5 years ago
33cdf20cd5
Remove trailing whitespaces
5 years ago
8b1444ebc2
Improved testability
...
Less content exposed with restricted content
Tornado restart and stop working with systemd
5 years ago
2ea45b1fdc
Removed shebang on non executable scripts
5 years ago
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
50ba2e329a
Merge branch 'master' into Develop
...
# Conflicts:
# cps/shelf.py
5 years ago
e04aa80fd6
Fix #1181 and Fix #1182 handle removed "is_xhr" on werkzeug version 1.0.0
5 years ago
9b49125776
English Language Updates
...
Changes to provide consistency for English language.
5 years ago
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
e44494aad0
Kobo sync enable/disable working
5 years ago
4547c328bc
Delete/Restore book from Kobo device upon (un)archiving of a book in the web UI.
5 years ago
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
cd9bb56db5
Cleanup Kobo integration
5 years ago
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
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
2798dd5916
Merge remote-tracking branch 'fix/kobo' into Develop
...
# Conflicts:
# cps/db.py
# cps/web.py
5 years ago
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
cabad83418
moved language selection back, default value for restriction columns
...
Merge branch 'master' into Develop
# Conflicts:
# cps/editbooks.py
5 years ago
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
c78c63e1d5
Merge remote-tracking branch 'fix_reconnect'
...
# Conflicts:
# cps/web.py
5 years ago
48495f0d66
Merge branch 'master' into Develop
...
# Conflicts:
# cps/helper.py
# cps/templates/user_edit.html
# cps/web.py
5 years ago
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
1da4efec86
Merge branch 'master' into Develop
5 years ago
1c630eb604
fixes from tests
5 years ago
1c18a788f4
Merge remote-tracking branch 'tags_restrict/master' into Develop
5 years ago
01381488f4
Fixes from tests
5 years ago
6555d5869f
attempt regular login if ldap login fails as fallback
5 years ago
54c4f40188
added LDAP import
...
update defaults
5 years ago
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
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
cdcb8a50d1
Fix /reconnect endpoint, which was broken by 006e596c72
5 years ago
520c695401
Fix /reconnect endpoint, which was broken by 006e596c72
5 years ago
f2c07d8f81
Update Kobo sync
5 years ago
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
f705889c23
Inital Kobo
5 years ago
eabc6e23be
Test Email now send to user's email address ( #834 )
...
Added forgot/reset password routine (#1098 , #1063 )
5 years ago
2215bf3d7f
Implemented #1083 (Advanced search for extensions)
5 years ago
3dc372c573
fixed typo
5 years ago
af7dbbf1e4
added logic for reverse proxy login
5 years ago
0b709f7dfb
Merge branch 'master' into kobo
5 years ago
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
54079b36ae
Fix #1095 (epub viewer not working if only viewer rule wa sapplied)
5 years ago
a4416c202d
Merge remote-tracking branch 'rename/develop'
5 years ago
f782dc1857
fix for search title
5 years ago
c8c2d6659c
Merge remote-tracking branch 'public_reconnect/master'
5 years ago
3764c33a3a
Add the posibility to change the username
5 years ago
6cda5fee0d
Fix language selection on python3
5 years ago
051bc53aa2
Fix for #1009
5 years ago
23b3bfd967
Additional fix #1016
5 years ago
f543d7f486
Fix #1016
5 years ago
38a255e069
Add automatic epub to kepub conversion using kepubify
5 years ago
5f25b81004
Final fix for #983
5 years ago
73bbffccaa
Fix for login issue on MacOS
5 years ago
00f17bb697
Mature contents no longer displayed in/allowed to ( #975 ):
...
- typeahead tags
- advanced search tags buttons
- read
- download
5 years ago
cf00b4eebf
Cover upload gives Error 500 fix #972 (leftover from refactoring)
...
OPDS cannot be downloaded Fix #973 (wrong blueprint selected with wrong authentication type)
Read books with link to calibre wern't detected correct Fix #971 (Refactoring error "is" is not equal to "==" for sqlalchemy)
5 years ago
97a0dccdec
Fix for display of format, series, category, ratings,
...
Fix for display of language (sorting not working yet)
6 years ago
b9c3a3fcea
Fix #652
6 years ago
26a7d9ef30
Merge branch 'Develop'
...
# Conflicts:
# cps/__init__.py
# cps/about.py
# cps/admin.py
# cps/cli.py
# cps/config_sql.py
# cps/constants.py
# cps/converter.py
# cps/db.py
# cps/editbooks.py
# cps/gdriveutils.py
# cps/helper.py
# cps/logger.py
# cps/oauth.py
# cps/server.py
# cps/services/simpleldap.py
# cps/ub.py
# cps/web.py
# cps/worker.py
# optional-requirements.txt
# setup.cfg
# setup.py
6 years ago
63634961d4
cleaner worker api
...
the worker thread now stops on its own
6 years ago
d82289e303
Deactivate ldap
...
Fix setup for pypi
6 years ago
4708347c16
Merge branch 'Develop'
...
# Conflicts:
# MANIFEST.in
# README.md
# cps/helper.py
# cps/static/js/archive/archive.js
# cps/translations/nl/LC_MESSAGES/messages.mo
# cps/translations/nl/LC_MESSAGES/messages.po
# cps/ub.py
# cps/updater.py
# cps/web.py
# cps/worker.py
# optional-requirements.txt
6 years ago
e734bb120a
Merge remote-tracking branch 'github/config_sql' into Develop
6 years ago
006e596c72
Moved config class into separate file.
...
Moved Goodreads and LDAP services into separate package.
6 years ago
f79d549910
Fix duplicate user and email (now case insensitive #948 )
...
Fix sorting in comics (#950 )
Fix log error on Calibre converter error (#953 )
Fix long running tasks (#954 )
6 years ago
572b5427c7
Fix Encoding issues for python2
6 years ago
f40fc5aa75
Update LDAP
6 years ago
9b74d51f21
Merge remote-tracking branch 'ldap/master' into Develop
...
# Conflicts:
# cps/server.py
# cps/templates/config_edit.html
# cps/ub.py
# cps/updater.py
# cps/web.py
# optional-requirements-ldap.txt
# setup.cfg
6 years ago
26949970d8
Revert logging functions
...
Fix access logger for tornado
6 years ago
f5e3ed26b9
Fix for #935
6 years ago
546ed65e1d
Update logging
...
Fix sort order author
Fixes sorting view
Moved version info
added feature limit listening to single ipaddress
6 years ago
14b6202eec
Code cosmetics
...
Fixes func in helper,web
Fixes for pdf reader
fixes for calling from another folder
renamed to calibreweb for importing in python caller script
6 years ago
9a5ab97d78
Merge branch 'master' into master
6 years ago
79286c9384
encode password
6 years ago
c4e3f3670f
Added public /reconnect endpoint
6 years ago
b89ab9ff10
logging clean-up
...
- moved most constants to separate file
- sorted and cleaned-up imports
- moved logging setup to separate file
6 years ago
97d12b94f6
Correct settings update
6 years ago
e4d801bbaf
initial flask_simpleldap implementation
6 years ago
bb0d5c5538
Working for pip and "normal" start for python3 and python2
6 years ago
87ca05f129
Merge remote-tracking branch 'setup/feature/setuptools-integration'
6 years ago
4fecce0a0d
Merge branch 'master' into Develop
...
# Conflicts:
# cps/helper.py
# cps/static/js/archive/unrar.js
# cps/templates/readcbr.html
# cps/templates/readpdf.html
# cps/translations/de/LC_MESSAGES/messages.mo
# cps/translations/de/LC_MESSAGES/messages.po
# cps/translations/es/LC_MESSAGES/messages.mo
# cps/translations/es/LC_MESSAGES/messages.po
# cps/translations/fr/LC_MESSAGES/messages.mo
# cps/translations/fr/LC_MESSAGES/messages.po
# cps/translations/it/LC_MESSAGES/messages.mo
# cps/translations/it/LC_MESSAGES/messages.po
# cps/translations/ja/LC_MESSAGES/messages.mo
# cps/translations/ja/LC_MESSAGES/messages.po
# cps/translations/km/LC_MESSAGES/messages.mo
# cps/translations/km/LC_MESSAGES/messages.po
# cps/translations/nl/LC_MESSAGES/messages.mo
# cps/translations/nl/LC_MESSAGES/messages.po
# cps/translations/pl/LC_MESSAGES/messages.mo
# cps/translations/pl/LC_MESSAGES/messages.po
# cps/translations/ru/LC_MESSAGES/messages.mo
# cps/translations/ru/LC_MESSAGES/messages.po
# cps/translations/sv/LC_MESSAGES/messages.mo
# cps/translations/sv/LC_MESSAGES/messages.po
# cps/translations/uk/LC_MESSAGES/messages.mo
# cps/translations/zh_Hans_CN/LC_MESSAGES/messages.mo
# cps/translations/zh_Hans_CN/LC_MESSAGES/messages.po
# cps/web.py
# messages.pot
# optional-requirements.txt
6 years ago
f70c839014
Added additional permission viewer
6 years ago
0c80f5c63a
Update Teststatus
6 years ago
1030e195a5
Fix #916
6 years ago
3b03aa30a6
Fix for advanced search
6 years ago
cb0403a924
Merge remote-tracking branch 'adv_search/master'
6 years ago
a2c7741e21
Fix "Internal Server Error" on advanced search
...
Custom boolean columns return that error if calibre does not have a
custom_column_1 in the DB, as this is queried in the removed line.
However the value is completely unused anyway -> removing.
6 years ago
55bb8d4590
Fix #900
6 years ago
b80bfa5260
Improvement for #897
6 years ago
f941908f73
Workaround for #889
6 years ago
9b3b2acb49
Sort button is correctly visible on list pages
...
Publisher list is working
6 years ago
406d1c76c9
Sorting and filtering of lists working (except file formats)
...
Refactored and bugfixing show_cover
Refactored import of helper in web.py
Fix for displaying /me (gettext) throwing error 500
Fix get search results throwing error 500
Fix routing books_list for python2.7
Fix for "me" and "settings" pages
Update sidebarview and list view
6 years ago
2de4bfdcf2
Merge branch 'master' into Develop
...
# Conflicts:
# cps/book_formats.py
# cps/helper.py
# cps/web.py
6 years ago
c748716ad2
Fix for opds feed of unread/read books
6 years ago
544405f5aa
Update search for cyrillic letters #877
6 years ago
67736fe187
Catch errors on loading pickle file
...
Fix for cover images without Pillow
6 years ago
91ebe33879
Merge remote-tracking branch 'image_formats/dev'
6 years ago
4ae9d4a749
Merge branch 'master' into Develop
...
# Conflicts:
# cps/web.py
# cps/worker.py
6 years ago
55bdd13fb1
Fix #877
6 years ago
2a5f2ff7b3
Merge branch 'master' into Develop
...
# Conflicts:
# cps/templates/readpdf.html
# cps/translations/uk/LC_MESSAGES/messages.po
# cps/web.py
6 years ago
f7e640fd98
support pycountry if iso-639 is not available
6 years ago
4b301a7961
Additional fix for #845 (in case of error)
6 years ago
772f978b45
Improved code quality
6 years ago
0f1db18eae
Simplified typeahead
6 years ago
6940bb9b88
Code improvement
6 years ago
07649d04a3
Fix updater
...
Update translations
Code cleaning updater
6 years ago
8923e71220
Remove debug logging
6 years ago
843a93fe28
Updater fix for slow servers
6 years ago
8ab9365688
Prevent error 500 for cover of not exisiting book
6 years ago
169ace777a
Fixed infinite scroll for read and unread displays ( #855 )
6 years ago
ec2103a3d0
fixed a bug that affects allowing password change for users ( #854 )
6 years ago
8e8486497f
Restirct a user to a set of tags
6 years ago
e5593d9a7f
Integrated author in sorting functions
6 years ago
a360b1759a
Code cosmetics
...
bugfix import HttpError from pydrive
6 years ago
baf83b2f5a
Refactored generating download links
6 years ago
9c1b3f136f
Improved sorting for rated,random, hot books, read/unread book
6 years ago
a66873a9e2
Added file formats view
6 years ago
a0a15b4598
Fix max authors shown
6 years ago
4a33278596
Update ratings
6 years ago
6d2270d931
Fixes for Oauth
6 years ago
da3fcb9a72
Merge branch 'master' into Develop
...
# Conflicts:
# cps/book_formats.py
# cps/static/css/style.css
# cps/static/js/uploadprogress.js
# cps/templates/author.html
# cps/templates/detail.html
# cps/templates/discover.html
# cps/templates/index.html
# cps/templates/layout.html
# cps/templates/osd.xml
# cps/templates/search.html
# cps/templates/shelf.html
# cps/translations/de/LC_MESSAGES/messages.mo
# cps/translations/de/LC_MESSAGES/messages.po
# cps/web.py
# messages.pot
6 years ago
8612dce97c
Merge remote-tracking branch 'author/shorten-authors'
6 years ago
5b0a0e2139
Fix #835
6 years ago
9144a7ceb9
Fix for sqlalchemy 1.3
6 years ago
feb6a71f95
Fix uncompressed cbz files
...
merge from master -> file extension limitation
6 years ago
f483ca3214
Code cosmetics
...
Bugfix uploadprogress
Bugfix mature content
Reenable read and unread feature
6 years ago
0be17ed157
Refactored sidebar (some parts are missing)
6 years ago
6269a83c3d
Fix mismerge user logon with python3 in opds feed
6 years ago
Ozzieisaacs