Commit Graph

883 Commits (91e6d94c83912c4a7830568ddb6693161ec8355a)

Author SHA1 Message Date
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
4 years ago
Michael Shavit 8e1641dac9 Add support for syncing Kobo reading state. 4 years ago
Michael Shavit 57d37ffba8 Add schema support for more reading states to the ReadBook table. 4 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
4 years ago
Ozzieisaacs 372c284ad4 Merge branch 'master' into Develop 4 years ago
Michael Shavit 7d99e21d0d Merge remote-tracking branch 'original/Develop' into kobo_book_delete 4 years ago
Ozzieisaacs ba6b5f8fd1 Merge branch 'master' into Develop 4 years ago
Josh O'Brien 8f518993a4
Merge branch 'master' into master 4 years ago
Ozzieisaacs ed0bdbf31d Fix for #1199 (missing referrer) 4 years ago
Ozzieisaacs b152d3e06d Merge remote-tracking branch 'auth_token/fix/reverse-proxy-authentication-with-bearer-token' 4 years ago
André Frimberger 33cdf20cd5
Remove trailing whitespaces 4 years ago
Ozzieisaacs 8b1444ebc2 Improved testability
Less content exposed with restricted content
Tornado restart and stop working with systemd
4 years ago
Ozzieisaacs 2ea45b1fdc Removed shebang on non executable scripts 4 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.
4 years ago
Ozzieisaacs 50ba2e329a Merge branch 'master' into Develop
# Conflicts:
#	cps/shelf.py
4 years ago
Ozzie Isaacs e04aa80fd6 Fix #1181 and Fix #1182 handle removed "is_xhr" on werkzeug version 1.0.0 4 years ago
Josh O'Brien 9b49125776 English Language Updates
Changes to provide consistency for English language.
4 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
4 years ago
Ozzieisaacs e44494aad0 Kobo sync enable/disable working 4 years ago
Michael Shavit 4547c328bc Delete/Restore book from Kobo device upon (un)archiving of a book in the web UI. 4 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.
4 years ago
Ozzieisaacs cd9bb56db5 Cleanup Kobo integration 4 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
4 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
4 years ago
Ozzieisaacs 2798dd5916 Merge remote-tracking branch 'fix/kobo' into Develop
# Conflicts:
#	cps/db.py
#	cps/web.py
4 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
4 years ago
Ozzieisaacs cabad83418 moved language selection back, default value for restriction columns
Merge branch 'master' into Develop

