753 Commits

Author	SHA1	Message	Date
Ozzieisaacs	9f0c0b34af	Merge remote-tracking branch 'order_category/master'	2020-04-26 18:50:28 +02:00
Ozzieisaacs	87ec44aed5	Merge remote-tracking branch 'improve_reaad/keep-focus-on-search-input'	2020-04-26 18:38:09 +02:00
Ozzieisaacs	456550a943	Bugfix view shelfs on detiled page ... bugfix datetime in archive mode	2020-04-26 11:34:10 +02:00
Ozzieisaacs	7b789b3701	Fix opds with shelves ... Fix errorhandler ldap without ldap	2020-04-26 08:40:53 +02:00
Ozzieisaacs	0480d493cf	Fix opds login with ldap, if ldap server is down	2020-04-25 21:12:07 +02:00
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	2020-04-25 20:06:25 +02:00
Ozzieisaacs	7393b69757	Fix for #1326 (typo)	2020-04-24 19:25:11 +02:00
Ozzieisaacs	8bd1903d98	Fix for #1326 (opds feed user login not working -> download was not possible)	2020-04-24 18:37:29 +02:00
Ozzieisaacs	95ca1e6a9d	Fix for #1319	2020-04-20 18:56:39 +02:00
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	2020-04-19 13:03:46 +02:00
celogeek	ca2bcc647d	Handle read config ... Allow advance search Remove duplicate status on show	2020-04-19 12:50:58 +02:00
pthiben	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
pthiben	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
Ozzieisaacs	06fde4fcd0	Fix #1311 (Enable LDAP Anonymous Login)	2020-04-18 11:48:34 +02:00
Ozzieisaacs	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
aribes	f926e58891	Changing ordering logic when showing books from a category	2020-04-16 11:37:04 +10:00
Ozzieisaacs	a784c6bd52	Fixes for oauth login after programming basic tests	2020-04-15 22:03:21 +02:00
Ozzieisaacs	ce4f1258b5	Fix #1293 (error 500 on search without query)	2020-04-14 19:27:18 +02:00
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	2020-04-14 10:58:32 +02:00
Ozzieisaacs	a194216568	Merge remote-tracking branch 'origin/master'	2020-04-05 19:10:27 +02:00
Ozzieisaacs	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
Ozzieisaacs	5864637f1c	Merge branch 'master' into Develop	2020-04-04 06:22:17 +02:00
Ozzieisaacs	e99f5bcced	Merge remote-tracking branch 'english/master'	2020-04-03 19:46:26 +02:00
Ozzieisaacs	bab14a1fbf	Update shelfs handling, bugfix changed updater	2020-04-02 18:23:24 +02:00
Ozzieisaacs	0c27ff11b9	Update Updater	2020-04-01 18:45:16 +02:00
Josh O'Brien	c870f6e87d	English Language V2	2020-03-19 13:10:10 +11:00
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	2020-03-12 20:43:39 +01:00
Ozzieisaacs	d597e05fa9	Merge remote-tracking branch 'reading_state' into Develop ... # Conflicts: # cps/kobo.py	2020-03-12 20:35:24 +01:00
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	2020-03-07 11:07:43 +01:00
Michael Shavit	8e1641dac9	Add support for syncing Kobo reading state.	2020-03-01 22:01:05 -05:00
Michael Shavit	57d37ffba8	Add schema support for more reading states to the ReadBook table.	2020-03-01 20:26:42 -05:00
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	2020-02-23 13:27:44 +01:00
Ozzieisaacs	372c284ad4	Merge branch 'master' into Develop	2020-02-22 16:24:06 +01:00
Michael Shavit	7d99e21d0d	Merge remote-tracking branch 'original/Develop' into kobo_book_delete	2020-02-17 14:49:42 -05:00
Ozzieisaacs	ba6b5f8fd1	Merge branch 'master' into Develop	2020-02-17 18:42:53 +01:00
Josh O'Brien	8f518993a4	Merge branch 'master' into master	2020-02-18 00:21:59 +11:00
Ozzieisaacs	ed0bdbf31d	Fix for #1199 (missing referrer)	2020-02-16 19:39:32 +01:00
Ozzieisaacs	b152d3e06d	Merge remote-tracking branch 'auth_token/fix/reverse-proxy-authentication-with-bearer-token'	2020-02-16 19:24:28 +01:00
André Frimberger	33cdf20cd5	Remove trailing whitespaces	2020-02-16 10:25:01 +01:00
Ozzieisaacs	8b1444ebc2	Improved testability ... Less content exposed with restricted content Tornado restart and stop working with systemd	2020-02-15 09:08:39 +01:00
Ozzieisaacs	2ea45b1fdc	Removed shebang on non executable scripts	2020-02-10 18:37:47 +01:00
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.	2020-02-09 17:21:22 +01:00
Ozzieisaacs	50ba2e329a	Merge branch 'master' into Develop ... # Conflicts: # cps/shelf.py	2020-02-09 07:00:04 +01:00
Ozzie Isaacs	e04aa80fd6	Fix #1181 and Fix #1182 handle removed "is_xhr" on werkzeug version 1.0.0	2020-02-08 14:40:13 +01:00
Josh O'Brien	9b49125776	English Language Updates ... Changes to provide consistency for English language.	2020-02-03 14:22:00 +11:00
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	2020-02-02 07:47:27 +01:00
Ozzieisaacs	e44494aad0	Kobo sync enable/disable working	2020-01-27 20:32:37 +01:00
Michael Shavit	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
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.	2020-01-26 00:27:54 -05:00
Ozzieisaacs	cd9bb56db5	Cleanup Kobo integration	2020-01-20 06:14:53 +01:00
Ozzieisaacs	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
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	2020-01-12 13:42:39 +01:00
Ozzieisaacs	2798dd5916	Merge remote-tracking branch 'fix/kobo' into Develop ... # Conflicts: # cps/db.py # cps/web.py	2020-01-11 18:35:04 +01:00
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	2020-01-11 13:28:09 +01:00
Ozzieisaacs	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
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)	2020-01-05 13:38:51 +01:00
Ozzieisaacs	c78c63e1d5	Merge remote-tracking branch 'fix_reconnect' ... # Conflicts: # cps/web.py	2020-01-05 08:47:03 +01:00
Ozzieisaacs	48495f0d66	Merge branch 'master' into Develop ... # Conflicts: # cps/helper.py # cps/templates/user_edit.html # cps/web.py	2020-01-04 07:57:54 +01:00
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	2020-01-01 17:29:01 +01:00
Ozzieisaacs	1da4efec86	Merge branch 'master' into Develop	2019-12-31 10:52:45 +01:00
Ozzieisaacs	1c630eb604	fixes from tests	2019-12-30 15:16:09 +01:00
Ozzieisaacs	1c18a788f4	Merge remote-tracking branch 'tags_restrict/master' into Develop	2019-12-30 15:15:07 +01:00
Ozzieisaacs	01381488f4	Fixes from tests	2019-12-28 16:18:21 +01:00
ground7	6555d5869f	attempt regular login if ldap login fails as fallback	2019-12-27 23:45:42 -07:00
ground7	54c4f40188	added LDAP import ... update defaults	2019-12-27 23:12:18 -07:00
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	2019-12-24 13:02:53 +01:00
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.	2019-12-22 16:59:00 -05:00
Michael Shavit	cdcb8a50d1	Fix /reconnect endpoint, which was broken by 006e596c72	2019-12-22 16:58:55 -05:00
Michael Shavit	520c695401	Fix /reconnect endpoint, which was broken by 006e596c72	2019-12-22 16:54:16 -05:00
Ozzieisaacs	f2c07d8f81	Update Kobo sync	2019-12-20 19:17:08 +01:00
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.	2019-12-20 00:55:53 -05:00
Ozzieisaacs	f705889c23	Inital Kobo	2019-12-17 20:28:20 +01:00
Ozzieisaacs	eabc6e23be	Test Email now send to user's email address (#834) ... Added forgot/reset password routine (#1098, #1063)	2019-12-15 17:08:17 +01:00
Ozzieisaacs	2215bf3d7f	Implemented #1083 (Advanced search for extensions)	2019-12-15 11:35:07 +01:00
Andrew Roberts	3dc372c573	fixed typo	2019-12-12 21:38:45 -05:00
Andrew Roberts	af7dbbf1e4	added logic for reverse proxy login	2019-12-12 21:27:40 -05:00
Michael Shavit	0b709f7dfb	Merge branch 'master' into kobo	2019-12-07 20:04:54 -05:00
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).	2019-12-07 19:54:44 -05:00
Ozzieisaacs	54079b36ae	Fix #1095 (epub viewer not working if only viewer rule wa sapplied)	2019-12-01 12:21:21 +01:00
Ozzieisaacs	a4416c202d	Merge remote-tracking branch 'rename/develop'	2019-11-16 08:01:18 +01:00
Ghighi Eftimie	f782dc1857	fix for search title	2019-11-14 12:08:19 +02:00
Ozzieisaacs	c8c2d6659c	Merge remote-tracking branch 'public_reconnect/master'	2019-10-20 15:03:02 +02:00
zelazna	3764c33a3a	Add the posibility to change the username	2019-10-01 15:36:00 +02:00
Ozzieisaacs	6cda5fee0d	Fix language selection on python3	2019-09-06 20:56:17 +02:00
Ozzieisaacs	051bc53aa2	Fix for #1009	2019-09-02 19:27:34 +02:00
Ozzieisaacs	23b3bfd967	Additional fix #1016	2019-08-20 19:12:40 +02:00
Ozzieisaacs	f543d7f486	Fix #1016	2019-08-20 18:32:04 +02:00
Vincent Kriek	38a255e069	Add automatic epub to kepub conversion using kepubify	2019-08-18 21:44:19 +02:00
Ozzieisaacs	5f25b81004	Final fix for #983	2019-07-29 21:43:00 +02:00
Ozzieisaacs	73bbffccaa	Fix for login issue on MacOS	2019-07-28 21:29:54 +02:00
Ozzieisaacs	00f17bb697	Mature contents no longer displayed in/allowed to (#975): ... - typeahead tags - advanced search tags buttons - read - download	2019-07-25 21:42:46 +02:00
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)	2019-07-24 18:43:23 +02:00
Ozzieisaacs	97a0dccdec	Fix for display of format, series, category, ratings, ... Fix for display of language (sorting not working yet)	2019-07-22 21:38:52 +02:00
Ozzieisaacs	b9c3a3fcea	Fix #652	2019-07-21 18:19:07 +02:00
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	2019-07-17 19:07:05 +02:00
Daniel Pavel	63634961d4	cleaner worker api ... the worker thread now stops on its own	2019-07-14 20:28:32 +03:00
Ozzieisaacs	d82289e303	Deactivate ldap ... Fix setup for pypi	2019-07-14 18:37:44 +02:00
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	2019-07-13 20:54:21 +02:00
Ozzieisaacs	e734bb120a	Merge remote-tracking branch 'github/config_sql' into Develop	2019-07-09 19:29:58 +02:00
Daniel Pavel	006e596c72	Moved config class into separate file. ... Moved Goodreads and LDAP services into separate package.	2019-07-07 16:05:51 +03:00