calibre-web

mirror of https://github.com/janeczku/calibre-web synced 2024-12-20 23:20:32 +00:00

Author	SHA1	Message	Date
Ozzieisaacs	24ae7350f5	Fix # #1127 (user template show random books in detail view not saved)	2020-01-05 16:18:51 +01:00
Ozzieisaacs	c60277f4d3	Capitalize language selection in User settings Remove sql statement from log.debug statement upon creation of new column in settings database	2020-01-05 14:07:26 +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	56ee8c56ba	Fix #1122 (Uploading books with applied language restriction leads no longer to error 500)	2020-01-05 08:40:57 +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	8ad84a7ceb	Fix for #1123 (mature content is visible in shelfs)	2020-01-02 17:11:30 +01:00
Ozzieisaacs	32e818af6a	Fix #1124	2020-01-02 16:09:06 +01:00
Ozzieisaacs	d9adb4fc94	Improvements for limit tags	2020-01-01 17:30:08 +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	5887f0fe6b	Fix for #768 (If email server is configured, admins can send user passwords, also domains can be denied from registration)	2019-12-29 13:54:52 +01:00
ground7	b782489a8c	ldap opds download bugged	2019-12-28 21:52:26 -07: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	9ec3ddd492	Fix the HandleCoverImage endpoint so that it requires login, and doesn't take unused parameters.	2019-12-22 16:59:00 -05:00
Michael Shavit	d81dbb13e4	Support Epub downloads	2019-12-22 16:59:00 -05: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
Michael Shavit	b831b9d6b2	Integrate with the official Kobo store endpoint so that no functionanility is lost by overriding the api_endpoint setting. Requests are either: * Redirected to the Kobo Store * Proxied to the Kobo Store * Proxied to the Kobo Store and merged with results from CalibreWeb.	2019-12-22 13:40:49 -05:00
Ozzieisaacs	bbe91f439a	Merge from master	2019-12-22 15:28:43 +01:00
Ozzieisaacs	b586a32843	Fix #1115 (comic reader not working under iOS, maybe invalid issue) Improvement for #925 (Next/Prev buttons are bigger)	2019-12-22 15:24:22 +01:00
Ozzieisaacs	288944db2c	Merge remote-tracking branch 'kobo_sync/kobo' into Develop # Conflicts: # cps.py # cps/kobo.py # cps/kobo_auth.py # cps/ub.py	2019-12-20 19:24:31 +01:00
Ozzieisaacs	f2c07d8f81	Update Kobo sync	2019-12-20 19:17:08 +01:00
Michael Shavit	d6a9746824	Add a filter to the Sync request endpoint to ignore books that don't have any formats supported by the device.	2019-12-20 01:28:53 -05:00
Michael Shavit	f84274f1c5	git add missing generate_kobo_auth_url.html	2019-12-20 01:08:15 -05:00
Michael Shavit	2118d920f5	Formatter.	2019-12-20 01:04:12 -05:00
Michael Shavit	207004beff	Remove config_server_url setting.	2019-12-20 01:02:49 -05: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	7098d08888	Added option to convert AZW3 to mobi for sending to kindle	2019-12-15 18:44:02 +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	b6d7207ec3	Added platform information for better debugging	2019-12-15 13:33:38 +01:00
Ozzieisaacs	c33623efee	Unified wording for recently added books, series, categories, etc in opds and web UI ( #1045 ) Added file formats and languages to opds feed	2019-12-15 13:32:34 +01:00
Ozzieisaacs	2215bf3d7f	Implemented #1083 (Advanced search for extensions)	2019-12-15 11:35:07 +01:00
Ozzieisaacs	86fe970651	More fixes for googledrive	2019-12-14 22:22:27 +01:00
Andrew Roberts	3dc372c573	fixed typo	2019-12-12 21:38:45 -05:00
Andrew Roberts	efcee0a7b7	added reverse proxy configuration form and handler	2019-12-12 21:31:21 -05:00
Andrew Roberts	39b6b100f9	whitespace	2019-12-12 21:31:19 -05:00
Andrew Roberts	9351ff032f	whitespace	2019-12-12 21:31:17 -05:00
Andrew Roberts	f0760c07d8	added admin display of reverse proxy settings	2019-12-12 21:31:12 -05:00
Andrew Roberts	77b0954c70	use a macro for the display of boolean settings	2019-12-12 21:28:50 -05:00
Andrew Roberts	af7dbbf1e4	added logic for reverse proxy login	2019-12-12 21:27:40 -05:00
Andrew Roberts	b661c2fa92	added config fields to settings table	2019-12-12 21:27:38 -05:00
Ozzieisaacs	e308a74dc2	Fix (#1103 ) Internal server error with Goodreads and no result for author name on Goodreads	2019-12-12 20:08:16 +01:00
Michael Shavit	040d7d9ae3	Remove unused import and fix python3 compatibility, as per Ozielsaacs comments.	2019-12-11 00:12:35 -05:00
Michael Shavit	f9b1e84704	Remove backblaze leftovers	2019-12-10 23:57:53 -05:00
Ozzieisaacs	eede894e72	Merge remote-tracking branch 'merge-metadata'	2019-12-09 20:53:16 +01:00
Michael Shavit	55c0bb6d34	Set the "Size" attribute for Kobo download_urls, and refactor the code to eventually allow formats other than KEPUB.	2019-12-08 17:28:25 -05:00
Michael Shavit	2b55b9b250	Use the login_user Cookie to authorize download requests instead of passing the UserKey over url params.	2019-12-08 15:33:57 -05:00
Ozzieisaacs	22add37b64	Merge remote-tracking branch 'fix typo in config_edit.html #1097 ' Updated translations	2019-12-08 10:10:32 +01:00
Ozzieisaacs	8a9695d48e	Fix getting metadata from douban (#858 )	2019-12-08 09:52:57 +01:00
Ozzieisaacs	e0faad1e59	Handle no write permission to tmp folder (#1060 )	2019-12-08 09:40:54 +01:00
Michael Shavit	fffa2d5a1b	Support passing the Auth token as a url param. This is required to support ebook downloads which the Kobo device emits without any auth headers. * Also some other small bug fixes discovered during device testing.	2019-12-07 22:55:07 -05:00
Michael Shavit	0926ae530c	Remove custom_column usages from an earlier commit.	2019-12-07 21:08:53 -05:00
Michael Shavit	0b709f7dfb	Merge branch 'master' into kobo	2019-12-07 20:04:54 -05:00
Michael Shavit	b5da2c4199	Clean-up: Fix import order in kobo.py, and other minor formatting changes.	2019-12-07 19:54:49 -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
Christian Keil	c61463447f	Merge metadata of uploaded book versions.	2019-12-06 15:00:01 +01:00
Michael Shavit	55b54de6a0	Add simple get_download_url implementation to replace the backblaze-backed implementation	2019-12-05 19:06:39 -05:00
Michael Shavit	5357867103	Add initial support for Kobo device Sync endpoint. - Supports /v1/library/sync call to get list of books - Supports /v1/library/metadata call to get metadata for a given book + Assumes books are stored on Backblaze for metadata call - Changes to helper.py so that we can return no cover instead of a blank image.	2019-12-05 01:56:59 -05:00
zhiyue	222797e631	support douban book search using apikey	2019-12-04 11:59:06 +08:00
dalin	92841b46d7	update Simplified Chinese translations.	2019-12-03 16:32:03 +08:00
dalin	4c2323fcc9	fix typo in config_edit.html	2019-12-03 16:06:25 +08:00
Ozzieisaacs	fda0ab1e86	FIx for (#1092 listening to mp3 not working)	2019-12-01 12:36:55 +01:00
Ozzieisaacs	54079b36ae	Fix #1095 (epub viewer not working if only viewer rule wa sapplied)	2019-12-01 12:21:21 +01:00
Ozzieisaacs	f8a99c60d8	Fix for #1096 (exception on digest request)	2019-12-01 09:33:11 +01:00
Ozzieisaacs	8af178c19c	Fix for gdrive not working #1081	2019-11-26 10:46:06 +01:00
Ozzieisaacs	78f9ee86b1	Fix pdf cover Fix massadding books Add feature inform of duplicate books	2019-11-26 08:19:03 +01:00
Ozzieisaacs	ab5873984e	Merge remote-tracking branch 'translation/patch-3'	2019-11-17 06:59:22 +01:00
Ozzieisaacs	62ea8b8913	Logging to stdout, proposal form #1078	2019-11-16 10:09:34 +01:00
Ozzieisaacs	a4416c202d	Merge remote-tracking branch 'rename/develop'	2019-11-16 08:01:18 +01:00
Jony	1f5edffccf	Fix typo and update translation	2019-11-16 07:49:07 +01:00
Ozzieisaacs	651260022c	Merge remote-tracking branch 'search_title/hotfix-searchform-title'	2019-11-16 07:29:00 +01:00
Ozzieisaacs	2e4344f7ea	Merge remote-tracking branch 'swedish/master'	2019-11-16 07:27:08 +01:00
Jony	3cb7e77b60	Update messages.po	2019-11-14 18:52:06 +01:00
Ghighi Eftimie	f782dc1857	fix for search title	2019-11-14 12:08:19 +02:00
Ozzieisaacs	88f31ddad1	Fix for #1034	2019-11-07 21:04:03 +01:00
Ozzieisaacs	a7ab7fcf06	Fix #1068 PDF cover Images inverted or incorrect single image grabbed from cover page	2019-11-03 09:49:54 +01:00
Ozzieisaacs	6f61e80c97	Fix #1074 , #1071	2019-10-31 15:46:38 +01:00
Ozzieisaacs	d1afdb4aac	Fix #1074 , #1071	2019-10-31 15:44:36 +01:00
Ozzieisaacs	5167ee520e	Solve cropped image pdf import (#1068 )	2019-10-22 19:11:40 +02:00
Ozzieisaacs	f758a1cc64	Solve inverted image pdf import (#1068 )	2019-10-21 19:33:09 +02:00
Ozzieisaacs	2145be6db2	Improvement for #1062	2019-10-20 16:47:15 +02:00
Ozzieisaacs	c740fe9124	Merge remote-tracking branch 'github_2/it-adds-info-to-shelf-order'	2019-10-20 15:50:52 +02:00
Ozzieisaacs	a371e40c66	Merge remote-tracking branch 'github_3/hotfix/epub-import' Improved cover extraction from epub files	2019-10-20 15:48:06 +02:00
Ozzieisaacs	ccc6184342	Merge remote-tracking branch 'github_1/patch-1'	2019-10-20 15:03:37 +02:00
Ozzieisaacs	c8c2d6659c	Merge remote-tracking branch 'public_reconnect/master'	2019-10-20 15:03:02 +02:00
Jan Guzej	c7d7a7597c	remove language from array metadata	2019-10-19 21:49:18 +02:00
Jan Guzej	fbb7663a2f	epub metadata import fix	2019-10-19 14:04:15 -04:00
Kyos	c93dd32179	Fixed typo and column size for LG screens	2019-10-19 12:02:14 +02:00
Kyos	7165826011	Adds Authors, Series and Book Cover to the shelf order view	2019-10-19 10:57:48 +02:00
Kyos	ada727a570	Adds Authors, Series and Book Cover to the shelf order view	2019-10-19 10:52:03 +02:00
gwenhael	01b0f9534c	fix issue #1064 Allow for finer steps in serie-index	2019-10-18 15:12:27 +02:00
zelazna	3764c33a3a	Add the posibility to change the username	2019-10-01 15:36:00 +02:00
Ozzieisaacs	9fc02f67c2	Debug output for lcase	2019-09-27 15:30:39 +02:00
Ozzieisaacs	0c40e40dc3	Fix logfile loading behind reverse proxy (#1047 )	2019-09-27 08:15:10 +02:00
Ozzieisaacs	e31df16309	Revert bug in updater.py preventing new files from being created	2019-09-24 19:00:47 +02:00
Ozzieisaacs	d7ea5bb9d7	Fix for #1037 Update German translation	2019-09-17 18:25:17 +02:00
Ozzieisaacs	6cda5fee0d	Fix language selection on python3	2019-09-06 20:56:17 +02:00
Ozzieisaacs	ca5e285c5a	Merge branch 'Develop'	2019-09-06 19:05:02 +02:00
Ozzieisaacs	fb0eebfc52	Merge remote-tracking branch 'spanish/master'	2019-09-06 19:03:03 +02:00
Ozzieisaacs	dd90fb003e	Merge remote-tracking branch 'french/master'	2019-09-06 19:01:45 +02:00
Ozzieisaacs	61cd044255	Merge remote-tracking branch 'polish/master'	2019-09-06 19:01:17 +02:00
Ozzieisaacs	879d02081a	Fix #1021	2019-09-06 18:57:41 +02:00
Ozzieisaacs	051bc53aa2	Fix for #1009	2019-09-02 19:27:34 +02:00
Angel Docampo	5515772903	updated spanish translations	2019-08-27 13:16:23 +02:00
Angel Docampo	ff900fd9c0	updated spanish translations	2019-08-27 13:15:18 +02:00
Yamakuni	eec4be7a29	Update cps/translations/fr/LC_MESSAGES/messages.po Co-Authored-By: Johan Bonneau <lhaagounet@gmail.com>	2019-08-25 01:01:05 +01:00
Yamakuni	1385ecb383	Update cps/translations/fr/LC_MESSAGES/messages.po Co-Authored-By: Johan Bonneau <lhaagounet@gmail.com>	2019-08-23 16:02:21 +01:00
Yamakuni	74418f3139	Update cps/translations/fr/LC_MESSAGES/messages.po Co-Authored-By: Johan Bonneau <lhaagounet@gmail.com>	2019-08-23 16:02:13 +01:00
Yamakuni	72def4b97b	Update cps/translations/fr/LC_MESSAGES/messages.po Co-Authored-By: Johan Bonneau <lhaagounet@gmail.com>	2019-08-23 16:02:04 +01:00
Yamakuni	564c3b4778	Update cps/translations/fr/LC_MESSAGES/messages.po Co-Authored-By: Johan Bonneau <lhaagounet@gmail.com>	2019-08-23 16:01:47 +01:00
Yamakuni	c9eff4a70c	Update cps/translations/fr/LC_MESSAGES/messages.po Co-Authored-By: Johan Bonneau <lhaagounet@gmail.com>	2019-08-23 16:01:38 +01:00
Yamakuni	879f63d1c1	Update cps/translations/fr/LC_MESSAGES/messages.po Co-Authored-By: Johan Bonneau <lhaagounet@gmail.com>	2019-08-23 16:01:01 +01:00
Yamakuni	3fb458dd19	Update cps/translations/fr/LC_MESSAGES/messages.po Co-Authored-By: Johan Bonneau <lhaagounet@gmail.com>	2019-08-23 16:00:52 +01:00
Yamakuni	d9a73b4fa3	French translation Add and modify some little things	2019-08-21 15:21:17 +01: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
Radosław Kierznowski	6a058d2c52	Update polish translation	2019-08-18 22:08:08 +02:00
Vincent Kriek	38a255e069	Add automatic epub to kepub conversion using kepubify	2019-08-18 21:44:19 +02:00
Ozzieisaacs	ff41775dbb	Merge remote-tracking branch 'pwr/unpickle-iso-languages' into Develop	2019-08-17 17:27:06 +02:00
Ozzieisaacs	d04a78afe6	Merge remote-tracking branch 'public_shelf/Develop' into Develop	2019-08-17 16:03:29 +02:00
Ozzieisaacs	f566237be0	Merge remote-tracking branch 'bootstrap/Develop' into Develop	2019-08-17 15:59:13 +02:00
Dmitriy Istomin	a65ad9483c	update Bootstrap v3.4.0 -> 3.4.1	2019-08-16 11:18:39 -04:00
W1ndst0rm	4cbdccd39e	Fix for https://github.com/janeczku/calibre-web/issues/1002	2019-08-13 23:07:15 -06:00
Ozzieisaacs	9356148e2d	Added more information about dependencies	2019-08-06 19:53:33 +02:00
Ozzieisaacs	4be55285d8	Fix #1001	2019-08-06 18:38:17 +02:00
Ozzieisaacs	3eae2e9c2c	Changed text for not found imports	2019-08-03 18:24:56 +02:00
Ozzieisaacs	e9fb5d9f25	Bugfix for comicapi	2019-08-03 14:09:54 +02:00
Ozzieisaacs	6261981656	Fix for #991 Removed additional psace before Advanced search (Pull request #996) Set startup message for not relevant imports to debug, to reduce confusion	2019-08-03 12:56:32 +02:00
Ozzieisaacs	82ca3f31f9	Merge remote-tracking branch 'pwr/master'	2019-07-31 17:40:50 +02:00
Ozzieisaacs	97f3aa8325	Update dutch language	2019-07-31 17:38:28 +02:00
Daniel Pavel	7c503b4a31	provide a default logging configuration (fixes #987 )	2019-07-31 09:42:10 +03:00
Daniel Pavel	9f8cab99e3	Moved language names from iso639.pickle to a python file	2019-07-30 15:16:24 +03: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	f59d9d5aa8	Merge remote-tracking branch 'polish/master'	2019-07-27 07:19:30 +02:00
Radosław Kierznowski	746b7b1262	Update polish translation	2019-07-26 23:04:04 +02:00
Ozzieisaacs	5f228fbb40	Update german translation	2019-07-26 17:20:48 +02:00
Ozzieisaacs	12576393cf	Merge remote-tracking branch 'spanish/patch-1' Merge remote-tracking branch 'german/master'	2019-07-26 16:41:52 +02:00
Mainak	7f43a2e104	Update messages.po update and revision of the Spanish translation file.	2019-07-26 11:45:45 +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	fc4dc36c65	Fix #969 (duplicate code "init" in epub reader) Fix for #890	2019-07-23 19:26:01 +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	9f64a96502	Fix for #890	2019-07-22 18:28:45 +02:00
Ozzieisaacs	b9c3a3fcea	Fix #652	2019-07-21 18:19:07 +02:00
Ozzieisaacs	6d43e0422a	Fix for non found flask_login version (#968 )	2019-07-21 17:45:21 +02:00
Ozzieisaacs	0d7e58ce79	Fix for #968 (database conversion fails for default strings under python2.7)	2019-07-21 16:23:31 +02:00
Ozzieisaacs	3e008ef29b	Fix update dates shown in local time format again Fix "to update" history is shown again	2019-07-21 13:28:55 +02:00
Ozzieisaacs	5c6be5d6d0	Fix for python 3 and existing unrar entry in db deleted unnecessary lines in config html template	2019-07-21 12:58:48 +02:00
Ozzieisaacs	38f3c2d5b9	Reenabled multiple oauth provider deleted duplicate download counting function	2019-07-21 09:45:36 +02:00
Ozzieisaacs	c6542fdec6	New Oauth code	2019-07-20 20:01:05 +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
Ozzieisaacs	d168e3bfdb	Add licence to oauth fix comicapi dependency	2019-07-16 21:08:37 +02:00
Daniel Pavel	99c6247baf	use the standard socket library to validate the ip address argument	2019-07-14 22:06:40 +03:00
Daniel Pavel	a334ef28e7	about page: build the versions dictionary only once	2019-07-14 21:15:46 +03: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
Daniel Pavel	a836df9a5a	more robust disposing of database session avoid spamming the log with debug messages from libraries	2019-07-14 14:44:48 +03:00
Ozzieisaacs	8bfcdffeb6	Fix feature support	2019-07-14 13:20:40 +02:00
Ozzieisaacs	e411c0fded	Fix logging in debug mode	2019-07-14 09:18:37 +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	792367e35e	Version update	2019-07-13 20:27:32 +02:00
Ozzieisaacs	be64961de5	Code cosmetics comic reader	2019-07-13 19:55:51 +02:00
Ozzieisaacs	405a3909b0	Fix for opds with LDAP authentication	2019-07-13 17:51:25 +02:00
Ozzieisaacs	b1cb7123a3	Fix for #959	2019-07-11 20:37:03 +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	499a66dfb0	Additional glyphicons for music on search and author page Fix duplicate user and email (now case insensitive) Output of calibre on stderr is now logged (full traceback in debug-log, otherwise, only errormessage) Natural sorting for comic reader Fix for long running tasks	2019-07-06 14:46:25 +02: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	ad44e58c7a	Sorting for comics Audiobook support	2019-06-29 14:23:39 +02:00
Ozzieisaacs	572b5427c7	Fix Encoding issues for python2	2019-06-23 21:11:45 +02:00
Ozzieisaacs	32af660f86	Improvements for logfile viewer Fix for tornado-server with deactivated accesslog doesn't log to normal log anymore Merge from master for unique user ids, get_metadata, fix Goodreads integration Update Translation (merge NL, update DE)	2019-06-22 19:55:59 +02:00
Ozzieisaacs	cc8a431532	Merge remote-tracking branch 'socket/unix-socket' into Develop	2019-06-21 09:46:03 +02:00
Ozzieisaacs	5c7aeb2f2c	Change GDrive	2019-06-20 20:12:01 +02:00
Daniel Pavel	e254565901	support binding the http server to a unix socket file instead of TCP socket	2019-06-18 08:57:37 +03:00
Heimen Stoffels	d9f69ca264	Updated Dutch translation	2019-06-17 22:38:32 +02:00
Ozzieisaacs	cd546eb6d4	Update comic reader js	2019-06-17 19:48:17 +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	d45b1b8ea5	Fix #937 logviewerintegrated Code cosmetics	2019-06-15 21:18:13 +02:00
Ozzieisaacs	e67d707867	Fix for #588 Merge remote-tracking branch 'linuxserver/master'	2019-06-15 11:58:55 +02:00
Krakinou	4437d7376d	Merge pull request #2 from Krakinou/flaskldap Solve typo	2019-06-14 22:56:21 +02:00
Krakinou	304db0d20e	Solve typo	2019-06-14 22:55:17 +02:00
Ozzieisaacs	3f5c6c1fa5	Fix #937	2019-06-13 20:01:37 +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	8e4539cf8e	Prevent delete of last admin user	2019-06-10 19:26:01 +02:00
Ozzieisaacs	c81d4edb7d	Fix for #923	2019-06-10 16:38:29 +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
Ozzieisaacs	50973ffb72	Merge remote-tracking branch 'constants/Develop-logging-cleanup' into Develop	2019-06-08 06:52:41 +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	f736a15c12	Fix for restart of newer versions of tornado during update Fix for updater with Beta Versions	2019-06-02 18:47:25 +02:00
Ozzieisaacs	a02f949d23	Fix for updater with beta releases	2019-06-02 18:09:44 +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	6662a58cb0	Update translationfiles	2019-05-31 15:48:19 +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	26e45f1f57	Merge remote-tracking branch 'comic-reader/master'	2019-05-31 08:43:51 +02:00
Ozzieisaacs	df5d15d1a2	Merge remote-tracking branch 'comicapi/master'	2019-05-30 10:43:28 +02:00
Ozzieisaacs	ecedf92783	Update version Make custom columns visible (#904)	2019-05-30 10:21:11 +02:00
Ozzieisaacs	d106ada9ed	Changed version Update translation	2019-05-30 09:07:52 +02:00
Ozzieisaacs	ed91048a63	Fix for magic link with python 3	2019-05-26 11:31:09 +02:00
Ozzieisaacs	f70c839014	Added additional permission viewer	2019-05-19 18:39:34 +02:00
Ozzieisaacs	e6ff2f1d90	Fix file not found loading-icon.gif	2019-05-16 19:42:59 +02:00
subdiox	867aa2f0bd	Beautify bitjs	2019-05-14 04:28:06 +09:00
subdiox	7982ed877c	Downgrade bitjs to es5 branch	2019-05-13 14:53:25 +09: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
subdiox	c0d136ccd8	Fix slow loading	2019-05-10 08:16:03 +09:00
Ozzieisaacs	479b4b7d82	Update translations, integrated update of Italian translation	2019-05-08 20:24:10 +02:00
Ozzieisaacs	a42ebdc096	Fix for #897	2019-05-07 19:54:13 +02:00
Ozzieisaacs	49ba221e85	Merge remote-tracking branch 'direction'	2019-05-07 18:54:27 +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
subdiox	c2bfb29726	Add reading direction settings to readcbr page	2019-04-21 18:20:15 +09:00
subdiox	204de4aef6	Fix an issue that fullscreen doens't work on some browsers	2019-04-21 18:02:02 +09:00
subdiox	8b6d165d64	Fix Japanese translation	2019-04-21 17:53:40 +09:00
Ozzieisaacs	bfd0e87a17	Merge branch 'master' into Develop # Conflicts: # cps/helper.py # cps/reverseproxy.py	2019-04-21 08:50:31 +02:00
Ozzieisaacs	6a7b8c7870	Update Version info Fix #816 Clarified licences for isolanguages.py and reverseproxy.py	2019-04-21 08:48:51 +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	f1a65a2aeb	Clarified licences for isolanguages.py and reverseproxy.py	2019-04-20 17:57:06 +02:00
Ozzieisaacs	cc5c2c0f65	Update Version info	2019-04-20 12:30:33 +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	89516fc2d6	Make PIL optional #885	2019-04-17 20:45:08 +02:00
Ozzieisaacs	e1e79a73e8	Fix #884	2019-04-17 20:14:24 +02:00
Ozzieisaacs	0b8624b542	Deleted load metadata from douban, as API seems to be shut down (#858 )	2019-04-17 19:55:32 +02:00
Ozzieisaacs	91ebe33879	Merge remote-tracking branch 'image_formats/dev'	2019-04-15 20:57:25 +02:00
Ozzieisaacs	05da2ae3c7	Update search for cyrillic letters	2019-04-14 18:20:45 +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	4552208c02	Fix #848	2019-04-14 16:37:57 +02:00
Ozzieisaacs	436c2671d1	Fix delete domain entries Fix error handling smtp.authentication error	2019-04-14 14:08:49 +02:00
Ozzieisaacs	a669eacde9	Merge remote-tracking branch 'proxy/patch-1'	2019-04-14 11:19:36 +02:00
Ozzieisaacs	2253708da7	Merge remote-tracking branch 'proxy/patch-1' into Develop	2019-04-14 10:54:09 +02:00
Ozzieisaacs	51e591bd25	Added updated translation	2019-04-13 16:46:06 +02:00
Ozzieisaacs	5188c62bea	Merge remote-tracking branch 'translation/loc-hu'	2019-04-13 16:45:05 +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
Ozzieisaacs	e754ce313c	Merge remote-tracking branch 'pycountry/pycountry'	2019-04-13 16:34:04 +02:00
Ozzieisaacs	dc933f3d66	Merge remote-tracking branch 'pdf.js/epubjs' Updated pdf.js	2019-04-13 15:02:01 +02:00
Barnabás Nagy	afc79416b2	HU Translation updates Translation of the new untranslated strings	2019-04-06 23:38:59 +02:00
Josh Max	cdfb6bf3e3	Use HTTP_X_FORWARDED_HOST instead of HTTP_X_FORWARDED_SERVER Use HTTP_X_FORWARDED_HOST since HTTP_X_FORWARDED_SERVER holds the hostname of the proxy server on HAProxy/Traefik.	2019-04-03 01:25:29 -07:00
Iris Wildthyme	cbdc9876b2	comicapi dependency now pippable	2019-04-02 20:58:23 -04:00
Iris Wildthyme	05d0f12608	redid comic importing support to handle metadata properly using comicapi from comictagger. needs work to automate installation	2019-04-02 18:52:45 -04:00
Daniel Pavel	858c80bb20	'except' style fix	2019-03-29 17:06:26 +02:00
Daniel Pavel	f7e640fd98	support pycountry if iso-639 is not available	2019-03-29 07:00:10 +02:00
Daniel Pavel	439ce19b5d	Updated epub.js to v0.3.66	2019-03-28 07:23:45 +02:00
Ozzieisaacs	1c9ff6421d	Fix uploader	2019-03-26 18:23:30 +01:00
Ozzieisaacs	4b301a7961	Additional fix for #845 (in case of error)	2019-03-26 18:19:39 +01:00
Ozzieisaacs	dc93222579	Update 2 column author list view	2019-03-26 17:54:12 +01:00
Yijun Zhao	6c493df2f5	support issue: #843	2019-03-26 14:34:51 +08: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	39a3f70084	Fix for slow updater	2019-03-24 15:22:41 +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	fa36072699	Fix uk translation-file	2019-03-24 08:18:41 +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	3f2a9c8bae	Code improvement	2019-03-16 17:33:15 +01:00
Ozzieisaacs	7c69589c5b	Code cosmetics unrar.js	2019-03-16 17:30:24 +01:00
Ozzieisaacs	149e9b4bd4	Code cosmetis unrar	2019-03-16 17:28:21 +01:00
Ozzieisaacs	a360b1759a	Code cosmetics bugfix import HttpError from pydrive	2019-03-16 17:20:14 +01:00
Ozzieisaacs	765b817384	Refactored shelf.py and editbooks.py	2019-03-16 16:53:22 +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	1db1c2e7df	Enabling LDAP working again LDAP/Github oauth and Google oauth no credentials/parameters are rejected now	2019-03-10 11:12:44 +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	76d40411dd	Translation updated	2019-03-10 08:04:31 +01:00
Ozzieisaacs	8612dce97c	Merge remote-tracking branch 'author/shorten-authors'	2019-03-09 20:14:16 +01:00
Ozzieisaacs	0b0e62fdf2	Merge remote-tracking branch 'dialog/master' Fix for #833	2019-03-09 20:02:17 +01:00
Ozzieisaacs	6f80a63ca6	Fix for #827	2019-03-09 07:05:43 +01:00
Andrew Sullivan	3dfc2f2580	fixing issue #833	2019-03-08 20:44:45 -05: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	6f0b3bbda0	Fix for #812	2019-03-05 21:28:55 +01:00
Ozzieisaacs	feb6a71f95	Fix uncompressed cbz files merge from master -> file extension limitation	2019-03-05 20:59:30 +01:00
Ozzieisaacs	1561a4abdf	Comic improvments	2019-03-05 20:19:02 +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	466af21548	Code Cosmetics	2019-03-05 16:31:09 +01:00
Ozzieisaacs	0224d45961	Code cosmetics	2019-03-04 20:03:09 +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	fa276fd0d3	Add scrollbar to metadata load screen Small UI improvements in metadata load screen	2019-03-01 21:00:09 +01:00
Ozzieisaacs	de58d0a4d8	Merge remote-tracking branch 'metadata/Develop' into Develop Update logger for updater	2019-03-01 19:09:37 +01:00
jianyun.zhao	54a006a420	[fix] Add a scroll bar to a long list of meta information	2019-03-01 10:57:27 +08:00
Ozzieisaacs	361a1243d7	Improvements #828	2019-02-27 19:30:13 +01:00
Ozzieisaacs	246d7673a9	Corrected file header with copyright information	2019-02-27 18:20:50 +01:00
Virgil Grigoras	bd7b0175a1	Fix remaining shown by codacy	2019-02-26 17:24:13 +01:00
Virgil Grigoras	f5cf62f209	Fix issues shown by codacy	2019-02-26 11:17:06 +01:00
Virgil Grigoras	15aa49e163	shorten authors in author / discover / index / search and shelf	2019-02-25 19:27:59 +01:00
Virgil Grigoras	3272b4ca1e	configuration field for max_authors	2019-02-25 19:26:43 +01:00
Virgil Grigoras	d3ed0317bb	styling and javascript for hiding authors	2019-02-25 19:25:08 +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	fad62a0909	translation update	2019-02-24 19:23:51 +01:00
Ozzieisaacs	f6fbe2e135	Fix #766 Update pdf upload Translation of uploadprogress dialog	2019-02-24 19:23:51 +01:00
Ozzieisaacs	1de3929988	Unicode	2019-02-24 19:08:24 +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	0facb8fffa	Fix #766	2019-02-23 18:28:25 +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	17b7333992	Merge remote-tracking branch 'caliblur/master'	2019-02-20 20:00:08 +01:00
leram84	ae279c5123	fixed description read-more button	2019-02-20 12:57:38 -05:00
Ozzieisaacs	e92497b34e	Merge branch 'master' into Develop # Conflicts: # cps/gdriveutils.py # cps/helper.py	2019-02-20 18:09:42 +01:00
Ozzieisaacs	ae7c4908f9	Fix #767	2019-02-20 18:04:55 +01:00
Ozzieisaacs	ea1a882353	Merge remote-tracking branch 'origin/master'	2019-02-20 18:04:40 +01:00
hexeth	9a0e8fefb7	re-add loader code	2019-02-19 13:56:49 -08:00
Matt	c07cb23ef2	Merge branch 'master' of git://github.com/janeczku/calibre-web	2019-02-19 13:47:53 -08:00
hexeth	5a863541de	Fix object object	2019-02-19 13:44:40 -08:00
Ozzie Isaacs	4c80db4324	Revert bootstrap update 3.4.0 -> 3.3.7	2019-02-19 19:32:00 +01:00
Ozzieisaacs	2505f0c1e4	Merge remote-tracking branch 'filename/patch-1' Fixes for Google Drive	2019-02-18 20:52:58 +01:00
Fabian Wüthrich	7fb9bf8889	Truncate single quote in upload file name	2019-02-18 13:35:30 +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	237502ae6b	Output of errormessage for invalid CALIBRE_PORT value	2019-02-16 10:18:32 +01:00
Ozzieisaacs	37007dafee	Merge branch 'master' into Develop # Conflicts: # cps/templates/layout.html # cps/web.py # readme.md	2019-02-16 10:17:46 +01:00
Ozzieisaacs	56826f67fc	progressbar during upload thanks to jim3ma	2019-02-16 10:05:51 +01:00
Ozzieisaacs	0fa45f5800	Merge remote-tracking branch 'github/master' Improvement for #814	2019-02-16 08:03:42 +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
lorek123	d508b909d1	update js and css libs, especially to fix xss in Jquery and Bootstrap	2019-02-10 18:17:33 +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	d58d792f56	Catch Imagemagick policy error	2019-02-09 12:58:43 +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	b75b91606c	Fix config oauth-UI	2019-01-27 11:32:16 +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	9128615f48	Fix #424 Fix #425	2019-01-26 09:43:17 +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
Matt	b1d2b68bb1	Revert "Merge pull request #1 from hexeth/reader-theme" This reverts commit `fb7bd0c49b`, reversing changes made to `ae55dd6c27`.	2019-01-18 14:31:41 -08:00
hexeth	3ba9e4d96e	reader theme	2019-01-18 14:28:11 -08:00
leram84	ae55dd6c27	Update caliBlur.min.css	2019-01-18 14:17:17 -08:00
Matt	7341819606	Revert "Update caliBlur.min.css" This reverts commit `df8806e182`.	2019-01-18 14:11:39 -08:00
Matt	68f143dc30	Revert "Create dark-reader.css" This reverts commit `a69e43922a`.	2019-01-18 14:11:31 -08:00
Matt	ae14236698	Revert "Add Dark-Reader" This reverts commit `7e9d6a3cf9`.	2019-01-18 14:11:24 -08:00
Matt	9ee4b7f77c	Revert "Not ready for commit" This reverts commit `6a2ebba85b`.	2019-01-18 14:11:17 -08:00
hexeth	6a2ebba85b	Not ready for commit	2019-01-18 14:06:39 -08:00
hexeth	7e9d6a3cf9	Add Dark-Reader	2019-01-18 13:50:21 -08:00
leram84	a69e43922a	Create dark-reader.css	2019-01-18 16:43:36 -05:00
leram84	df8806e182	Update caliBlur.min.css	2019-01-18 14:43:04 -05:00
hexeth	83a905bfe1	Don't remove the dropdown toggle	2019-01-18 11:35:13 -08:00
Matt	e01872fc79	Revert "Update caliBlur.min.css" This reverts commit `2b7b55846b`.	2019-01-18 11:27:19 -08:00
leram84	2b7b55846b	Update caliBlur.min.css	2019-01-18 14:22:48 -05:00
hexeth	c0792b7225	Add .sendtokindle-drop to click-off	2019-01-18 11:10:54 -08:00
Matt	8825352af6	Revert "Add sendtokindle-drop to click-off array" This reverts commit `d83ba315f0`.	2019-01-18 11:09:26 -08:00
hexeth	d83ba315f0	Add sendtokindle-drop to click-off array	2019-01-18 11:07:50 -08:00
hexeth	16e23cb1fe	Fix upload tooltip not appearing	2019-01-18 11:04:28 -08:00
leram84	df2b1ba09d	fix for send button dropdown	2019-01-18 14:01:51 -05:00
hexeth	9a12e60b1c	Toggle for dropdown	2019-01-18 11:00:55 -08:00
hexeth	c620453ebf	UL positioning	2019-01-18 10:57:42 -08:00
hexeth	4988e3b631	add tooltip and move UL higher in DOM	2019-01-18 10:50:29 -08:00
Matt	aa27e0e476	Revert "Update ID of button from sendbtn2 to sendbtn" This reverts commit `a9277da85a`.	2019-01-18 10:43:26 -08:00
Ozzie Isaacs	9e5fa45df7	Removed unnecessary wait message	2019-01-16 17:50:51 +01:00
leram84	d5ff3b6a0b	smtp setup page (#774 ) fix for https://github.com/janeczku/calibre-web/issues/773	2019-01-15 21:20:03 +01:00
Ozzie Isaacs	cc618ecee7	Fix Limiting domains (related to #773 )	2019-01-15 20:08:47 +01:00
Ozzieisaacs	f4977c3767	Merge remote-tracking branch 'theme/master'	2019-01-15 18:22:09 +01:00
hexeth	a9277da85a	Update ID of button from sendbtn2 to sendbtn The ID of this button is currently `sendbtn` if the condition is true, but `sendbtn2` when false. Propose renaming both to `sendbtn` as neither button will appear in the template at the same time. This will assist in caliBlur more easily targeting both states.	2019-01-14 11:43:29 -08: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
Krakinou	8d284b151d	Edit html config	2019-01-12 12:52:27 +01:00
Ozzieisaacs	c527d1f49a	Merge remote-tracking branch 'theme/master' Added translations for some tooltips Updated translations	2019-01-12 09:01:08 +01:00
hexeth	4ace3a5e27	test	2019-01-11 14:13:09 -08:00
leram84	db83fb3bd7	minified	2019-01-11 16:49:45 -05:00
hexeth	883633a045	Remove beta from caliBlur selection	2019-01-11 13:46:19 -08:00
Matt	84fdf9143b	Revert "Update web.py" This reverts commit `a388f03b99`.	2019-01-11 13:44:17 -08:00
Matt	7a069ad72e	Revert "Update web.py" This reverts commit `1bcc0698d5`.	2019-01-11 13:43:48 -08:00
leram84	f897491070	Update caliBlur.min.css	2019-01-11 16:30:01 -05:00
Ozzieisaacs	f053508013	Fix #764	2019-01-11 22:24:48 +01:00
hexeth	2ab10bb070	Update caliBlur.js	2019-01-11 13:23:12 -08:00
hexeth	1bcc0698d5	Update web.py	2019-01-11 13:21:51 -08:00
hexeth	a388f03b99	Update web.py	2019-01-11 13:20:16 -08:00
hexeth	9c75eb7016	Update caliBlur.js	2019-01-11 13:07:18 -08:00
hexeth	6c37aafae9	Update caliBlur.js	2019-01-11 13:05:22 -08:00
hexeth	550262e651	Further fix	2019-01-11 12:44:29 -08:00
hexeth	edb4cedc65	Update about page to target new body class	2019-01-11 12:43:00 -08:00
hexeth	40e45c7272	Add files via upload	2019-01-11 11:23:49 -08:00
hexeth	7032f311d5	Update caliBlur.js	2019-01-11 10:54:21 -08:00
Ozzieisaacs	66fcd71685	Merge remote-tracking branch 'origin/master'	2019-01-11 08:36:51 +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
hexeth	e1205b75cd	Fix targeting for language support (#761 ) Some other languages use 'description :' instead of 'description:' .	2019-01-10 18:26:34 +01:00
Ozzieisaacs	d5a913e195	Merge remote-tracking branch 'origin/master'	2019-01-10 11:03:48 +01:00
leram84	dba5680121	1.0 for the merge (#758 ) Includes many bugfixes, and multi language support updates. I'm making all changes as an unminified addendum to the file for readability, but we can go back and minify it with the rest when everything is smooth.	2019-01-10 09:25:18 +01:00
Ozzieisaacs	b03f4bb5e5	Merge remote-tracking branch 'origin/master'	2019-01-09 13:03:55 +01:00
hexeth	23396af83c	Add .random-books class to random books div (#757 ) Assist caliBlur in targeting this element	2019-01-08 21:58:57 +01:00
hexeth	418e98d1f8	update .published-date to .publishing-date (#756 )	2019-01-08 18:06:29 +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	fa3426aa08	Merge remote-tracking branch 'origin/master'	2019-01-08 07:10:36 +01:00
hexeth	eb1c87fbae	Patch 4 (#752 ) * Target new class Target new class for caliblur language support * Move publishing date into div Places publishing date in new div to assist caliBlur in targeting this element. This PR does not create any visual difference on the default theme. * Target newly created div	2019-01-08 07:10:10 +01:00
hexeth	c77825371d	Add classes to shelves for easier css selection (#751 ) proposed class changes will assist caliBlur in targeting this element, resolving language compatibility issues.	2019-01-07 21:13:51 +01:00
Ozzieisaacs	fa4918a2db	File renaming according to title and author (#654 ) - gdrive is missing	2019-01-06 15:00:34 +01:00
Ozzieisaacs	8db2b62b39	Merge remote-tracking branch 'origin/master'	2019-01-06 14:17:09 +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
hexeth	29c9d55498	Remove leading space in span (#749 ) Previous code was not targeting right element, additionally was only removing a single leading space. New regex will remove any leading spaces from span	2019-01-04 21:49:01 +01:00
hexeth	ece11de942	Fix publisher not formatting correct (#747 )	2019-01-04 20:39:11 +01:00
Ozzieisaacs	f821580b50	#Fix 745	2019-01-03 22:01:52 +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	cb0f3cd074	Fix #696	2018-12-29 11:16:36 +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	677264950d	Merge remote-tracking branch 'ru-translation/master'	2018-12-16 16:59:22 +01:00
Anton Konyshev	e6b1c8cf36	Updated Russian translation	2018-12-14 16:27:19 +03:00
Ozzieisaacs	9057a3a0d7	Merge remote-tracking branch 'dutchtranslation/master'	2018-12-10 19:37:03 +01:00
Ed Driesen	45d97d277a	Update Dutch translation Some lines where still untranslated, fixed it.	2018-12-09 15:11:31 +01: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	64b1b830d6	Fix #712	2018-11-25 13:29:58 +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
Ozzieisaacs	47424e5c1a	Merge remote-tracking branch 'swedish/master' Improved server stop command	2018-11-24 20:47:11 +01:00
Jony	bc0d19f33d	Fix typo	2018-11-23 03:03:02 +01:00
Jony	cbc9169973	Update messages.po	2018-11-23 03:01:34 +01:00
haseo	e1b6fa25e9	A better solution to #681	2018-11-19 15:54:28 +08:00
Ozzieisaacs	dfa17956c9	Merge remote-tracking branch 'bbb/295---Send-AZW-to-Kindle' Changed function for 295, azw3 is preferred format for sending to kindle	2018-11-18 17:09:13 +01:00
Ozzieisaacs	a2b612c9ab	Merge remote-tracking branch 'ssl/verify-ssl-paths'	2018-11-17 16:58:05 +01:00
Ozzieisaacs	2422f782de	Fix #701	2018-11-17 16:51:30 +01:00
Ozzieisaacs	c574b779fb	Added swedish translation	2018-11-17 16:41:47 +01:00
Ozzieisaacs	07d7be176c	Merge remote-tracking branch 'lang/master'	2018-11-17 16:32:55 +01:00
André Santos	c6a5ac7f25	Fix wrong variable usage	2018-11-17 00:28:34 +00:00
André Santos	af216e3697	Verify if certfile and keyfile are paths to actual files This allow to try to not use ssl if the key file path or the certificate file are broken. The files might be missing because the user intentionally removed them but didn't update the settings first. In that situation, this change won't make the app crash, the warning is logged and that way the user has the chance to update the settings.	2018-11-16 23:32:21 +00:00
dalin	947622800c	Update Simplified Chinese translation. Fix #681 in the case of Simplified Chinese.	2018-11-14 18:14:11 +08:00
Ozzieisaacs	399dffba5a	log file name in case of filename not found (#691 )	2018-11-03 18:37:38 +01:00
Ozzieisaacs	8d6d28eb57	Merge remote-tracking branch 'titlelink/titles-links' Fix for #694	2018-11-03 18:02:28 +01:00
Ozzieisaacs	89bddead35	Merge remote-tracking branch 'http_error/beautify-http-errors'	2018-11-03 17:38:52 +01:00
Ozzieisaacs	38c180a9ea	Update translation files	2018-11-03 14:05:02 +01:00
Ozzieisaacs	c05687b896	Fix #668	2018-11-03 13:59:11 +01:00
Ozzieisaacs	c3bec48bc7	Fix #617 Additional texts translated	2018-11-03 13:43:38 +01:00
Ozzieisaacs	c582a70498	Merge remote-tracking branch 'bbb/617'	2018-11-03 10:40:00 +01:00
Ozzieisaacs	0df35dcfea	Update Updater	2018-11-01 13:47:05 +01:00
Ozzieisaacs	cc7dcfb35a	Update Updater Bugfix author in opds-feed	2018-11-01 13:44:00 +01:00
Ozzieisaacs	c1818e8f36	Fix for #672	2018-10-30 22:33:19 +01:00
Ozzieisaacs	ee85492c7d	Fix #662	2018-10-30 21:47:33 +01:00
Ozzieisaacs	5fc742c9c4	Fix #690	2018-10-30 19:29:33 +01:00
Ozzieisaacs	3f83be00fd	Fix #687	2018-10-29 20:38:09 +01:00
Ozzieisaacs	6ec9bc9e5c	Bugfix Publisher (upper/lower case, remove publisher, publisher visibility on new users) 404 messages on non existing categorys, languages, series Updated Testresult	2018-10-28 21:33:12 +01:00
Ozzieisaacs	e080c74032	Merge remote-tracking branch 'ru-translation/patch-2'	2018-10-28 14:10:06 +01:00
OzzieIsaacs	58df19972f	Merge remote-tracking branch 'hungarian/loc-hu' Update spanish language	2018-10-15 20:33:54 +02:00
Jim Ma	4b76b8400d	Add OAuth link&unlink in user profile	2018-10-14 16:51:00 +08:00
Jim Ma	1abbcfa3c6	Add OAuth support: GitHub & Google	2018-10-14 16:51:00 +08:00
otapi	9b4ca22254	Update shelf.html	2018-10-11 18:39:31 +02:00
otapi	c6d3613e57	Add UI link button to shelves	2018-10-11 18:20:38 +02:00
otapi	1201d4086f	Few termchanges	2018-10-11 18:14:57 +02:00
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	2018-10-10 23:01:05 +02:00
Chintogtokh Batbold	13883db5a0	Add anchor tags to titles	2018-10-09 11:52:16 +00:00
otapi	922e21438c	Minor fix	2018-10-06 21:42:03 +02:00
otapi	32366ab1ba	HU translation fixes	2018-10-06 21:32:53 +02:00
otapi	62d172f1e0	Delete dummy	2018-10-06 21:05:32 +02:00
otapi	67ecc2c088	HU translation	2018-10-06 21:04:55 +02:00
otapi	81a3b85c07	Create dummy	2018-10-06 21:02:53 +02:00
Victorhck	c09b7f39a5	spanish translation finished	2018-10-05 11:28:06 +02:00
Victorhck	b32ee84d4f	update Spanish translation (WIP	2018-10-04 13:02:25 +02:00
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	2018-10-03 15:58:37 -04:00
Ozzie Isaacs	7253f583cf	Fix #650 Improved testablility Added feedback for book_edit -> stay on edit page	2018-10-03 21:18:08 +02:00
bodybybuddha	54f8680058	Merge branch 'master' of https://github.com/janeczku/calibre-web into 617	2018-10-03 11:58:25 -04:00
OzzieIsaacs	40cc25de7a	Merge remote-tracking branch 'bbb/621' Fixes after testing	2018-10-03 14:03:08 +02:00
bodybybuddha	d8107fb50f	Addressed Codacy trailing space items ... again	2018-10-02 10:22:01 -04:00
bodybybuddha	46b2c9919a	Fix for #295 Allow for azw and azw3 files to be "sent" to kindle - these books are actually converted to mobi first	2018-10-01 15:35:51 -04:00
bodybybuddha	1144d97bc1	Fixed updating new book format to be all caps in database This keeps us inline with calibre's behavior.	2018-10-01 15:34:16 -04:00
bodybybuddha	5d34fd7fec	Send to Kindle button precheck added Based on existing book formats and which converter (if any) determine if button can be seen.	2018-10-01 14:19:29 -04:00
Virgil Grigoras	a798dc94a9	Satisfy "Codacy/PR Quality Review"	2018-10-01 10:45:51 +02:00
Virgil Grigoras	60e9d01d27	Beautify http errors	2018-10-01 10:35:13 +02:00
Virgil Grigoras	1ac9b3d837	Update OPDS-part to display publishers	2018-09-30 18:48:36 +02:00
Virgil Grigoras	6a007ec881	fix indentations	2018-09-30 18:42:48 +02:00
Virgil Grigoras	5129bc3601	Add entry for publishers to the left menu (+ setting for showing / hiding) + separate publisher page	2018-09-30 18:30:24 +02:00
bodybybuddha	1b363ac720	Merged master into 617 - fixed import copy conflict	2018-09-30 11:37:21 -04:00
Virgil Grigoras	016c7b4b1c	Add ability to store and edit publishers	2018-09-30 14:08:55 +02:00
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	2018-09-30 09:43:20 +02:00
OzzieIsaacs	ffe3dd3de3	Show version of Werkzeug and Jinja2 in stats page	2018-09-29 19:21:04 +02:00
bodybybuddha	a7386ecb8b	Merge branch 'master' of https://github.com/janeczku/calibre-web into 621	2018-09-29 13:13:58 -04:00
bodybybuddha	9b1954f2f0	Merge branch 'master' of https://github.com/janeczku/calibre-web into 617	2018-09-29 13:13:17 -04:00
Ozzie Isaacs	c36b1ed58a	Added additional ids and classes for easier testing	2018-09-29 15:44:42 +02:00
Ozzie Isaacs	cd0fc917d7	Bugfix template rights at creating user Added errormessages for shelf actions Additional ids for better testability	2018-09-27 22:04:57 +02:00
bodybybuddha	29efcf8358	Merge branch 'master' of https://github.com/janeczku/calibre-web into 617	2018-09-23 19:53:47 -04:00
bodybybuddha	d2e74a27cd	Merge branch 'master' of https://github.com/janeczku/calibre-web into 621	2018-09-23 19:51:32 -04:00
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)	2018-09-23 19:15:50 +02:00
OzzieIsaacs	cab98a9165	Update translation files	2018-09-23 19:03:14 +02:00
OzzieIsaacs	aa5127cd16	Merge remote-tracking branch 'lxml/master'	2018-09-23 18:58:08 +02:00
OzzieIsaacs	b841baf714	Comment for adding publishers	2018-09-23 18:56:19 +02:00
eddriesen	522e897fee	Updated Dutch translation to current codebase As requested, A Dutch update	2018-09-23 15:52:11 +02:00
Fatih Ka	76e3be58e6	Delete book fixed There was an incorrect parameter.	2018-09-19 21:38:40 +03:00
bodybybuddha	b4122e9858	Partial fix to #617 . Local status messages now work.	2018-09-19 11:26:52 -04:00
trasba	3fa41d0e4a	added formats for upload and conversion added formats for upload and conversion (html, rtf, odt)	2018-09-17 21:55:41 +02:00
bodybybuddha	be0ddf25e4	Fix for #621 - Login page always in english	2018-09-17 13:03:29 -04:00
OzzieIsaacs	80e1a6910d	Fix Updater	2018-09-14 21:18:20 +02:00
OzzieIsaacs	b5ef63d327	Removed fixed update Informations	2018-09-14 21:16:09 +02:00
OzzieIsaacs	4eeeb02b1d	Merge remote-tracking branch 'update_check/master'	2018-09-14 21:12:45 +02:00
OzzieIsaacs	36d26f2089	Merge remote-tracking branch '625/625' Update russian translation	2018-09-14 20:36:45 +02:00
bodybybuddha	03dc179bc3	Fixed Codacy Issues	2018-09-14 10:35:01 -04:00
bodybybuddha	89c0904ac9	Fix to #625 - Check to see if target book format already exists before executing conversion.	2018-09-13 21:24:21 -04:00
Admiral Laser Beard	21582f097e	update translation	2018-09-14 00:06:53 +03:00
OzzieIsaacs	968cddf2b0	Fix for #620	2018-09-10 19:31:56 +02:00
Virgil Grigoras	e08eccba5a	Satisfy "Codacy/PR Quality Review"	2018-09-10 18:21:44 +02:00
Virgil Grigoras	50ded1afc1	typo fix	2018-09-10 11:28:32 +02:00
Virgil Grigoras	b2b092c190	Bugfix for not displaying information when there is no update available + simplification	2018-09-10 11:20:34 +02:00
Virgil Grigoras	f7872aded0	Own function for getting the current commit hash and datetime	2018-09-10 10:42:28 +02:00
Virgil Grigoras	cb5adb3a31	Display "what's new" information for newer versions than the current one	2018-09-09 21:54:51 +02:00
OzzieIsaacs	01fb8ee681	Fix #609 Removed formats which are not possible to convert from list of convertable books Update language files to be po-edit compatible	2018-09-09 18:17:15 +02:00
Virgil Grigoras	9616562a76	Revert change from #10478594240d17f2bd73cda597439ade665a1e5c (move general information back to configuration block)	2018-09-09 14:18:56 +02:00
Virgil Grigoras	cfae6e893a	Move update relevant parts to own section	2018-09-09 14:12:12 +02:00
Virgil Grigoras	1047859424	Place general information (db location, amount of books...) on top	2018-09-09 14:01:28 +02:00
Virgil Grigoras	354eac1512	fix html errors and formating	2018-09-09 13:51:28 +02:00
Virgil Grigoras	6e2dbb7cd6	move current commit hash to its own file	2018-09-09 13:00:46 +02:00
Virgil Grigoras	f477d48c7c	More robust handling while checking for new updates	2018-09-09 11:46:00 +02:00
OzzieIsaacs	bb7d2c6273	Update Language translation table (now including the locale language) Fix #602 Fix for #593	2018-09-09 10:13:08 +02:00
OzzieIsaacs	79ee07ea54	Fix for python3 and pickle	2018-09-09 09:41:46 +02:00
OzzieIsaacs	ce6cde545b	Update french language	2018-09-08 21:16:56 +02:00
OzzieIsaacs	919de60e8d	Final fix #615	2018-09-08 14:58:00 +02:00
OzzieIsaacs	a5d15a19de	Update Translation "->'	2018-09-08 14:50:52 +02:00
Ozzie Isaacs	2de41a5c86	improvement for #615	2018-09-08 13:27:28 +02:00
OzzieIsaacs	9d0f583d4f	Updated french and chinese language. Thanks to @idalin and Olivier Fixed bug some translations are not shown	2018-09-08 12:28:48 +02:00
OzzieIsaacs	2f1fe60cd6	Merge remote-tracking branch 'chinese_translation/master'	2018-09-08 09:28:12 +02:00
OzzieIsaacs	0091006aad	Fix #611 Fix for #615	2018-09-07 20:04:35 +02:00
OzzieIsaacs	b48de7dc77	Fix for #609	2018-09-06 20:54:48 +02:00
idalin	b103ecdb5c	update simplified Chinese	2018-09-06 16:59:30 +08:00
OzzieIsaacs	0bcb20f674	Fix #604 Added missing translation for "select option"	2018-09-03 19:12:15 +02:00
Virgil Grigoras	db9561db89	Show add to shelf button only when there is a result	2018-09-02 22:21:37 +02:00
OzzieIsaacs	0e1711631c	Fix for #600 publisher-info is shown on edit page (#599)	2018-09-02 17:21:01 +02:00
OzzieIsaacs	3f2d0ea7bb	Fix #601 Removed trailing comma on edit page	2018-09-02 14:05:09 +02:00
OzzieIsaacs	66824ff4e4	Fix #576	2018-09-02 13:58:17 +02:00
OzzieIsaacs	06ffa5e66d	Fix displaying random books with no author entry Code cosmentics for opds feed Narrowed exceptions on language not found Fix password changing	2018-09-02 11:48:58 +02:00
OzzieIsaacs	a4190f39de	Fix #577	2018-09-02 08:54:46 +02:00
OzzieIsaacs	4dd6c55c38	Fix for #587 (Better handling of errors in sending email)	2018-09-02 08:41:09 +02:00
OzzieIsaacs	c3b0492834	Refactored make_mobi and convert_ebook functions	2018-08-31 15:19:48 +02:00
OzzieIsaacs	4a95404e17	Merge remote-tracking branch 'Convert_all/ebookconvert-any' # Conflicts: # cps/web.py	2018-08-31 15:00:22 +02:00
OzzieIsaacs	3f35200a0b	Merge remote-tracking branch 'Comic/comic_server' # Conflicts: # cps/helper.py # cps/static/js/archive.js # cps/static/js/io.js # cps/static/js/kthoom.js # cps/static/js/unrar.js # cps/static/js/untar.js # cps/static/js/unzip.js # cps/templates/config_edit.html # cps/templates/detail.html # cps/templates/readcbr.html # cps/templates/stats.html # cps/ub.py # cps/web.py # optional-requirements.txt	2018-08-31 10:47:58 +02:00
OzzieIsaacs	9c889d1681	Fix #597 Updated language files	2018-08-30 09:32:42 +02:00
bodybybuddha	22ecdfd2bc	Refactor edit_books.js for unused code; re-add glyphicon to convert button; Add form validation for convert button	2018-08-29 00:49:50 -04:00
bodybybuddha	4b006fba99	Re-commit: #584 & #587 Convert any book format to another format	2018-08-28 23:32:30 -04:00
bodybybuddha	fc78d1ee07	Added exception catching for file format check	2018-08-28 19:22:17 -04:00
bodybybuddha	4f386c8a00	Updated GUI buttons for ebook-convert feature	2018-08-28 19:13:04 -04:00
bodybybuddha	3ec000ad85	Merge branch 'master' of https://github.com/janeczku/calibre-web into ebookconvert-any	2018-08-28 09:56:08 -04:00
OzzieIsaacs	a7a91ae54c	Added posibility to upload cover from local drive (#439 ) Updated language files	2018-08-28 14:07:48 +02:00
OzzieIsaacs	3a37183e25	Included khmer language Further unified naming	2018-08-28 10:29:11 +02:00
OzzieIsaacs	2453786174	Limit registering domains	2018-08-28 09:42:19 +02:00
bodybybuddha	e160efbdac	Add GUI functions for ebookconvert any format feature	2018-08-27 21:27:16 -04:00
OzzieIsaacs	cedc183987	Fix #590 , #589 . Unified wording Calibre-Web Replaced one table on admin page, deleted password column Removed spaces on layout page Removed uesless commit calls during db migration Implementation of registering by email	2018-08-27 22:08:55 +02:00
OzzieIsaacs	f6ab724020	Fix generating links on tasks pafge	2018-08-22 21:55:26 +02:00
OzzieIsaacs	72fff2a297	Update for running calibre-convert in docker	2018-08-22 21:24:28 +02:00
OzzieIsaacs	7917347508	Revert accidently commited change in admin.html (#580 )	2018-08-20 06:59:23 +02:00
OzzieIsaacs	5889535355	Bugfix gdrive download Books Bugfix pagination Fix Error messages massadd of books to shelf	2018-08-19 13:36:04 +02:00
OzzieIsaacs	d414bf3263	Massadd of books to shelfs (#203 , #404 ) from advanced search Code cosmetics bugfix error message on failed emails refactored language name generation	2018-08-19 10:14:20 +02:00
Ozzie Isaacs	34abf95fb2	Fix for empty filename during edit	2018-08-18 22:00:43 +02:00
OzzieIsaacs	7dac87fa5d	Code cosmetics unrar	2018-08-18 18:38:28 +02:00
OzzieIsaacs	d2ea10e90e	Improved OPDS compability (#579 ) Bootstrap-table loads locally and no longer from CDN Localized commit date on admin page	2018-08-18 17:35:23 +02:00
OzzieIsaacs	9ace4d3372	Updated german translation Bugfix additional format upload without extension Bugfix additional format upload to gdrive pathes assembled by os.path.join	2018-08-18 12:15:32 +02:00
OzzieIsaacs	273b1c3fa8	Fix calibre-converter/kindlegen handling on windows and python3	2018-08-18 08:48:42 +02:00
OzzieIsaacs	cdb1b52652	Bugfix Get gdrive instances (#554 , #525 ) Metadata.db download works again removed DEVELOPMENT constant removed db logging in debug mode (too, noisy, to less information) code refactoring url_for_other_page feed languge set to en-EN update status shos local time instead of UTC Error handling (back to index page) in case of gdrive authenticate aborted Mistyping page register fixed Mistyping bokk fixed Added uploaded books to tasklist (#442) Error handling for failed file update added Code refactoring worker thread Tasks now never show any decimal values Converter function unified removed shell from subprocess call preparation for limiting domain for registering emails Book series can now increased in 0.1 steps (#562) Accordion panels in config are now usable on touch devices like iPad (#545) Gdrive authenticate button only visible after logged in (#525) Fixed misstyping in german translation	2018-08-16 21:17:26 +02:00
OzzieIsaacs	f8132f4d02	Fix for #574	2018-08-14 17:38:38 +02:00
OzzieIsaacs	bb5d7d7bc0	Fix for #574	2018-08-13 20:43:18 +02:00
OzzieIsaacs	c38f331b6f	Fix for #575 Fix no pydrive dependency installed Fix sending email on python3	2018-08-13 19:43:50 +02:00
OzzieIsaacs	fac0921acf	Fix in exception of emailing	2018-08-13 17:40:11 +02:00
OzzieIsaacs	5ef70890d9	Search for custom columns implemented #494 Search for ratings related to #559 Search description #572 code cosmetics	2018-08-12 18:21:57 +02:00
OzzieIsaacs	791f4a8078	Fix #455	2018-08-12 13:31:18 +02:00
Ozzie Isaacs	7be328c535	Converting ebooks in background additional sorting of tasklist according to date and runtime codecosmetics	2018-08-12 09:29:57 +02:00
OzzieIsaacs	11b798a01c	Fix #571	2018-08-08 20:03:11 +02:00
OzzieIsaacs	1e5cb29fc9	#571 (temporary fix)	2018-08-08 06:54:38 +02:00
OzzieIsaacs	5ec9051f2e	Add charset to opds feed for read books	2018-08-07 18:19:08 +02:00
Unknown	fdabb804cf	Call print as a function	2018-08-07 17:19:25 +02:00
Ozzie Isaacs	3db682cd15	Merge remote-tracking branch 'del_books/delete-book-formats' # Conflicts: # cps/helper.py Implemented delete on gdrive	2018-08-04 18:22:43 +02:00
Ozzie Isaacs	f81fbaf542	Fix #568 (encoding problem in fb2 upload)	2018-08-04 17:08:32 +02:00
Ozzie Isaacs	82fe282e9b	Converting books from gdrive implemented	2018-08-04 14:00:51 +02:00
Ozzie Isaacs	ff1b479188	Added name of book emailed to task list Implemented emailing of books from gdrive (converting not implemented yet)	2018-08-04 10:56:42 +02:00
OzzieIsaacs	dbf55d6f41	Fix #565	2018-08-01 18:34:54 +02:00
Ozzie Isaacs	7a38c05f12	Stop e-mail-thread on quit or restart	2018-07-31 20:19:43 +02:00
OzzieIsaacs	b0cbd0a37a	Added feature to send emails in a background-task	2018-07-30 20:12:41 +02:00
Ozzie Isaacs	4d6299f0d5	Improved gdrive error messages (#554 )	2018-07-29 17:51:23 +02:00
Ozzie Isaacs	6a76dce870	Fix change user (in case of reboot required) Fix no existing database Update required version for sqlalchemy	2018-07-28 17:19:08 +02:00
OzzieIsaacs	9d161129d9	Fix for #554	2018-07-25 21:56:25 +02:00
OzzieIsaacs	f8c9777668	Merge remote-tracking branch 'show_url/url-links'	2018-07-24 20:46:04 +02:00
OzzieIsaacs	ab63d08d71	Fix for linux subprocess calibre-convert	2018-07-24 20:43:40 +02:00
Ben Bennett	b271b5f686	Changed the args to subprocess.Popen to pass args to the command Before the command was not working correctly to check the calibre version since it seemed to be treating the entire string as the command. So when ' --version' was added it was breaking. I changed the format to pass the command and args as a list and it seems to work correctly.	2018-07-23 11:53:44 -04:00
PJ Eby	83db0f9ad5	Render 'url:' ID type as a link Calibre allows 'url:' as a kind of book identifier and shows it in the UI as a link; this change makes calibre-web do the same.	2018-07-18 15:36:51 -04:00
OzzieIsaacs	2449b4049b	Code cleaning Stats page Enable calibre's ebook-convert as converter for mobi files (#411, #533)	2018-07-18 20:21:44 +02:00
OzzieIsaacs	ae0c5d7ec2	Fix for #549	2018-07-18 18:48:41 +02:00
OzzieIsaacs	3a9a59b751	Fix #497	2018-07-17 18:24:12 +02:00
OzzieIsaacs	a53b7908f3	Fix #417	2018-07-16 20:37:46 +02:00
OzzieIsaacs	aaa706069c	Implemented #417	2018-07-16 19:04:18 +02:00
OzzieIsaacs	8896b3c5d2	Requests from #454	2018-07-15 18:50:35 +02:00
OzzieIsaacs	6f36eef51d	Fix #544 (missed some config options) Added lxml to stats sceen	2018-07-15 16:27:16 +02:00
OzzieIsaacs	f0459d577b	Bugfix #409	2018-07-15 15:14:26 +02:00
OzzieIsaacs	0e83546d40	- Updated translation (it's now always Google Drive) - Integrated feature #409 (linking read status from calibre)	2018-07-15 15:08:06 +02:00
OzzieIsaacs	694620790c	#543 Deleting of non exisiting folders gives no internal error anymore re-inserting title sort function during upload earlier	2018-07-14 23:03:54 +02:00
OzzieIsaacs	8d406117ce	Fix #432 added more checks for deleting books	2018-07-14 19:40:59 +02:00
OzzieIsaacs	eb65647774	Fix #539 Update Translations	2018-07-14 19:03:54 +02:00
OzzieIsaacs	31b703db62	Delete on gdrive working Moving author on gdrive working bugfix delete on normal folders	2018-07-14 13:48:51 +02:00
OzzieIsaacs	a8040ad3fa	#538 : -Refactoring gdrive and file handling -Improved error handling for gdrive -bugfix "gdrive stopping after a while" - Renaming book title working - Still Bugs in upload file to gdrive and renaming author	2018-07-14 08:31:52 +02:00
OzzieIsaacs	413b10c58e	Bugfix gdrive Still open: gdrive.db entries aren't cleared upon change, gdrive.db is only working after restart if just enabled	2018-07-09 20:30:38 +02:00
OzzieIsaacs	404b29b979	Refactored WSGIServer handling Restart of gevent server now working	2018-07-09 18:47:36 +02:00
OzzieIsaacs	a298470479	Fix #526 . Books are now initially stored according to their id.	2018-07-08 10:41:00 +02:00
OzzieIsaacs	4f1754c1e4	Improved errorhandling during editing of books	2018-07-08 09:28:35 +02:00
OzzieIsaacs	fbe2f5384b	Prevent error on windows during upload and during rename of metadata.db in combinstion with gdrive	2018-07-07 16:27:21 +02:00
OzzieIsaacs	76d8cbdf57	Logging of details for gdrive integration only on debug level fix generic cover path browser reading for cbx and epub files no longer creates temp files on server browser reading for cbx and epub files working (#502, #520)	2018-07-07 15:48:50 +02:00
OzzieIsaacs	420f685fd9	Added logging information for errors	2018-07-07 12:27:07 +02:00
OzzieIsaacs	30d9991daf	Merge remote-tracking branch 'Goodread_fix/patch-test'	2018-07-07 12:21:32 +02:00
OzzieIsaacs	9ca454730c	Bugfix finding settings.yaml and dgrive_credentials file	2018-07-07 12:00:46 +02:00
OzzieIsaacs	7d3fadb685	Improved compability for gevent (version 1.3.x & Windows) Bugfix gdrive naming of client_secrets.json Bugfix handling of gdrive with working folder not cps root folder	2018-07-07 11:41:39 +02:00
OzzieIsaacs	c66bb54478	Fix #534	2018-07-03 19:34:29 +02:00
Ozzie Isaacs	a06748e348	Update settings.yaml file	2018-06-07 16:13:27 +03:00
SiphonSquirrel	30799996c9	Merge remote-tracking branch 'remotes/origin/goodreads-fix' into patch-test	2018-06-03 21:19:19 -04:00
SiphonSquirrel	274d2d9d21	Improve rename logic for directory name collisions.	2018-06-03 21:17:22 -04:00
Ozzie Isaacs	7d5302b47f	Fix accidentially deleted gevent ds	2018-06-02 17:12:54 +02:00
OzzieIsaacs	bf44774f22	Tags in detail view are sorted now	2018-06-02 17:02:18 +02:00
OzzieIsaacs	204cd504a9	- Completly new setup of GDrive (every data is taken from client_secret.json file) - If cover on Google Drive is missing, the generic cover will be used - Better error handling during configuration of google drive (missing hook callback verification, missing files) - less errors on console during use of Gdrive, more log file output in case of error - removed standalone flask development mode - removed gdrive template file and vendor setup script	2018-06-02 10:59:34 +02:00
Charles	7142836622	Adding exception handling to GoodreadsClient if site is down	2018-05-31 18:28:16 -04:00
OzzieIsaacs	43a391d1bd	Redownloaded glyphicon font files #515	2018-05-31 09:33:43 +02:00
Eric Le Lay	513355e2e5	fix #513 OPDS updated date format invalid per Atom specification replace space separating date from time with 'T'	2018-05-26 17:21:20 +02:00
Ozzie Isaacs	9867959916	Changed calibre to calibre-web	2018-05-06 16:48:49 +02:00
OzzieIsaacs	1f9527f0e1	Fix #496	2018-05-06 09:55:08 +02:00
Andriy Zasypkin	b2ba8bceb2	tags in detail view are sorted	2018-04-22 14:43:43 -04:00
OzzieIsaacs	66c1966b44	Update french translation	2018-04-13 21:16:37 +02:00
OzzieIsaacs	c27805b4e7	Bugfix Updater python3 Bugfix Updater in case of error	2018-04-10 18:50:04 +02:00
OzzieIsaacs	7a20c14dea	Integrated caliblur css	2018-04-03 17:59:06 +02:00
OzzieIsaacs	671bf5cf8d	Integrated #454 (css is loaded remote)	2018-04-02 10:09:19 +02:00
OzzieIsaacs	e24f837007	missing file from last commit	2018-04-01 19:32:19 +02:00
OzzieIsaacs	62f7674761	fixed #410 advanced search for publishing date fixed misstyping in italian language removed next to "me" after login	2018-04-01 19:31:41 +02:00
OzzieIsaacs	6a2449ffaf	Fix for SSL/NonSSL and gevent	2018-03-31 20:19:37 +02:00
OzzieIsaacs	691a4a88e6	Added support for svg in comics (not working in IE11)	2018-03-31 17:05:15 +02:00
OzzieIsaacs	8bfd3c7e4f	Fix #476	2018-03-31 13:30:22 +02:00
OzzieIsaacs	97adb36f1b	Bugfix Upload Message Improved errorhandling at import imagemagick	2018-03-31 08:00:51 +02:00
OzzieIsaacs	af5a897d1d	Added SSL Options (#416 )	2018-03-30 21:20:47 +02:00
OzzieIsaacs	d01d7b91a8	Added error messages in log and UI if cover url can't downloaded, changed label for cover URL to clarify function #449	2018-03-27 20:42:19 +02:00
OzzieIsaacs	f6ece5fe72	Fix for #448	2018-03-27 20:18:11 +02:00
OzzieIsaacs	ea6a957c05	Changed mulitple books upload to single button	2018-03-26 20:50:04 +02:00
OzzieIsaacs	ee5677f376	Merge remote-tracking branch 'multiload/master'	2018-03-26 20:39:49 +02:00
Mingyue Gao	c6f568534f	fix(template): download book with capital ext by kindle's browser	2018-03-23 22:39:31 +01:00
OzzieIsaacs	f019d58b4d	Fix for unicode search (#426 )	2018-03-10 20:42:18 +01:00
Faisal Alghamdi	0afa7cbafd	duplicate code removed	2018-03-07 10:40:48 +03:00
Faisal Alghamdi	78caf3379d	remove unused code	2018-03-07 09:59:47 +03:00
Faisal Alghamdi	43eb3b6f9c	button names fixed	2018-03-06 15:41:24 +03:00
Faisal Alghamdi	ff9ee82451	adding multiple files upload feature	2018-03-06 15:31:46 +03:00
OzzieIsaacs	ff2d53b998	Integrated japapanese translation. Updated german translation	2018-02-13 16:44:57 +01:00
OzzieIsaacs	0b92a718ba	Merge remote-tracking branch 'Translation/master'	2018-02-13 16:31:55 +01:00
SpaceWhite	51fbb07124	Add japanese translation	2018-02-09 04:35:04 -05:00
OzzieIsaacs	21c2ee4d63	Fix for #443	2018-02-04 08:05:08 +01:00
OzzieIsaacs	7371803184	Fix for #444	2018-02-04 07:37:40 +01:00
OzzieIsaacs	4346e947e3	Fix for #447	2018-02-04 07:21:08 +01:00
OzzieIsaacs	199b1c4820	Changed gdrive base uri handling (#431 )	2018-01-20 08:27:44 +01:00
Andriy Zasypkin	6b4d7674b5	use isinstance instead of type	2018-01-16 09:30:26 -05:00
OzzieIsaacs	e99e93db1f	#424 , #437 Added "apple-touch-icon" for apple devices	2018-01-14 14:15:07 +01:00
OzzieIsaacs	8716054dcf	Fix #436	2018-01-13 14:11:59 +01:00
Andriy Zasypkin	fb41aa8b57	removed debug statement from production	2018-01-11 08:49:49 -05:00
Andriy Zasypkin	28dac34119	auto select format if only one	2018-01-11 08:43:39 -05:00
OzzieIsaacs	2850a84bbc	Fix for deleting books if book path contains no path (#432 )	2018-01-10 21:16:51 +01:00
OzzieIsaacs	07d6ba094b	Fix for deleting books in shelfs (#419 )	2018-01-06 12:08:55 +01:00
OzzieIsaacs	0329306031	Favicon replaced (#424 ) with hiher resolution	2018-01-06 11:36:23 +01:00
Andriy Zasypkin	e66068d699	should fix testing error	2017-12-20 12:10:47 -05:00
Andriy Zasypkin	6b6a457a9d	comic reader updated extentions	2017-12-15 12:14:20 -05:00
Andriy Zasypkin	9249390043	comic book read file order fixed	2017-12-14 10:39:25 -05:00
OzzieIsaacs	03e2a1e73b	Restored click on progressbar	2017-12-10 14:02:49 +01:00
Yury Tilis	2fe03961bb	-Added a more subtle progress bar which only shows the page number on hover -Added Current page indicator to the thumbnail list, as well as a hover state -Thumbnail list now scrolls to the current page on open or page change -Added @andy29485's request for controlling page with space/shift+space -Added the book title to the top of the page -Fixed IE11 failing on imagecallback	2017-12-10 02:43:51 -05:00
OzzieIsaacs	4c05b3db67	Present dates for updater in local date format	2017-12-02 18:42:21 +01:00
OzzieIsaacs	319077aea9	Import covers from comic files during upload	2017-12-02 17:33:55 +01:00
OzzieIsaacs	5809acfa9e	anonymous user now have always the right to read books (as any other user, too) (Fix #287)	2017-12-02 14:25:18 +01:00
OzzieIsaacs	b74a075aa6	Added posibility to change settings db via command line for multiple instances (#247 )	2017-12-02 11:15:51 +01:00
OzzieIsaacs	152f7857c9	Fix #397	2017-12-01 15:33:55 +01:00
OzzieIsaacs	4e11272023	Working on IE11	2017-12-01 10:10:42 +01:00
OzzieIsaacs	cbb236ba7b	Added visiblilty of shelfs to opds catalog (#267 )	2017-12-01 07:53:52 +01:00
OzzieIsaacs	aee5ca0e06	#396 implemented	2017-11-30 20:12:13 +01:00
OzzieIsaacs	f1fac28203	Improved error handling for renaming authors and titles (changes related to filesystem and not only to database)	2017-11-30 16:49:46 +01:00
OzzieIsaacs	f890fc1553	New progress bar	2017-11-29 15:54:17 +01:00
OzzieIsaacs	b4aede78bc	Fix for the piping problem (#395 )	2017-11-28 08:54:21 +01:00
OzzieIsaacs	03ab03f06e	Code cosmetics	2017-11-22 22:08:29 +01:00
OzzieIsaacs	0943d50876	Code cosmetics Bugfix click on progressbar	2017-11-21 12:46:03 +01:00
OzzieIsaacs	aae9e285a8	Code cosmetics	2017-11-20 21:54:55 +01:00
OzzieIsaacs	d76f812310	Fixed empty return on getcomic Python 3 compability (the easy way)	2017-11-20 07:53:52 +01:00
OzzieIsaacs	e7b6963afd	Small improvements for comic reader calls	2017-11-19 20:37:43 +01:00
Andriy Zasypkin	6ab4ff9a3b	Merge branch 'comic_server' into comic_server	2017-11-19 14:09:17 -05:00
OzzieIsaacs	5756785073	Error handling rarfiles	2017-11-19 18:08:55 +01:00
Andriy Zasypkin	ec12181803	added python3 compatibility for comic reader	2017-11-19 08:49:40 -05:00
OzzieIsaacs	9f8cbe8c1f	Merge enhanced UI from ytilis repro	2017-11-19 13:20:59 +01:00
OzzieIsaacs	8c573ff6d8	Unrar/tar and unzip on server side	2017-11-18 10:34:21 +01:00
OzzieIsaacs	6e714f3f16	Fix #391	2017-11-17 18:29:29 +01:00
OzzieIsaacs	211c3b16dd	Fix fror #388	2017-11-15 07:40:17 +01:00
OzzieIsaacs	f045c16c4e	Fix #386	2017-11-13 21:33:36 +01:00
OzzieIsaacs	01d0083fe6	Fix for #376	2017-11-12 19:08:20 +01:00
OzzieIsaacs	b8d45b664a	Typeahead working again Fix for replacing characters in filenames	2017-11-12 18:48:44 +01:00
OzzieIsaacs	ad16194798	Error on deleting non existing book fixed (#382 )	2017-11-12 18:08:13 +01:00
OzzieIsaacs	09f86ee8d4	Fix #385	2017-11-12 14:56:49 +01:00
OzzieIsaacs	8388df202f	Merge remote-tracking branch 'dutch/dutchupdate'	2017-11-12 14:52:31 +01:00
OzzieIsaacs	798cbc7505	Merge remote-tracking branch 'opds/master'	2017-11-12 14:46:19 +01:00
OzzieIsaacs	78744b19d8	Fix #377	2017-11-12 14:10:08 +01:00
OzzieIsaacs	ba54b9a357	Fix #365	2017-11-12 14:06:33 +01:00
OzzieIsaacs	fd39cbaa6f	Fix #363	2017-11-12 13:40:56 +01:00
Thijs van Ulden	5b13171060	Updated Dutch translation	2017-11-05 10:24:35 +01:00
OzzieIsaacs	af8d908bba	Fix #371 , #372	2017-11-01 16:55:51 +01:00
OzzieIsaacs	ae1e7c57d5	Update french translation	2017-11-01 16:10:05 +01:00
Yamakuni	f5e1b38e63	French translation correction	2017-10-26 22:44:16 +02:00
unknown	b4bd7507b6	Merge branch 'master' of git://github.com/janeczku/calibre-web	2017-10-22 14:41:23 +02:00
unknown	674baad49e	lowercasing the input	2017-10-21 22:07:39 +02:00
unknown	4a04ec898e	case-insensitive search for non-ASCII - improved	2017-10-21 21:50:47 +02:00
unknown	d2ea3a6c19	case-insensitive search for non-ASCII	2017-10-20 23:23:16 +02:00
OzzieIsaacs	9182d89128	# Fix 361	2017-10-13 19:31:03 +02:00
Cory Sitko	5e4c8c6c65	fixed is_authenticated check	2017-10-10 20:48:50 -04:00
Cory Sitko	8fd67fb1fc	UserBase methods should be properties not classmethods	2017-10-10 18:14:19 -04:00
Cory Sitko	cc758517e7	updated login_required_if_no_ano to correct switch anonymous on/off when changed in admin	2017-10-10 14:13:28 -04:00
Cory Sitko	7ade2ecd35	make is_active, is_authenticated, and is_anonymous properties on the Anonymous class so that the login_required decorator will work correctly and disable anonymous browsing	2017-10-10 10:18:28 -04:00
OzzieIsaacs	366bf9739b	Fix for #360 and guest accounts	2017-10-09 22:36:47 +02:00
OzzieIsaacs	1eb10be253	Code cosmetics comic reader	2017-10-08 10:41:43 +02:00
OzzieIsaacs	90729de87f	Fix #354 Fix #355 Fix #353 Fix #352 Fix #351	2017-10-06 08:51:34 +02:00
unknown	6855deceef	added corresponding content-type for a downloaded book, otherwise default text/html is used	2017-10-01 20:48:01 +02:00
unknown	0f0c6dde09	changed application/xml to application/atom+xml	2017-10-01 20:24:24 +02:00
unknown	1ada1704b0	excluded read/unread when exposing the catalog to an anonymous user	2017-10-01 18:42:35 +02:00
unknown	3c9f8b151d	added check for anonymous session in read_books, otherwise current_user.id is not defined	2017-10-01 18:41:19 +02:00
unknown	d336f9faa6	fixed OPDS templates	2017-10-01 17:16:57 +02:00
unknown	7ddfa1881b	added FB2 mime type	2017-10-01 17:15:44 +02:00
unknown	70d093b193	unicode gave an NameError with python3	2017-10-01 17:14:20 +02:00
Jonathan Rehm	56c71dd4bf	Disable bookmarking when anonymous users are reading	2017-09-30 10:51:20 -07:00
OzzieIsaacs	0512e5a940	Fix #342	2017-09-30 16:25:29 +02:00
OzzieIsaacs	c56a02bab6	Fix #339	2017-09-30 15:24:18 +02:00
OzzieIsaacs	031a175474	Fix Comic reader	2017-09-24 19:38:15 +02:00
Andriy Zasypkin	442fb23b18	python3 compatibility	2017-09-24 07:52:59 -04:00
OzzieIsaacs	2302db4e06	Merge remote-tracking branch 'adv/fix-douban-rating'	2017-09-22 20:57:24 +02:00
OzzieIsaacs	299cf82921	Merge remote-tracking branch 'translation/master' # Conflicts: # cps/translations/fr/LC_MESSAGES/messages.mo # cps/translations/fr/LC_MESSAGES/messages.po	2017-09-22 20:56:36 +02:00
Yamakuni	85ec9cba1f	New correction of translation	2017-09-21 12:34:06 +02:00
OzzieIsaacs	a6dfcedfdb	Code cosmetics	2017-09-20 21:13:32 +02:00
OzzieIsaacs	0405cec4ac	Code cosmetics Bugfix "Error load settings"	2017-09-18 18:59:08 +02:00
OzzieIsaacs	378a0ca662	Merge remote-tracking branch 'adv/bookmarks'	2017-09-17 20:26:58 +02:00
OzzieIsaacs	2a78a02e0b	Code cosmetics	2017-09-17 19:16:29 +02:00
OzzieIsaacs	34e9ef35f5	Code cosmetics	2017-09-17 15:33:22 +02:00
OzzieIsaacs	a159bb0b97	Code Csmetics kthoom integration	2017-09-17 15:06:01 +02:00
OzzieIsaacs	5b9b36f997	Code cosmetics	2017-09-17 14:51:17 +02:00
OzzieIsaacs	85068d75bf	Update comic reader	2017-09-17 13:37:21 +02:00
OzzieIsaacs	fe4d11fea8	Basi comic reader implementation for cbr, cbz, cbt files based on kthoom (#63 , #126 )	2017-09-17 12:36:32 +02:00
OzzieIsaacs	4582aebec1	Bugfix gdriveutils	2017-09-17 10:54:23 +02:00
OzzieIsaacs	b6b73d39c2	Fix #329 Code cosmetics	2017-09-17 07:15:08 +02:00
OzzieIsaacs	b6f06658a2	Merge remote-tracking branch 'ipv6/ipv4only'	2017-09-16 20:18:34 +02:00
OzzieIsaacs	dfd3b40865	Fix #325	2017-09-16 19:57:00 +02:00
OzzieIsaacs	bde92113d4	Bugfix Datepicker	2017-09-16 19:30:49 +02:00
OzzieIsaacs	f87800d11c	Merge remote-tracking branch 'meta/upload_new_format_of_existing_book'	2017-09-16 18:55:34 +02:00
OzzieIsaacs	7acf4d40a4	Merge remote-tracking branch 'adv/escape-filename'	2017-09-16 18:53:33 +02:00
OzzieIsaacs	2ef6dc30bd	Added italian translation	2017-09-16 16:58:42 +02:00
OzzieIsaacs	abadaa3f1d	Merge remote-tracking branch 'l/master'	2017-09-16 08:06:35 +02:00
OzzieIsaacs	b30a73c505	Merge remote-tracking branch 'adv/def-variables'	2017-09-16 07:55:44 +02:00
OzzieIsaacs	af0cefa4ac	Update translations	2017-09-16 07:52:53 +02:00
OzzieIsaacs	e26c8a1e46	Merge remote-tracking branch 'd/patch-1'	2017-09-16 07:40:29 +02:00
OzzieIsaacs	5e370fb4b3	Merge remote-tracking branch 'y/master'	2017-09-16 07:38:50 +02:00
Yamakuni	f147c072c6	French translation Add and correct	2017-09-14 12:03:36 +02:00
Wouter Dijk	c048a96e07	Updated Dutch translations I've added some missing translations and edit some faulty ones. Not finished yet, will continue later on! ;-)	2017-09-14 10:36:39 +02:00
Ainsley Pereira	993c56d021	Fix syntax error	2017-09-12 21:11:52 +01:00
Ainsley Pereira	1ce6893fa8	Exception isn't thrown until we call serve_forever, so that must be in the try block	2017-09-12 21:06:58 +01:00
Ainsley Pereira	b8b88183c3	Use IPv4-only WSGI start up as a fallback only when the IPv6/IPv4 one didn't work	2017-09-12 20:49:38 +01:00
Ainsley Pereira	a75c393922	Merge remote-tracking branch 'upstream/master'	2017-09-12 20:34:11 +01:00
Jonathan Rehm	29f21b148b	Translate 10-based rating to 5-based	2017-09-11 09:58:39 -07:00
Jonathan Rehm	e806494b54	Ensure variables exist before they're used	2017-09-11 09:24:20 -07:00
kyos	8937599ba7	Fixed codacy code control	2017-09-11 17:18:11 +02:00
kyos	cbf2bb450d	Fixed issue calculating filesize of the uploaded book	2017-09-11 11:47:39 +02:00
kyos	be15f3781f	Fixed issue reported by Jkrehm to prevent filesize to fail	2017-09-11 11:17:29 +02:00
kyos	3366aae6c7	Merge remote-tracking branch 'origin/upload_new_format_of_existing_book' into upload_new_format_of_existing_book # Conflicts: # cps/static/css/style.css	2017-09-11 10:48:57 +02:00
kyos	e5b4bed01c	Fixed codacy requirements	2017-09-11 10:48:30 +02:00
kyos	9086f4e0e7	Added option to upload a new format to a given book	2017-09-11 10:48:30 +02:00
Jonathan Rehm	a4f81dd812	Do not include empty strings in list of bookmarks	2017-09-10 15:38:24 -07:00
OzzieIsaacs	c9f36a4d1a	Merge remote-tracking branch 'adv/bookmarks'	2017-09-10 15:00:27 +02:00
Torben Mohrfeldt	94f8cc247c	Reflect title in the logo	2017-09-09 23:59:06 +02:00
OzzieIsaacs	b6b5313f2d	Fix for #315	2017-09-09 14:23:25 +02:00
teflontoni	4527693fe3	Move "Show mature content" Checkbox In order to make the option safe and sane we move the corresponding checkbox to the settings that need administrator privileges.	2017-09-08 15:47:22 +02:00
Louis Jencka	b3217496d1	Add progress bar to upload form	2017-09-02 11:51:11 -06:00
OzzieIsaacs	81219663fe	Update translation	2017-09-01 20:39:56 +02:00
OzzieIsaacs	c959a1ccc6	Merge remote-tracking branch 'iss/typo'	2017-09-01 20:31:01 +02:00
OzzieIsaacs	f860694487	Merge remote-tracking branch 'adv/goodreads-more-by'	2017-09-01 20:29:45 +02:00
OzzieIsaacs	429f4a11a9	Merge remote-tracking branch 'adv/es5-syntax'	2017-09-01 20:12:22 +02:00
OzzieIsaacs	5ee1950828	Merge remote-tracking branch 'adv/sqlalchemy-bool'	2017-09-01 20:11:48 +02:00
Jonathan Rehm	58abc1d024	Fuzzy match book titles to eliminate duplicates Titles with a Levenshtein ratio of 70% or greater are considered duplicates.	2017-08-29 07:15:33 -07:00
Jonathan Rehm	53c687251e	Show "More by" on author page Uses Goodread's list of author's books, filtering out the books that are already in the user's library. Requires the Goodreads dependency and API information.	2017-08-29 07:15:33 -07:00
Jonathan Rehm	6b8de017ab	Use SQLAlchemy boolean Seems to make a difference sometimes. Ref #300	2017-08-29 07:14:57 -07:00
Jonathan Rehm	282837c7c5	Use ES5 syntax	2017-08-29 07:14:32 -07:00
Jonathan Rehm	8e1cfa1cbf	Re-apply `db_filter` Accidentally removed when the language and content filters were moved to `common_filters`.	2017-08-29 07:13:31 -07:00
Ivan Smirnov	12c98157d5	fix typo:: diffrent -> different	2017-08-27 19:31:58 -07:00
OzzieIsaacs	a8b53ab38a	Merge remote-tracking branch 'adv/common-filters'	2017-08-27 09:36:02 +02:00
OzzieIsaacs	62f6bb4e64	Remove In author marker on authors page	2017-08-27 09:27:55 +02:00
OzzieIsaacs	d5e1dba0fe	Merge remote-tracking branch 'adv/goodreads-more-by'	2017-08-27 09:24:02 +02:00
Jonathan Rehm	3213bf50b3	Move common filters into function Instead of duplicating functionality across lots of functions, combine it into one common function. It makes reading and modifying it much easier.	2017-08-26 08:12:16 -07:00
Jonathan Rehm	374b5f4c6e	Save ePub bookmarks to database Save ePub bookmark to database. Also use library's built-in restore feature to restore all information from localStorage.	2017-08-23 08:55:40 -07:00
Jonathan Rehm	a682c95ec1	Show "More by" on author page Uses Goodread's list of author's books, filtering out the books that are already in the user's library. Requires the Goodreads dependency and API information.	2017-08-21 08:56:08 -07:00
OzzieIsaacs	193605df4a	Fix for #286	2017-08-20 07:47:47 +02:00
OzzieIsaacs	cf5e2f7cd1	search button is displayed in moon reader (#283 ), search result is not displayed	2017-08-20 07:10:53 +02:00
OzzieIsaacs	f6425a6569	Merge remote-tracking branch 'adv/cache-buster'	2017-08-19 23:10:12 +02:00
Jonathan Rehm	cda733f4a4	Escape special characters in file names Follows Calibre's convention of using underscores as replacements	2017-08-19 11:56:29 -07:00
Jonathan Rehm	8cbd6a8431	Do not append query string if file_hash is not found	2017-08-19 09:09:12 -07:00
Jonathan Rehm	13c2a53c0f	Fix issues with Windows path separators	2017-08-19 08:32:00 -07:00
OzzieIsaacs	6b1f3aa531	Merge remote-tracking branch 'adv/cache-buster'	2017-08-19 08:36:12 +02:00
marblepebble	97f573c41a	Set ipv4 address explicitly for docker usage	2017-08-18 21:53:52 +01:00
OzzieIsaacs	bd02c92162	Merge remote-tracking branch 'adv/get-meta-data'	2017-08-17 15:32:14 +02:00
OzzieIsaacs	e3d416db4c	Merge remote-tracking branch 'adv/cover-upload'	2017-08-17 15:27:32 +02:00
Jonathan Rehm	866f7944eb	Meta data improvements * Add buttons to show/hide results from Douban & Google * Trigger search with "Enter" key * Use Underscore.js template instead of build HTML strings in JavaScript * Keep click event handler in JavaScript instead of using HTML's `onclick` * Normalize Douban & Google results * Update cover image & add cover URL to the form input	2017-08-15 22:11:01 -07:00
OzzieIsaacs	a1538e12e8	Bugfix typeahead on advanced serach page	2017-08-14 20:30:23 +02:00
OzzieIsaacs	de112b0b05	Merge remote-tracking branch 'adv/eslint'	2017-08-14 20:21:52 +02:00
Jonathan Rehm	a27848b351	Add static asset cache busting Calculates MD5 hash of static assets on server start. These are appended to the file name's when url_for is used, telling browsers to download the latest version of the files, e.g. style.css?q=81cf0ee. Inspired by https://github.com/ChrisTM/Flask-CacheBust but uses query strings instead of rewriting the path because fonts inside CSS files break when the path is rewritten.	2017-08-13 09:32:29 -07:00
Jonathan Rehm	08d0404e9c	Add mature_content property to Anonymous class	2017-08-13 07:05:45 -07:00
Jonathan Rehm	8171943b8e	Update to ES5 standards Also fix ESLint issues	2017-08-12 22:46:27 -07:00
OzzieIsaacs	91cdb5f60f	Merge remote-tracking branch 'Upper_case/master'	2017-08-12 19:02:57 +02:00
OzzieIsaacs	2f7177742d	Update chinese translation	2017-08-12 18:59:57 +02:00
OzzieIsaacs	dd6c928e2c	Merge remote-tracking branch 'translation/master'	2017-08-12 18:55:08 +02:00
OzzieIsaacs	fb8ce693f3	Bugfix mature content Update german translation	2017-08-12 18:52:56 +02:00
OzzieIsaacs	b596734c36	Merge remote-tracking branch 'adv/mature-content'	2017-08-12 18:16:45 +02:00
idalin	274d0f6577	update Chinese translations	2017-08-11 09:32:01 +08:00
idalin	2b27d6570f	Merge branch 'janeczku-master'	2017-08-11 09:26:36 +08:00
idalin	b5cca553b3	update Chinese translations	2017-08-11 09:25:39 +08:00
kyos	9a17a09cc7	Fixed codacy requirements	2017-08-10 12:34:54 +02:00
Ruben Herold	68e3867af3	fix books with uppercase extension	2017-08-10 12:29:08 +02:00
kyos	aa4a5dc3ef	Added option to upload a new format to a given book	2017-08-09 19:56:46 +02:00
Jonathan Rehm	6f797ba478	Check if JPEG via response content-type header instead of URL extension That way we can use dynamic URLs, such as those returned by the "Get Metadata" request.	2017-08-09 10:03:02 -07:00
Jonathan Rehm	aee8aad976	Add option to hide mature content from some users Uses a configurable list of tags to denote what is mature and hides those books from the user	2017-08-08 10:38:28 -07:00
Carlos Clavero	8f5bc2a484	Merge pull request #9 from Kyosfonica/add_css_separation_for_tags_in_advance_search Added a 5px separation for all input labels in advanced search	2017-08-01 17:53:07 +02:00
kyos	e948844ea4	Added a 5px separation for all input labels in advanced search to improve readability	2017-08-01 17:51:38 +02:00
Carlos Clavero	1500e0f54f	Merge pull request #8 from Kyosfonica/add_css_separation_for_tags_in_advance_search Added a 5px separation for all input labels in advanced search	2017-08-01 17:50:24 +02:00
kyos	b6f097f673	Added a 5px separation for all input labels in advanced search to improve readability	2017-08-01 17:49:14 +02:00
Carlos Clavero	5f78ec4e83	Merge pull request #7 from Kyosfonica/add_css_separation_for_tags_in_advance_search Added a 5px separation for all input labels in advanced search	2017-08-01 17:46:13 +02:00
kyos	6048bf3c79	Added a 5px separation for all input labels in advanced search to improve readability	2017-07-31 20:01:55 +02:00
Carlos Clavero	80c021939e	Merge pull request #6 from Kyosfonica/master Update dev with latests changes from master	2017-07-31 18:17:59 +02:00
kyos	51bc0e82a4	Added series and series_index metadata handler	2017-07-31 09:00:09 +02:00
kyos	4bba3558b7	Added tags metadata handler for epubs	2017-07-31 08:46:29 +02:00
OzzieIsaacs	fe52de6b4b	Merge remote-tracking branch 'adv/lighthouse-audit'	2017-07-30 06:59:12 +02:00
OzzieIsaacs	cd2e27d7ad	Merge remote-tracking branch 'adv/previous-pagination'	2017-07-30 06:51:05 +02:00
OzzieIsaacs	82165a67a1	Merge remote-tracking branch 'mail/master'	2017-07-30 06:44:10 +02:00
OzzieIsaacs	626e2e393e	Merge remote-tracking branch 'adv/edit-publish-date'	2017-07-30 06:37:18 +02:00
Mikhail Akushsky	4313910ba0	Fix hmac creation in send_test_email function	2017-07-29 18:06:16 +03:00
Jonathan Rehm	ec118c2254	Move scripts to bottom of body to prevent execution from delaying DOM rendering	2017-07-28 20:07:10 -07:00
Jonathan Rehm	dde4f6afe2	Add missing label	2017-07-28 20:03:43 -07:00
Jonathan Rehm	0b47958fad	Add lang attribute to html tag	2017-07-28 20:03:23 -07:00
Jonathan Rehm	c86fa268c2	Fix/remove duplicate id's	2017-07-28 20:02:53 -07:00
Jonathan Rehm	5162e2eed7	Add img alt attributes	2017-07-28 20:01:31 -07:00
Jonathan Rehm	5465b8e8b7	Add "Previous" pagination button I imagine these buttons are still in use when JavaScript is disabled or not loading.	2017-07-28 07:38:35 -07:00
Jonathan Rehm	0afc8f94da	Use TinyMCE's API to update the description's content	2017-07-25 13:16:12 -07:00
Jonathan Rehm	dd124ab356	Make change requested by Codacy	2017-07-23 13:36:21 -07:00
Jonathan Rehm	59afc7eb9f	Make changes requested by Codacy	2017-07-23 13:36:21 -07:00
Jonathan Rehm	3258f4fb79	Make changes requested by Codacy	2017-07-23 13:36:21 -07:00
Jonathan Rehm	61e0405f75	Move TinyMCE into edit_books.js	2017-07-23 13:36:21 -07:00
Jonathan Rehm	5715d27c97	Show localized date over top of date input Also move datepicker logic into edit_books.js and edit_books.js below the datepicker file declaration(s)	2017-07-23 13:36:21 -07:00
Jonathan Rehm	36c2b35588	Use bootstrap-datepicker to add datepicking UI for browsers that do not have one built-in	2017-07-23 13:35:35 -07:00
Jonathan Rehm	cc916a4eb4	Add timestamp to default publishing date	2017-07-23 13:35:35 -07:00
Jonathan Rehm	a07798b0db	Standardize indentation	2017-07-23 13:35:35 -07:00
Jonathan Rehm	04b04e200f	Add ability to edit publish date If a date is not set, default to “0101-01-01”	2017-07-23 13:35:35 -07:00
Jonathan Rehm	cf7196ae5e	Refactor to remove nested if-statements	2017-07-23 13:35:35 -07:00
Jonathan Rehm	a95e6aab6b	Do not attempt to create the YAML file when Google Drive is disabled (#246 )	2017-07-23 22:26:43 +02:00
OzzieIsaacs	cb5f196f4b	Merge remote-tracking branch 'adv/modal-details' # Conflicts: # cps/static/js/main.js # cps/templates/detail.html	2017-07-23 14:03:02 +02:00
OzzieIsaacs	1e2edcf753	Merge remote-tracking branch 'adv/author-info'	2017-07-23 13:36:50 +02:00
OzzieIsaacs	df1b503c2d	Update Translation	2017-07-23 13:25:54 +02:00
OzzieIsaacs	c403fdfa2e	Merge remote-tracking branch 'adv/sorting'	2017-07-23 13:18:24 +02:00
OzzieIsaacs	97d577ef2e	Merge remote-tracking branch 'adv/add-to-shelf-ajax'	2017-07-23 13:16:20 +02:00
OzzieIsaacs	4311091d7d	Merge remote-tracking branch 'adv/python3-fix'	2017-07-23 13:11:37 +02:00
Jonathan Rehm	693c26c2b3	Attach events to button toolbar Since this is closer to the elements, we can be more sure that we won't have events fire when we don't want them to. For example, if we're viewing the page in a modal, we don't want the event handler living longer than the content itself.	2017-07-22 11:24:47 -07:00
Jonathan Rehm	d85e0b96dc	Prevent jQuery from cache busting static assets If the HTML that's returned from the `$.get` request contains a `<script src="..."/>` tag it loads the JavaScript file via ajax, and by default it attaches a timestamp to it to bust cache. That means the file loads every time the modal is opened, and the browser treats it as a new file each time. The result is that code fires multiple times and events listeners are added multiple times.	2017-07-22 11:11:14 -07:00
Jonathan Rehm	e1a88aa0ab	Make change requested by Codacy	2017-07-22 07:34:38 -07:00
Jonathan Rehm	5c3a5b6c39	Use ajax to add/remove books from shelves Gracefully fall back to standard requests if JavaScript is disabled	2017-07-21 21:15:03 -07:00
Ozzie Isaacs	2e8a268dfa	Fix #241 No1	2017-07-18 20:39:35 +02:00
OzzieIsaacs	6a9d8efc93	Fixes for #233 (detection of permission errors)	2017-07-16 22:04:40 +02:00
Jonathan Rehm	85ce06850c	Fix for Python 3	2017-07-13 21:28:00 -07:00
Jonathan Rehm	91ba0f0362	Resolve issues with unicode characters in author's name I've been unable to reproduce the issue on macOS with Python 2.7/3.6 and Fedora with Python 2.7, but if it happens for others, then it's worth the change.	2017-07-13 21:22:34 -07:00
Jonathan Rehm	51bd2f89df	Use dot notation	2017-07-13 18:09:33 -07:00
Jonathan Rehm	c9c6529567	Use SECRET_KEY from environment variable (#232 )	2017-07-11 18:35:55 +02:00
OzzieIsaacs	5985342b79	Bugfix for typeahead in search function and on edit books page	2017-07-11 18:08:12 +02:00
OzzieIsaacs	a8aa1e7623	Merge remote-tracking branch 'button_padding/limit-typeahead-requests'	2017-07-11 17:48:33 +02:00
OzzieIsaacs	cfa69ff4f2	Merge remote-tracking branch 'button_padding/smtp-from'	2017-07-11 17:38:52 +02:00
Jonathan Rehm	9683d50f36	Send mail from the FROM address instead of the login When SMTP is configured to use a service that doesn't use an email address to log in – e.g. AWS SES or Postmark – the sendmail request fails saying the FROM address is invalid.	2017-07-11 07:16:19 -07:00
Ozzie Isaacs	f79fb420ba	Removed whitespaces	2017-07-11 16:13:33 +02:00
Jonathan Rehm	802eb628c8	Split event listener and selector string Event and selectors appear to have been accidentally combined. The result is that typing in any input triggers a call to the `/get_matching_tags` route. We can probably limit the selector farther to only fire when `#tags` is typed into.	2017-07-10 13:03:58 -07:00
Jonathan Rehm	66231c8737	Associate label with correct input (#228 )	2017-07-10 19:26:57 +02:00
Ozzie Isaacs	92f634b6a6	Bugfix link admin section	2017-07-10 12:04:15 +02:00
OzzieIsaacs	74e93e1cdf	Code cosmetics	2017-07-09 20:15:15 +02:00
OzzieIsaacs	1fdb7dc497	Epub Viewer Bugfix Retenia Ipad devices	2017-07-09 16:28:22 +02:00
OzzieIsaacs	16ce7799a2	Improvement of margins in epub reader (fix #210 )	2017-07-09 15:49:47 +02:00
OzzieIsaacs	470aea6106	Fix #214 Update epub.js lib	2017-07-09 13:27:56 +02:00
OzzieIsaacs	979bcdffd4	Bugfix non working download links Bugfix missing divider in detail page	2017-07-09 12:41:09 +02:00
Jonathan Rehm	fe68c8a7f8	Add support for displaying author information from Goodreads Requires the "goodread" module (added to optional-requirements.txt) and an API key Retrieves Goodreads author information and displays their photo and "about" text	2017-07-08 16:07:45 -07:00
OzzieIsaacs	31e0025099	Update Translation	2017-07-08 19:50:44 +02:00
OzzieIsaacs	5a6ad970d8	Merge remote-tracking branch 'button_padding/magic-link'	2017-07-08 19:26:08 +02:00
Jonathan Rehm	d799b859ea	Make changes suggested by codacy	2017-07-08 09:15:40 -07:00
Jonathan Rehm	649579eccd	Move jquery.form to layout.html This prevents it from getting loaded each time the details are viewed in a modal dialog.	2017-07-08 09:15:40 -07:00
Jonathan Rehm	675e8dd5cd	Show book details in modal dialog With them shown in a modal, you don't lose your place in the pagination. If the request comes via Ajax, the minimal layout is used. If via a normal request, the full layout is used. That lets you open the details in a new tab and have the full experience, but if you're clicking through the results of a search, you can view many without losing your place.	2017-07-08 09:15:40 -07:00
OzzieIsaacs	93dfb96174	Added Translation of title for read/unread books	2017-07-08 16:47:07 +02:00
OzzieIsaacs	f446e29276	Updater now uses correct "gid" instead of "uid" for change ownership of files (Fix for #213 ) -> update should now working if user id differs from groupid	2017-07-08 14:57:39 +02:00
OzzieIsaacs	2929d95b26	Display all authors names in shelf, like on all other pages (#202 )	2017-07-08 13:50:21 +02:00
OzzieIsaacs	aed626b91b	Merge remote-tracking branch 'button_padding/read-unread-counts'	2017-07-08 11:26:07 +02:00
OzzieIsaacs	254e1f5262	Merge remote-tracking branch 'button_padding/simplify-read-code' # Conflicts: # cps/static/css/style.css	2017-07-08 11:25:20 +02:00
OzzieIsaacs	15531324ea	Add translation of rich text editor	2017-07-08 11:19:36 +02:00
OzzieIsaacs	77c4da0f07	Merge remote-tracking branch 'button_padding/tinymce'	2017-07-08 11:03:21 +02:00
OzzieIsaacs	4f08608d75	Move download button to top of detail page (#174 )	2017-07-08 11:01:40 +02:00
OzzieIsaacs	b876a03f26	- Changed link color on download button to white - removed file icons on download button - removed shadow style on download button	2017-07-08 10:57:40 +02:00
OzzieIsaacs	6b71e77436	Merge remote-tracking branch 'Download/feature/download-icon-20170410'	2017-07-08 09:35:09 +02:00
Jonathan Rehm	623f5c8ef0	Add "magic link" functionality When using a device that is bothersome to log in on (e.g. a Kindle) you can use a magic link to log in via another device. Configuration was added and is disabled by default.	2017-07-07 18:29:16 -07:00
Jonathan Rehm	b138c9edd5	Show read/unread counts	2017-07-06 22:33:57 -07:00
Jonathan Rehm	7631eea32e	Add sort options when viewing books Default view still shows the most recently added books, but adds ability to sort by newest/oldest books and books sorted alphabetically (ascending & descending). I did not include translations for the next text, but they are split up for easy translating and are otherwise ready for translating.	2017-07-06 21:14:45 -07:00
OzzieIsaacs	5276bda153	Merge remote-tracking branch 'button_padding/pad-buttons'	2017-07-06 20:31:25 +02:00
Jonathan Rehm	4fe1536b7e	Simplify the read functionality's code * Use block label to toggle the checkbox * Submit form when checkbox's value changes (regardless of whether mouse is used or not) * Remove unused code	2017-07-06 10:33:47 -07:00
Jonathan Rehm	d25300a7fb	Add padding to bottom of buttons on shelf page This adds some space between the buttons when viewing them on a mobile device.	2017-07-06 07:44:28 -07:00
OzzieIsaacs	752b813119	Added copyright for language names translations	2017-06-24 13:08:57 +02:00
OzzieIsaacs	0e8d5f158c	Dutch translation included (#207 )	2017-06-24 13:04:09 +02:00
Jonathan Rehm	7853cb2602	Add TinyMCE to provide rich-text editing for descriptions	2017-06-22 08:59:28 -07:00
OzzieIsaacs	4ea9df753e	For failed logins the source ip-adress is logged now ( #201 )	2017-06-07 18:08:15 +02:00
OzzieIsaacs	e6c6c26fd1	No error 500 if kindlegen is not excecutable	2017-05-25 09:30:20 +02:00
OzzieIsaacs	0a08a07193	Fixed Deleting user	2017-05-25 09:09:35 +02:00
OzzieIsaacs	7ab8a5877b	read PDF/TXT without temporary files (#197 )	2017-05-25 08:46:33 +02:00
OzzieIsaacs	1366b36c32	Added integer-field to supported custom colums	2017-05-25 08:20:19 +02:00
nanu-c	3acf80c42b	remove debuggingtool	2017-05-22 23:06:55 +02:00
nanu-c	26f314d371	support int custom fields	2017-05-22 22:54:53 +02:00
OzzieIsaacs	5f4d839895	Better output messages for failed kindlegen conversions (fix #191 )	2017-05-19 21:30:39 +02:00
OzzieIsaacs	38fa9ce206	At deleting a book, the book is also deleted from all Shelfs, Download list and read list (#192 )	2017-05-19 20:36:58 +02:00
OzzieIsaacs	2b50dea304	Updated pdf.js to 1.7.225 (Fix #193 )	2017-05-13 14:01:52 +02:00
OzzieIsaacs	a73372d71a	Make kindlegen work again	2017-05-05 21:05:52 +02:00
OzzieIsaacs	6d597f96e5	Integrate Iso639 language name translations to russian translation	2017-05-01 16:24:20 +02:00
Pavel Korovin	a305b65299	Added Russian translation	2017-04-30 22:54:16 +03:00
Murat L	b6fccbd486	Added Google Books and Kobo links (#189 ) * Added Google Books and Kobo links * International link to google	2017-04-27 14:32:30 +01:00
Ozzie Isaacs	4259aa69df	Get rid of shel=true again	2017-04-26 19:39:45 +01:00
Ozzie Isaacs	2d918bfb72	Fix for invalid db path	2017-04-26 19:21:40 +01:00
林檎	95f22aa4b5	add drop shadow to distinct the fixed area	2017-04-26 17:14:18 +08:00
林檎	f6076bc337	media tweak for better download placement	2017-04-26 17:14:18 +08:00
林檎	720c07b9ee	remove empty style	2017-04-26 17:14:18 +08:00
林檎	45eeb6588a	Change Download Style.	2017-04-26 17:14:18 +08:00
Ozzie Isaacs	b8fa748c49	Fix #187 on linux	2017-04-25 22:04:08 +01:00
Ozzie Isaacs	651961ac5e	Fix #187	2017-04-25 20:07:54 +01:00
Matt Hazinski	6f7a240ce2	Ensure file paths in uploads are non-empty, fix #183 (#184 ) * Ensure file paths in uploads are non-empty, fix #183 * Fix AttributeError in process(), handle strings of spaces	2017-04-23 07:22:10 +01:00
Ozzie Isaacs	ede8ae6742	Fix #182 , #176	2017-04-21 20:44:17 +02:00
OzzieIsaacs	c80e517c28	Delete books prepared for deleting on doogle drive	2017-04-15 18:24:48 +02:00
OzzieIsaacs	195e581aef	Missing file for deletion of books	2017-04-15 18:18:33 +02:00
OzzieIsaacs	7667da6e12	Books now really deleted from hard disk (#119 )	2017-04-15 18:18:08 +02:00
OzzieIsaacs	2b8c29c535	Further fix delete books (#119 )	2017-04-15 18:07:53 +02:00
OzzieIsaacs	9c679c8908	Delete books should now work (#119 )	2017-04-15 11:35:05 +02:00
OzzieIsaacs	cd0d450829	Allow deleting books (fixes #119 )	2017-04-14 20:29:11 +02:00
OzzieIsaacs	daaee5b67e	remove unused variables	2017-04-14 19:16:39 +02:00
林檎	b51afe3ead	Code Fix Fix pagination logic. _ is gettext , use __ as dummy variable instead of _ Need more test. Test on following http://localhost:8083/opds/new http://localhost:8083/opds/new?offset=60 http://localhost:8083/opds/new?offset=120	2017-04-14 21:57:27 +08:00
OzzieIsaacs	7a07edaff4	Update polish translation	2017-04-14 09:42:15 +02:00
Radosław Kierznowski	3c3720aa0f	Update polish translation (POT: 2017-04-11 22:51)	2017-04-12 14:27:57 +02:00
Radosław Kierznowski	ccf563023b	Merge remote-tracking branch 'refs/remotes/janeczku/master'	2017-04-12 14:00:30 +02:00
林檎	622b1435f1	Fix #172	2017-04-06 22:50:05 +08:00
OzzieIsaacs	fb43110f1c	Merge remote-tracking branch 'spanish_translation/master'	2017-04-04 19:07:20 +02:00
OzzieIsaacs	699bd036e8	Code cosmetics	2017-04-04 19:05:09 +02:00
Gonzalo Cao Cabeza de Vaca	286196fa1d	Updated spanish translations	2017-04-04 15:10:54 +02:00
OzzieIsaacs	dc45b53b24	code cosmetics	2017-04-03 21:05:28 +02:00
OzzieIsaacs	8c7a8a954a	Code cosmetics	2017-04-03 20:05:55 +02:00
OzzieIsaacs	d59be5faf4	Code cosmetics Bugfix upload	2017-04-03 19:57:45 +02:00
OzzieIsaacs	ab534b21c1	Code cosmetics	2017-04-02 10:42:33 +02:00
OzzieIsaacs	7dd70db837	Code cosmetics	2017-04-02 10:27:37 +02:00
OzzieIsaacs	7c6d527a55	Code cosmetics	2017-04-02 10:05:07 +02:00
OzzieIsaacs	66181daf6d	Merge remote-tracking branch 'custom-dbpath'	2017-04-02 08:45:47 +02:00
OzzieIsaacs	79d5bab4ba	Code cosmetics	2017-03-31 18:41:05 +02:00
OzzieIsaacs	5044b78b08	Code cosmetics	2017-03-31 18:31:16 +02:00
OzzieIsaacs	00462237fe	Merge remote-tracking branch 'chinese_translation/master'	2017-03-31 16:52:25 +02:00
OzzieIsaacs	986f40b80a	Code cosmetics	2017-03-30 21:17:18 +02:00
OzzieIsaacs	78067b87bc	Code cosmetics	2017-03-29 21:43:55 +02:00
OzzieIsaacs	395c6679b7	Fix #163	2017-03-29 20:59:37 +02:00
林檎	ebb3acecca	Fix Download Bug.	2017-03-29 12:59:20 +08:00
Ivan Smirnov	2c173f9848	Read dbpath from $CALIBRE_DBPATH if present This is an exploration in potentially enabling multiple libraries to run using the same engine. Since app config is all in the db, we should get no port conflicts and be able to run multiple instances of this app with no issues. Using os.getenv instead of os.environ.get allows us to provide CALIBRE_DBPATH inline with the invocation of the file (`CALIBRE_DBPATH=/foo/bar/` python cps.py)	2017-03-25 13:05:44 -07:00
idalin	4d8b43bd54	update Simplified Chinese translation	2017-03-21 10:16:40 +08:00
Radosław Kierznowski	55ee323ca1	Merge remote-tracking branch 'refs/remotes/janeczku/master' # Conflicts: # cps/translations/pl/LC_MESSAGES/messages.mo # cps/translations/pl/LC_MESSAGES/messages.po	2017-03-20 22:01:25 +01:00
OzzieIsaacs	cbc807f3ff	Fix #138	2017-03-19 20:29:35 +01:00
OzzieIsaacs	60f3fefaec	Added Read/Unread to feed Prevent books from getting multiple times added to shelf Updated German Translation	2017-03-19 19:22:45 +01:00
OzzieIsaacs	33427d7610	Bugfix opds feed for lists	2017-03-19 17:32:49 +01:00
OzzieIsaacs	0e0e72fb71	Fixes for gevent/gdrive	2017-03-19 17:14:16 +01:00
Radosław Kierznowski	9c5fe444e6	POT: 2017-03-12 19:10	2017-03-19 16:35:37 +01:00
Jack Darlington	3916205a95	Gdrive optional	2017-03-16 23:36:37 +00:00
Jack Darlington	b352bbfd14	Fix for gevent as optional	2017-03-16 21:02:49 +00:00
Jack Darlington	06a4af44cc	Merge branch 'master' into develop # Conflicts: # cps/web.py	2017-03-16 21:02:11 +00:00
OzzieIsaacs	a87fab8774	- Smaller cover picturees on small devices - filename for download with underscore	2017-03-14 19:48:17 +01:00
Jack Darlington	ff89d9c20d	Merge branch 'master' into develop	2017-03-13 14:56:51 +00:00
Kennyl	59bf568f7e	Merge branch 'master' into fix/python3-patch-20170308	2017-03-13 15:52:08 +08:00
Jack Darlington	29462e2278	Fix for updater	2017-03-13 00:44:20 +00:00
Jack Darlington	7d31abf920	added jquery.form.js to project locally	2017-03-12 21:20:09 +00:00
Jack Darlington	537977e497	Changed “have read” to checkbox	2017-03-12 21:13:14 +00:00
Jack Darlington	8f2088a3ea	Updated use google drive checkbox	2017-03-12 21:03:01 +00:00
Jack Darlington	5a2e77baaf	fix for form input ID	2017-03-12 20:52:56 +00:00
OzzieIsaacs	74a3e6842a	Merge remote-tracking branch 'kennyl/travis' # Conflicts: # cps/web.py	2017-03-12 21:13:25 +01:00
OzzieIsaacs	b081bc8672	Fix #157	2017-03-12 20:01:20 +01:00
OzzieIsaacs	16cac6ac4f	Merge remote-tracking branch 'polish_update/master' # Conflicts: # cps/translations/pl/LC_MESSAGES/messages.mo # cps/translations/pl/LC_MESSAGES/messages.po Fix for #147	2017-03-12 19:12:17 +01:00
Jack Darlington	2ffa847803	Merge branch 'master' into develop	2017-03-12 12:37:38 +00:00
Jack Darlington	dad251d02c	Fix for revoking already expired channel (drive)	2017-03-12 00:24:53 +00:00
Radosław Kierznowski	89fa9eb02f	Update polish translation Calibre Web - polski (POT: 2017-03-11 09:09)	2017-03-11 15:35:38 +01:00
OzzieIsaacs	dbf07cb593	Updated translations	2017-03-11 09:11:19 +01:00
林檎	2ef4933f7a	Merge branch 'feature/download-suffix-20170309' into travis # Conflicts: # cps/templates/detail.html	2017-03-09 12:38:55 +08:00
林檎	045419e880	Fix #146 For WebUI only OPDS remains previous behaviour	2017-03-09 12:32:10 +08:00
林檎	a766784ef1	Merge branch 'feature/download-suffix-20170308' into travis	2017-03-09 12:19:46 +08:00
林檎	d7d29827f4	fix behind	2017-03-08 23:59:56 +08:00
林檎	7bae79d826	fix conflict	2017-03-08 23:56:20 +08:00
林檎	a7d361a0ff	merge conflict	2017-03-08 23:52:41 +08:00
林檎	dcc0958c39	Merge branch 'master' into travis # Conflicts: # cps/epub.py # cps/web.py # readme.md	2017-03-08 23:50:14 +08:00
林檎	8c625dfb93	Fix #146 For WebUI only OPDS remains previous behaviour	2017-03-08 13:56:13 +08:00
林檎	d7afbdc349	use quote instead of urllib.quote	2017-03-08 13:26:52 +08:00
林檎	108302ff9b	remove dependency on future function no need six or future if there is only one function.	2017-03-08 11:48:12 +08:00
Jack Darlington	e3a2bd348c	Merge branch 'develop' into personal	2017-03-08 00:30:00 +00:00
Jack Darlington	6ab8d0330a	Fix for editing book cover with drive + fixed found bug that has_cover not set	2017-03-08 00:26:15 +00:00
Jack Darlington	21b1a45023	Merge branch 'develop' into personal # Conflicts: # cps/web.py	2017-03-07 22:05:56 +00:00
Jack Darlington	cf1ca21bbc	Merge branch 'master' into develop # Conflicts: # cps/db.py # cps/ub.py # cps/web.py # readme.md # requirements.txt	2017-03-07 22:03:10 +00:00
OzzieIsaacs	a752e62963	Fix Import problem on python2	2017-03-07 21:08:28 +01:00
OzzieIsaacs	c725afc3a8	Merge remote-tracking branch 'JackED42/feature/ignorable_columns'	2017-03-07 20:36:43 +01:00
OzzieIsaacs	38c782fcf1	Merge remote-tracking branch 'Douban/prod' # Conflicts: # cps/templates/book_edit.html	2017-03-07 20:30:55 +01:00
OzzieIsaacs	80f1276624	Merge remote-tracking branch 'gitignore/fix/syntax-python3-20170305' # Conflicts: # cps/db.py # cps/web.py # requirements.txt	2017-03-07 20:22:28 +01:00
OzzieIsaacs	acac0570e5	Merge remote-tracking branch 'use_pip/use-pip' # Conflicts: # cps.py # readme.md # vendor/wand/api.py # vendor/wand/drawing.py # vendor/wand/exceptions.py # vendor/wand/image.py # vendor/wand/version.py	2017-03-07 19:46:23 +01:00
OzzieIsaacs	72ec9a9f17	Merge remote-tracking branch 'gitignore/fix/patch-issue-20170307'	2017-03-07 19:15:40 +01:00
OzzieIsaacs	edadf84710	Added editing star rating graphically Added ability to reload database connection (refresh problem) Bugfix display hot books (no hot books, hot books are deleted books, no longer result in error 500)	2017-03-07 19:10:17 +01:00
林檎	53cc84ec18	#fix 148	2017-03-07 16:32:55 +08:00

... 19 20 21 22 23 ...

2385 Commits