# Conflicts:
#	cps/editbooks.py
4 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)
4 years ago
Ozzieisaacs c78c63e1d5 Merge remote-tracking branch 'fix_reconnect'
# Conflicts:
#	cps/web.py
4 years ago
Ozzieisaacs 48495f0d66 Merge branch 'master' into Develop
# Conflicts:
#	cps/helper.py
#	cps/templates/user_edit.html
#	cps/web.py
4 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
4 years ago
Ozzieisaacs 1da4efec86 Merge branch 'master' into Develop 4 years ago
Ozzieisaacs 1c630eb604 fixes from tests 4 years ago
Ozzieisaacs 1c18a788f4 Merge remote-tracking branch 'tags_restrict/master' into Develop 4 years ago
Ozzieisaacs 01381488f4 Fixes from tests 4 years ago
ground7 6555d5869f attempt regular login if ldap login fails as fallback 4 years ago
ground7 54c4f40188 added LDAP import
update defaults
4 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
Ozzieisaacs 6cda5fee0d Fix language selection on python3 5 years ago
Ozzieisaacs 051bc53aa2 Fix for #1009 5 years ago
Ozzieisaacs 23b3bfd967 Additional fix #1016 5 years ago
Ozzieisaacs f543d7f486 Fix #1016 5 years ago
Vincent Kriek 38a255e069 Add automatic epub to kepub conversion using kepubify 5 years ago
Ozzieisaacs 5f25b81004 Final fix for #983 5 years ago
Ozzieisaacs 73bbffccaa Fix for login issue on MacOS 5 years ago
Ozzieisaacs 00f17bb697 Mature contents no longer displayed in/allowed to (#975):
- typeahead tags
- advanced search tags buttons
- read
- download
5 years ago
Ozzieisaacs 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
Ozzieisaacs 97a0dccdec Fix for display of format, series, category, ratings,
Fix for display of language (sorting not working yet)
5 years ago
Ozzieisaacs b9c3a3fcea Fix #652 5 years ago
Ozzieisaacs 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
5 years ago
Daniel Pavel 63634961d4 cleaner worker api
the worker thread now stops on its own
5 years ago
Ozzieisaacs d82289e303 Deactivate ldap
Fix setup for pypi
5 years ago
Ozzieisaacs 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
5 years ago
Ozzieisaacs e734bb120a Merge remote-tracking branch 'github/config_sql' into Develop 5 years ago
Daniel Pavel 006e596c72 Moved config class into separate file.
Moved Goodreads and LDAP services into separate package.
5 years ago
Ozzieisaacs 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)
5 years ago
Ozzieisaacs 572b5427c7 Fix Encoding issues for python2 5 years ago
Ozzieisaacs f40fc5aa75 Update LDAP 5 years ago
Ozzieisaacs 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
5 years ago
Ozzieisaacs 26949970d8 Revert logging functions
Fix access logger for tornado
5 years ago
Ozzieisaacs f5e3ed26b9 Fix for #935 5 years ago
Ozzieisaacs 546ed65e1d Update logging
Fix sort order author
Fixes sorting view
Moved version info
added feature limit listening to single ipaddress
5 years ago
Ozzieisaacs 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
5 years ago
Krakinou 9a5ab97d78
Merge branch 'master' into master 5 years ago
Krakinou 79286c9384 encode password 5 years ago
yjouanique c4e3f3670f Added public /reconnect endpoint 5 years ago
Daniel Pavel b89ab9ff10 logging clean-up
- moved most constants to separate file
- sorted and cleaned-up imports
- moved logging setup to separate file
5 years ago
Krakinou 97d12b94f6 Correct settings update 5 years ago
Krakinou e4d801bbaf initial flask_simpleldap implementation 5 years ago
Ozzieisaacs bb0d5c5538 Working for pip and "normal" start for python3 and python2 5 years ago
Ozzieisaacs 87ca05f129 Merge remote-tracking branch 'setup/feature/setuptools-integration' 5 years ago
Ozzieisaacs 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
5 years ago
Ozzieisaacs f70c839014 Added additional permission viewer 5 years ago
Ozzieisaacs 0c80f5c63a Update Teststatus 5 years ago
Ozzieisaacs 1030e195a5 Fix #916 5 years ago
Ozzieisaacs 3b03aa30a6 Fix for advanced search 5 years ago
Ozzieisaacs cb0403a924 Merge remote-tracking branch 'adv_search/master' 5 years ago
Marvin Marx 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.
5 years ago
Ozzieisaacs 55bb8d4590 Fix #900 5 years ago
Ozzieisaacs b80bfa5260 Improvement for #897 5 years ago
Ozzieisaacs f941908f73 Workaround for #889 5 years ago
Ozzieisaacs 9b3b2acb49 Sort button is correctly visible on list pages
Publisher list is working
5 years ago
Ozzieisaacs 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
5 years ago
Ozzieisaacs 2de4bfdcf2 Merge branch 'master' into Develop
# Conflicts:
#	cps/book_formats.py
#	cps/helper.py
#	cps/web.py
5 years ago
Ozzieisaacs c748716ad2 Fix for opds feed of unread/read books 5 years ago
Ozzieisaacs 544405f5aa Update search for cyrillic letters #877 5 years ago
Ozzieisaacs 67736fe187 Catch errors on loading pickle file
Fix for cover images without Pillow
5 years ago
Ozzieisaacs 91ebe33879 Merge remote-tracking branch 'image_formats/dev' 5 years ago
Ozzieisaacs 4ae9d4a749 Merge branch 'master' into Develop
# Conflicts:
#	cps/web.py
#	cps/worker.py
5 years ago
Ozzieisaacs 55bdd13fb1 Fix #877 5 years ago
Ozzieisaacs 2a5f2ff7b3 Merge branch 'master' into Develop
# Conflicts:
#	cps/templates/readpdf.html
#	cps/translations/uk/LC_MESSAGES/messages.po
#	cps/web.py
5 years ago
Daniel Pavel f7e640fd98 support pycountry if iso-639 is not available 5 years ago
Ozzieisaacs 4b301a7961 Additional fix for #845 (in case of error) 5 years ago
Ozzieisaacs 772f978b45 Improved code quality 5 years ago
Ozzieisaacs 0f1db18eae Simplified typeahead 5 years ago
Ozzieisaacs 6940bb9b88 Code improvement 5 years ago
Ozzieisaacs 07649d04a3 Fix updater
Update translations
Code cleaning updater
5 years ago
Ozzieisaacs 8923e71220 Remove debug logging 5 years ago
Ozzieisaacs 843a93fe28 Updater fix for slow servers 5 years ago
OzzieIsaacs 8ab9365688 Prevent error 500 for cover of not exisiting book 5 years ago
Chad Bergeron 169ace777a Fixed infinite scroll for read and unread displays (#855) 5 years ago
Elifcan Cakmak ec2103a3d0 fixed a bug that affects allowing password change for users (#854) 5 years ago
tomjmul 8e8486497f Restirct a user to a set of tags 5 years ago
Ozzieisaacs e5593d9a7f Integrated author in sorting functions 5 years ago
Ozzieisaacs a360b1759a Code cosmetics
bugfix import HttpError from pydrive
5 years ago
Ozzieisaacs baf83b2f5a Refactored generating download links 5 years ago
Ozzieisaacs 9c1b3f136f Improved sorting for rated,random, hot books, read/unread book 5 years ago
Ozzieisaacs a66873a9e2 Added file formats view 5 years ago
Ozzieisaacs a0a15b4598 Fix max authors shown 5 years ago
Ozzieisaacs 4a33278596 Update ratings 5 years ago
Ozzieisaacs 6d2270d931 Fixes for Oauth 5 years ago
Ozzieisaacs 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
5 years ago
Ozzieisaacs 8612dce97c Merge remote-tracking branch 'author/shorten-authors' 5 years ago
Ozzieisaacs 5b0a0e2139 Fix #835 5 years ago
Ozzieisaacs 9144a7ceb9 Fix for sqlalchemy 1.3 5 years ago
Ozzieisaacs feb6a71f95 Fix uncompressed cbz files
merge from master -> file extension limitation
5 years ago
Ozzieisaacs f483ca3214 Code cosmetics
Bugfix uploadprogress
Bugfix mature content
Reenable read and unread feature
5 years ago
Ozzieisaacs 0be17ed157 Refactored sidebar (some parts are missing) 5 years ago
Ozzieisaacs 6269a83c3d Fix mismerge user logon with python3 in opds feed 5 years ago
Ozzieisaacs f0de822ce7 Start refactor sidebar and view settings sidebar 5 years ago
Ozzieisaacs fb23db57b4 Added filtering of authors, series, categories, publishers 5 years ago
Ozzieisaacs 11b770b3fb Fix for #830
Fix user with umlauts
5 years ago
Ozzieisaacs fda977b155 Fix for users with umlauts 5 years ago
Ozzieisaacs 68a36597ab Fix opds login on python3 5 years ago
Ozzieisaacs 361a1243d7 Improvements #828 5 years ago
Virgil Grigoras e5bc1ae020 Add new database field for storing max_authors 5 years ago
Ozzieisaacs eef4787b79 Merge remote-tracking branch 'github/patch-1' into Develop
Oauth is optional again
5 years ago
Ozzieisaacs f6fbe2e135 Fix #766
Update pdf upload
Translation of uploadprogress dialog
5 years ago
Ozzieisaacs cc3088c52f Merge branch 'master' into Develop
# Conflicts:
#	cps/book_formats.py
#	cps/static/js/libs/bootstrap.min.js
#	cps/templates/detail.html
#	cps/templates/layout.html
#	cps/web.py

Improvement updater (up to 100 releases are loaded at once)
Fix oauth pathes
Fix oauth without registering
5 years ago
Ozzieisaacs 1a7052b287 Update pdf upload
Translation of uploadprogress dialog
5 years ago
AngelByDay 38307ececb
Force namespace resolution of imports
The current import for some local modules causes errors when those already exist in site-packages on the target system.
Namely "import db" is ambiguous and may cause errors due to loading of the 'db' PyPI package instead of the module.
5 years ago
Ozzieisaacs ae7c4908f9 Fix #767 5 years ago
Ozzieisaacs 2505f0c1e4 Merge remote-tracking branch 'filename/patch-1'
Fixes for Google Drive
5 years ago
Ozzieisaacs 3d5d95904a Oauth working somehow (?) 5 years ago
Ozzieisaacs a0be02e687 Ldap working 5 years ago
Ozzieisaacs 56826f67fc progressbar during upload thanks to jim3ma 5 years ago
Ozzieisaacs 4230226716 Link fixes
Fixes reader button visible in detail view
Fix formats to convert (added htmlz)
Fix logger in updater
Added request "v3" of github api on update
Fix quotes parameter on external calls
E-Mail logger working more stable (also on python3)
Routing fixes
Change import in ub
5 years ago
Ozzieisaacs c1ef1bcd19 User and admin pages are working again 5 years ago
Ozzieisaacs 1fc4bc5204 Fix routes
Fix error page
5 years ago
Ozzieisaacs f5235b1d4c Uploader progress bar
Fixes imports and routes
Merge branch 'master' into Develop
Finished routing
5 years ago
Ozzieisaacs d6ee8f75e9 More refactoring 5 years ago
Ozzieisaacs a00d93a2d9 Working again (basically) 5 years ago
Ozzieisaacs 561d40f8ff Merge branch 'master' into Develop 5 years ago
Ozzieisaacs 6fc4b318e8 cover folders beautified 5 years ago
Ozzieisaacs 36229076f7 Refactor subprocess calls 5 years ago
Ozzieisaacs 7f34073955 Merge branch 'master' into Develop
# Conflicts:
#	cps/web.py
#	readme.md
5 years ago
Ozzieisaacs ea98323c06 Fixes Google Drive
Improved user guidance for Google Drive
Improved Errorhandling for Google Drive
Update french translation
Added ukranian translation
Improvements on updater: calibre-web.log1, calibre-web.log2, gdrive_credentials, settings.yaml, gdrive.db, .git are no longer deleted upon update
5 years ago
Ozzieisaacs 80582573f5 Merge remote-tracking branch 'oauth/oauth' into Develop
# Conflicts:
#	cps/templates/config_edit.html
#	cps/ub.py
#	cps/web.py
5 years ago
Ozzieisaacs 3683e4e7eb Merge remote-tracking branch 'ldap/master' into Develop 5 years ago
Ozzieisaacs 8ababf9f77 Merge remote-tracking branch 'simple_shelf/shelf-down' into Develop 5 years ago
Ozzieisaacs 5971194678 Merge remote-tracking branch 'audiobook/Branch_c27805b'
# Conflicts:
#	cps/templates/detail.html
#	cps/web.py
#	readme.md
5 years ago
Ozzieisaacs e8ce88095e Fix viewing Publisher settings for other users
Fix Visiblilty of read/unread category
5 years ago
Ozzieisaacs ec81a3cd92 Fix Authors page pagination
Update infinite scroll plugin
5 years ago
Ozzieisaacs 97064db2a4 Restart python3 fix, stop and restart python2 working again 5 years ago
Ozzieisaacs 341dd77b9d Bugfix Restart and Stop server on python3 5 years ago
Ozzieisaacs 836c6fd245 Updated translations
Added license texts in flies
5 years ago
Ozzieisaacs bacb6fb561 New updater with default setting -> only stable releases #653 5 years ago
Ozzieisaacs 62574939b2 Fix #770 5 years ago
Ozzieisaacs 32568c9009 Update testing
Update custom columns unicode enums
5 years ago
Krakinou d48cdcc789 Correct authentication in case LDAP not activated 5 years ago
Krakinou d763168dec Merge branch 'master' of https://github.com/Krakinou/calibre-web 5 years ago
Krakinou 7ccc40cf5b Moving import LDAP
Correct optional-requirements-ldap.txt spelling
5 years ago
Krakinou aafb267787
Merge branch 'master' into master 5 years ago
Krakinou 2e37c14d94 Clean some comment 5 years ago
Krakinou 91f0908059 insert into db
connect via LDAP config
5 years ago
Ozzieisaacs f053508013 Fix #764 5 years ago
Ozzieisaacs 36030b559c Choosing Theme is now a global setting 5 years ago
Krakinou 30954cc27f Initial LDAP support 5 years ago
Ozzieisaacs 3b40c83314 Code cleaning
code cosmetics
deleted unused file caliBlur
fixed custom error page
5 years ago
Ozzieisaacs fa4918a2db File renaming according to title and author (#654) - gdrive is missing 5 years ago
Ozzieisaacs 98134616b6 Fix #661 (authors are shown according to the authors sort order) 5 years ago
Ozzieisaacs 4dcac07582 Partly fixed #661: Right order of Authors is still not shown 5 years ago
Ozzieisaacs 7086c8d1bf Merge remote-tracking branch 'language_edit/master' 5 years ago
Ozzieisaacs 013f7bf53e Merge remote-tracking branch 'lang/patch-1' 5 years ago
Adrian Petrescu 5341910ea5
Deal gracefully with invalid Accept-Languages header
At the moment, calibre-web will raise an internal 500 error if an
invalid locale identifier is passed in through the `Accept-Language`
HTTP header (for a non-logged-in user).

This breaks some crappily-built OPDS feed readers, and there's no reason
to error out so severely. This commit just gracefully falls back to `en`
if it can't parse the locale identifier.

Fixes #743 among others.
5 years ago
Ozzieisaacs 9cfe1dce20 Fix #739 5 years ago
Ozzieisaacs d0fd1a4601 Merged new caliblur theme
Fix for new users created
Fix for options to the calibre-converter
Only the first 300 chars are logged for the emailbody (spamming of logfile is prevented)
Added class to "Random" header
6 years ago
grunjol 462cf20a34 Process all custom columns on editing 6 years ago
grunjol 00ba231fbf fix adding an existing language to a book 6 years ago
Ozzieisaacs 81e3afbcc4 Fix #714 (advanced search for ratings) 6 years ago
Ozzieisaacs 7526b0dcb4 Fix #623, #715 6 years ago
Ozzieisaacs 863b77a5d7 Fix #711
Fixing for send to kindle after uploading
codecleaning
6 years ago
Ozzieisaacs b78130e3b1 Merge remote-tracking branch '681/681-fix' 6 years ago
haseo e1b6fa25e9 A better solution to #681 6 years ago
Ozzieisaacs dfa17956c9 Merge remote-tracking branch 'bbb/295---Send-AZW-to-Kindle'
Changed function for 295, azw3 is preferred format for sending to kindle
6 years ago
Ozzieisaacs 2422f782de Fix #701 6 years ago
Ozzieisaacs 07d7be176c Merge remote-tracking branch 'lang/master' 6 years ago
dalin 947622800c Update Simplified Chinese translation. Fix #681 in the case of Simplified Chinese. 6 years ago
Ozzieisaacs 399dffba5a log file name in case of filename not found (#691) 6 years ago
Ozzieisaacs 89bddead35 Merge remote-tracking branch 'http_error/beautify-http-errors' 6 years ago
Ozzieisaacs c3bec48bc7 Fix #617
Additional texts translated
6 years ago
Ozzieisaacs c582a70498 Merge remote-tracking branch 'bbb/617' 6 years ago
Ozzieisaacs 0df35dcfea Update Updater 6 years ago
Ozzieisaacs cc7dcfb35a Update Updater
Bugfix author in opds-feed
6 years ago
Ozzieisaacs ee85492c7d Fix #662 6 years ago
Ozzieisaacs 3f83be00fd Fix #687 6 years ago
Ozzieisaacs 6ec9bc9e5c Bugfix Publisher (upper/lower case, remove publisher, publisher visibility on new users)
404 messages on non existing categorys, languages, series
Updated Testresult
6 years ago
Jim Ma 4b76b8400d Add OAuth link&unlink in user profile 6 years ago
Jim Ma 1abbcfa3c6 Add OAuth support: GitHub & Google 6 years ago
otapi c6d3613e57
Add UI link button to shelves 6 years ago
otapi e0229c917c
Download only shelf
Show only titles and download button for specific shelf. Currently only direct link works, e.g: calibre-web/shelfdown/6
6 years ago
bodybybuddha ee686b5379 Fix for #617
Task table: Status column and task messages have been localized
	Cleaned up the use of the task fields 'typ' and 'type' to be taskType and taskMessage
6 years ago
Ozzie Isaacs 7253f583cf Fix #650
Improved testablility
Added feedback for book_edit -> stay on edit page
6 years ago
bodybybuddha 54f8680058 Merge branch 'master' of https://github.com/janeczku/calibre-web into 617 6 years ago
OzzieIsaacs 40cc25de7a Merge remote-tracking branch 'bbb/621'
Fixes after testing
6 years ago
bodybybuddha 5d34fd7fec Send to Kindle button precheck added
Based on existing book formats and which converter (if any) determine if button can be seen.
6 years ago
Virgil Grigoras a798dc94a9 Satisfy "Codacy/PR Quality Review" 6 years ago
Virgil Grigoras 60e9d01d27 Beautify http errors 6 years ago
Virgil Grigoras 1ac9b3d837 Update OPDS-part to display publishers 6 years ago
Virgil Grigoras 5129bc3601 Add entry for publishers to the left menu (+ setting for showing / hiding) + separate publisher page 6 years ago
bodybybuddha 1b363ac720 Merged master into 617 - fixed import copy conflict 6 years ago
Virgil Grigoras 016c7b4b1c Add ability to store and edit publishers 6 years ago
OzzieIsaacs 5a2ed58d06 Improved message for non configured ebook converter
Gdrive cleared interface (drive variable)
refactored web -> reverseproxy outsourced, edit_books split, removed unused md5 function
rearanged imports
added Wand and pytz Version info to stats Page
6 years ago
OzzieIsaacs ffe3dd3de3 Show version of Werkzeug and Jinja2 in stats page 6 years ago
bodybybuddha a7386ecb8b Merge branch 'master' of https://github.com/janeczku/calibre-web into 621 6 years ago
bodybybuddha 9b1954f2f0 Merge branch 'master' of https://github.com/janeczku/calibre-web into 617 6 years ago
Ozzie Isaacs cd0fc917d7 Bugfix template rights at creating user
Added errormessages for shelf actions
Additional ids for better testability
6 years ago
bodybybuddha 29efcf8358 Merge branch 'master' of https://github.com/janeczku/calibre-web into 617 6 years ago
bodybybuddha d2e74a27cd Merge branch 'master' of https://github.com/janeczku/calibre-web into 621 6 years ago
OzzieIsaacs ba7c734657 Fixes from testing:
Certificate files are rejected if not both files are provided
Server shuts down controlled after pressing crtl+c
Logfile location is better checked
improvements for better testing (added ids and name in templates)
6 years ago
OzzieIsaacs aa5127cd16 Merge remote-tracking branch 'lxml/master' 6 years ago
OzzieIsaacs b841baf714 Comment for adding publishers 6 years ago
Fatih Ka 76e3be58e6
Delete book fixed
There was an incorrect parameter.
6 years ago
bodybybuddha b4122e9858 Partial fix to #617. Local status messages now work. 6 years ago
trasba 3fa41d0e4a
added formats for upload and conversion
added formats for upload and conversion (html, rtf, odt)
6 years ago