924 commits

Author	SHA1	Message	Date
Ozzieisaacs	81fc1eccd3	Fix for #1407 (to many read books lead to to large sql query) -> only fix for linked calibre-column	2020-05-19 21:35:56 +02:00
Ozzieisaacs	38c28f4358	Merge branch 'master' into Develop ... # Conflicts: # cps/admin.py # cps/constants.py # cps/static/css/caliBlur.min.css # cps/uploader.py	2020-05-17 16:22:58 +02:00
Ozzieisaacs	2468cf63cc	Fix for #1397 (changed supported audio files) ... Changed max gevent version Fix for #1397 (changed supported audio files)	2020-05-17 10:07:36 +02:00
Ozzieisaacs	e787f9dd9f	Automatic username (#1172)	2020-05-12 17:23:58 +02:00
Ozzieisaacs	47641eee59	Merge branch 'master' into Develop	2020-05-12 16:16:04 +02:00
Ozzieisaacs	42abe28cc1	Fix for #1389 (import ldap users with whitespaces)	2020-05-12 16:13:56 +02:00
Ozzieisaacs	16a3deec2c	Merge branch 'master' into Develop ... # Conflicts: # cps/helper.py	2020-05-10 19:24:55 +02:00
OzzieIsaacs	a9085752c1	Fix error "email" not in to_save	2020-05-10 10:26:22 +02:00
Ozzieisaacs	75fb7c2e95	Allowing upload extensions (#1119)	2020-05-09 16:54:22 +02:00
Ozzieisaacs	0a02caad04	Improvements	2020-05-09 11:01:00 +02:00
Ozzieisaacs	ff75bdba9e	Merge branch 'master' into Develop	2020-05-08 19:05:08 +02:00
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	2020-05-08 14:53:21 +02:00
Ozzieisaacs	4e940f7fa0	Added response header for improving security	2020-05-08 14:49:12 +02:00
Knepherbird	69fde7dead	Update web.py ... Set db.Publishers query to order by name column, because publishers.sort column is empty.	2020-05-07 13:55:59 -07:00
Ozzieisaacs	48f4b12c0e	Merge branch 'master' into Develop ... # Conflicts: # cps/editbooks.py	2020-05-06 18:47:33 +02:00
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	2020-05-01 17:25:13 +02:00
Ozzieisaacs	b95f6563cc	Merge remote-tracking branch 'read-config/remove-duplicate-read-status-without-filter' into Develop	2020-05-01 17:19:13 +02:00
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	2020-04-30 18:08:28 +02:00
Ozzieisaacs	bea7223a0a	Renabled cbrimage extraction (via unrar and rarfile)	2020-04-28 16:50:08 +02:00
Ozzieisaacs	2d92818613	Code cosmetics	2020-04-27 20:01:13 +02:00
Ozzieisaacs	d9dde36c74	Merge remote-tracking branch 'improve_read/sort-book-name' search results are ordered according to sort field in book title	2020-04-26 19:00:36 +02:00
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
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)	2019-07-06 14:35:12 +02:00
Ozzieisaacs	572b5427c7	Fix Encoding issues for python2	2019-06-23 21:11:45 +02:00
Ozzieisaacs	f40fc5aa75	Update LDAP	2019-06-16 08:59:25 +02:00
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	2019-06-16 08:20:01 +02:00
Ozzieisaacs	26949970d8	Revert logging functions ... Fix access logger for tornado	2019-06-11 20:07:51 +02:00
Ozzieisaacs	f5e3ed26b9	Fix for #935	2019-06-10 19:31:13 +02:00
Ozzieisaacs	546ed65e1d	Update logging ... Fix sort order author Fixes sorting view Moved version info added feature limit listening to single ipaddress	2019-06-10 14:15:21 +02:00
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	2019-06-08 13:45:27 +02:00
Krakinou	9a5ab97d78	Merge branch 'master' into master	2019-06-08 01:41:43 +02:00
Krakinou	79286c9384	encode password	2019-06-08 00:54:45 +02:00
yjouanique	c4e3f3670f	Added public /reconnect endpoint	2019-06-07 12:15:31 +07:00
Daniel Pavel	b89ab9ff10	logging clean-up ... - moved most constants to separate file - sorted and cleaned-up imports - moved logging setup to separate file	2019-06-06 18:10:22 +03:00
Krakinou	97d12b94f6	Correct settings update	2019-06-04 00:47:49 +02:00
Krakinou	e4d801bbaf	initial flask_simpleldap implementation	2019-06-02 22:07:22 +02:00
Ozzieisaacs	bb0d5c5538	Working for pip and "normal" start for python3 and python2	2019-06-02 09:33:45 +02:00
Ozzieisaacs	87ca05f129	Merge remote-tracking branch 'setup/feature/setuptools-integration'	2019-05-31 16:24:13 +02:00
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	2019-05-31 11:17:47 +02:00
Ozzieisaacs	f70c839014	Added additional permission viewer	2019-05-19 18:39:34 +02:00
Ozzieisaacs	0c80f5c63a	Update Teststatus	2019-05-12 19:44:52 +02:00
Ozzieisaacs	1030e195a5	Fix #916	2019-05-11 13:03:38 +02:00
Ozzieisaacs	3b03aa30a6	Fix for advanced search	2019-05-06 20:51:44 +02:00
Ozzieisaacs	cb0403a924	Merge remote-tracking branch 'adv_search/master'	2019-05-06 20:48:46 +02:00
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.	2019-05-05 17:58:45 +02:00
Ozzieisaacs	55bb8d4590	Fix #900	2019-05-01 17:47:54 +02:00
Ozzieisaacs	b80bfa5260	Improvement for #897	2019-04-29 19:01:30 +02:00
Ozzieisaacs	f941908f73	Workaround for #889	2019-04-23 21:32:48 +02:00
Ozzieisaacs	9b3b2acb49	Sort button is correctly visible on list pages ... Publisher list is working	2019-04-22 19:17:23 +02:00
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	2019-04-22 19:11:35 +02:00
Ozzieisaacs	2de4bfdcf2	Merge branch 'master' into Develop ... # Conflicts: # cps/book_formats.py # cps/helper.py # cps/web.py	2019-04-20 18:32:46 +02:00
Ozzieisaacs	c748716ad2	Fix for opds feed of unread/read books	2019-04-19 12:07:46 +02:00
Ozzieisaacs	544405f5aa	Update search for cyrillic letters #877	2019-04-19 06:54:12 +02:00
Ozzieisaacs	67736fe187	Catch errors on loading pickle file ... Fix for cover images without Pillow	2019-04-18 21:17:59 +02:00
Ozzieisaacs	91ebe33879	Merge remote-tracking branch 'image_formats/dev'	2019-04-15 20:57:25 +02:00
Ozzieisaacs	4ae9d4a749	Merge branch 'master' into Develop ... # Conflicts: # cps/web.py # cps/worker.py	2019-04-14 18:18:39 +02:00
Ozzieisaacs	55bdd13fb1	Fix #877	2019-04-14 17:54:18 +02:00
Ozzieisaacs	2a5f2ff7b3	Merge branch 'master' into Develop ... # Conflicts: # cps/templates/readpdf.html # cps/translations/uk/LC_MESSAGES/messages.po # cps/web.py	2019-04-13 16:42:09 +02:00
Daniel Pavel	f7e640fd98	support pycountry if iso-639 is not available	2019-03-29 07:00:10 +02:00
Ozzieisaacs	4b301a7961	Additional fix for #845 (in case of error)	2019-03-26 18:19:39 +01:00
Ozzieisaacs	772f978b45	Improved code quality	2019-03-24 16:24:43 +01:00
Ozzieisaacs	0f1db18eae	Simplified typeahead	2019-03-24 16:14:42 +01:00
Ozzieisaacs	6940bb9b88	Code improvement	2019-03-24 15:58:43 +01:00
Ozzieisaacs	07649d04a3	Fix updater ... Update translations Code cleaning updater	2019-03-24 15:27:23 +01:00
Ozzieisaacs	8923e71220	Remove debug logging	2019-03-24 15:18:01 +01:00
Ozzieisaacs	843a93fe28	Updater fix for slow servers	2019-03-24 15:15:36 +01:00
OzzieIsaacs	8ab9365688	Prevent error 500 for cover of not exisiting book	2019-03-23 20:29:53 +01:00
Chad Bergeron	169ace777a	Fixed infinite scroll for read and unread displays (#855)	2019-03-21 19:18:44 +01:00
Elifcan Cakmak	ec2103a3d0	fixed a bug that affects allowing password change for users (#854)	2019-03-20 13:06:11 +01:00
tomjmul	8e8486497f	Restirct a user to a set of tags	2019-03-19 13:53:41 +00:00
Ozzieisaacs	e5593d9a7f	Integrated author in sorting functions	2019-03-16 21:14:01 +01:00
Ozzieisaacs	a360b1759a	Code cosmetics ... bugfix import HttpError from pydrive	2019-03-16 17:20:14 +01:00
Ozzieisaacs	baf83b2f5a	Refactored generating download links	2019-03-16 16:23:40 +01:00
Ozzieisaacs	9c1b3f136f	Improved sorting for rated,random, hot books, read/unread book	2019-03-16 15:48:09 +01:00
Ozzieisaacs	a66873a9e2	Added file formats view	2019-03-11 18:42:30 +01:00
Ozzieisaacs	a0a15b4598	Fix max authors shown	2019-03-10 19:26:39 +01:00
Ozzieisaacs	4a33278596	Update ratings	2019-03-10 19:22:35 +01:00
Ozzieisaacs	6d2270d931	Fixes for Oauth	2019-03-10 12:54:32 +01:00
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	2019-03-10 08:31:10 +01:00
Ozzieisaacs	8612dce97c	Merge remote-tracking branch 'author/shorten-authors'	2019-03-09 20:14:16 +01:00
Ozzieisaacs	5b0a0e2139	Fix #835	2019-03-08 16:32:56 +01:00
Ozzieisaacs	9144a7ceb9	Fix for sqlalchemy 1.3	2019-03-08 16:29:12 +01:00
Ozzieisaacs	feb6a71f95	Fix uncompressed cbz files ... merge from master -> file extension limitation	2019-03-05 20:59:30 +01:00
Ozzieisaacs	f483ca3214	Code cosmetics ... Bugfix uploadprogress Bugfix mature content Reenable read and unread feature	2019-03-05 17:34:51 +01:00
Ozzieisaacs	0be17ed157	Refactored sidebar (some parts are missing)	2019-03-04 19:34:29 +01:00
Ozzieisaacs	6269a83c3d	Fix mismerge user logon with python3 in opds feed	2019-03-03 20:51:19 +01:00
Ozzieisaacs	f0de822ce7	Start refactor sidebar and view settings sidebar	2019-03-03 19:42:17 +01:00
Ozzieisaacs	fb23db57b4	Added filtering of authors, series, categories, publishers	2019-03-03 15:37:53 +01:00
Ozzieisaacs	11b770b3fb	Fix for #830 ... Fix user with umlauts	2019-03-03 08:41:50 +01:00
Ozzieisaacs	fda977b155	Fix for users with umlauts	2019-03-03 08:38:36 +01:00
Ozzieisaacs	68a36597ab	Fix opds login on python3	2019-03-03 07:37:15 +01:00
Ozzieisaacs	361a1243d7	Improvements #828	2019-02-27 19:30:13 +01:00
Virgil Grigoras	e5bc1ae020	Add new database field for storing max_authors	2019-02-25 19:21:49 +01:00
Ozzieisaacs	eef4787b79	Merge remote-tracking branch 'github/patch-1' into Develop ... Oauth is optional again	2019-02-24 19:34:57 +01:00
Ozzieisaacs	f6fbe2e135	Fix #766 ... Update pdf upload Translation of uploadprogress dialog	2019-02-24 19:23:51 +01:00
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	2019-02-24 10:39:37 +01:00
Ozzieisaacs	1a7052b287	Update pdf upload ... Translation of uploadprogress dialog	2019-02-23 14:26:02 +01:00
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.	2019-02-22 12:24:51 -05:00
Ozzieisaacs	ae7c4908f9	Fix #767	2019-02-20 18:04:55 +01:00
Ozzieisaacs	2505f0c1e4	Merge remote-tracking branch 'filename/patch-1' ... Fixes for Google Drive	2019-02-18 20:52:58 +01:00
Ozzieisaacs	3d5d95904a	Oauth working somehow (?)	2019-02-17 19:10:16 +01:00
Ozzieisaacs	a0be02e687	Ldap working	2019-02-17 09:09:20 +01:00
Ozzieisaacs	56826f67fc	progressbar during upload thanks to jim3ma	2019-02-16 10:05:51 +01:00
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	2019-02-16 07:23:36 +01:00
Ozzieisaacs	c1ef1bcd19	User and admin pages are working again	2019-02-09 21:26:17 +01:00
Ozzieisaacs	1fc4bc5204	Fix routes ... Fix error page	2019-02-09 19:01:57 +01:00
Ozzieisaacs	f5235b1d4c	Uploader progress bar ... Fixes imports and routes Merge branch 'master' into Develop Finished routing	2019-02-09 18:46:41 +01:00
Ozzieisaacs	d6ee8f75e9	More refactoring	2019-02-08 20:12:16 +01:00
Ozzieisaacs	a00d93a2d9	Working again (basically)	2019-02-06 21:52:32 +01:00
Ozzieisaacs	561d40f8ff	Merge branch 'master' into Develop	2019-02-03 20:30:37 +01:00
Ozzieisaacs	6fc4b318e8	cover folders beautified	2019-02-03 20:29:16 +01:00
Ozzieisaacs	36229076f7	Refactor subprocess calls	2019-02-03 18:32:27 +01:00
Ozzieisaacs	7f34073955	Merge branch 'master' into Develop ... # Conflicts: # cps/web.py # readme.md	2019-02-03 17:33:54 +01:00
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	2019-02-03 16:38:27 +01:00
Ozzieisaacs	80582573f5	Merge remote-tracking branch 'oauth/oauth' into Develop ... # Conflicts: # cps/templates/config_edit.html # cps/ub.py # cps/web.py	2019-01-27 11:22:22 +01:00
Ozzieisaacs	3683e4e7eb	Merge remote-tracking branch 'ldap/master' into Develop	2019-01-27 11:18:08 +01:00
Ozzieisaacs	8ababf9f77	Merge remote-tracking branch 'simple_shelf/shelf-down' into Develop	2019-01-27 11:16:11 +01:00
Ozzieisaacs	5971194678	Merge remote-tracking branch 'audiobook/Branch_c27805b' ... # Conflicts: # cps/templates/detail.html # cps/web.py # readme.md	2019-01-27 11:14:38 +01:00
Ozzieisaacs	e8ce88095e	Fix viewing Publisher settings for other users ... Fix Visiblilty of read/unread category	2019-01-26 19:06:54 +01:00
Ozzieisaacs	ec81a3cd92	Fix Authors page pagination ... Update infinite scroll plugin	2019-01-25 21:58:19 +01:00
Ozzieisaacs	97064db2a4	Restart python3 fix, stop and restart python2 working again	2019-01-23 18:14:45 +01:00
Ozzieisaacs	341dd77b9d	Bugfix Restart and Stop server on python3	2019-01-21 21:01:16 +01:00
Ozzieisaacs	836c6fd245	Updated translations ... Added license texts in flies	2019-01-20 19:37:45 +01:00
Ozzieisaacs	bacb6fb561	New updater with default setting -> only stable releases #653	2019-01-20 17:46:26 +01:00
Ozzieisaacs	62574939b2	Fix #770	2019-01-19 16:48:04 +01:00
Ozzieisaacs	32568c9009	Update testing ... Update custom columns unicode enums	2019-01-14 20:27:53 +01:00
Krakinou	d48cdcc789	Correct authentication in case LDAP not activated	2019-01-13 11:21:11 +01:00
Krakinou	d763168dec	Merge branch 'master' of https://github.com/Krakinou/calibre-web	2019-01-13 11:04:32 +01:00
Krakinou	7ccc40cf5b	Moving import LDAP ... Correct optional-requirements-ldap.txt spelling	2019-01-13 11:02:03 +01:00
Krakinou	aafb267787	Merge branch 'master' into master	2019-01-12 23:46:59 +01:00
Krakinou	2e37c14d94	Clean some comment	2019-01-12 18:40:32 +01:00
Krakinou	91f0908059	insert into db ... connect via LDAP config	2019-01-12 18:07:03 +01:00
Ozzieisaacs	f053508013	Fix #764	2019-01-11 22:24:48 +01:00
Ozzieisaacs	36030b559c	Choosing Theme is now a global setting	2019-01-11 08:36:28 +01:00
Krakinou	30954cc27f	Initial LDAP support	2019-01-10 23:51:01 +01:00
Ozzieisaacs	3b40c83314	Code cleaning ... code cosmetics deleted unused file caliBlur fixed custom error page	2019-01-08 07:58:22 +01:00
Ozzieisaacs	fa4918a2db	File renaming according to title and author (#654) - gdrive is missing	2019-01-06 15:00:34 +01:00
Ozzieisaacs	98134616b6	Fix #661 (authors are shown according to the authors sort order)	2019-01-06 14:16:52 +01:00
Ozzieisaacs	4dcac07582	Partly fixed #661: Right order of Authors is still not shown	2019-01-05 21:44:29 +01:00
Ozzieisaacs	7086c8d1bf	Merge remote-tracking branch 'language_edit/master'	2019-01-03 20:52:46 +01:00
Ozzieisaacs	013f7bf53e	Merge remote-tracking branch 'lang/patch-1'	2019-01-03 20:47:46 +01:00
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.	2019-01-03 11:45:15 -05:00
Ozzieisaacs	9cfe1dce20	Fix #739	2018-12-30 14:25:03 +01:00
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	2018-12-27 10:53:19 +01:00
grunjol	462cf20a34	Process all custom columns on editing	2018-12-24 13:05:47 -03:00
grunjol	00ba231fbf	fix adding an existing language to a book	2018-12-24 12:32:22 -03:00
Ozzieisaacs	81e3afbcc4	Fix #714 (advanced search for ratings)	2018-12-02 12:48:12 +01:00
Ozzieisaacs	7526b0dcb4	Fix #623, #715	2018-11-28 18:28:55 +01:00
Ozzieisaacs	863b77a5d7	Fix #711 ... Fixing for send to kindle after uploading codecleaning	2018-11-25 11:25:20 +01:00
Ozzieisaacs	b78130e3b1	Merge remote-tracking branch '681/681-fix'	2018-11-25 07:19:00 +01:00
haseo	e1b6fa25e9	A better solution to #681	2018-11-19 15:54:28 +08:00