2448 Commits

Author	SHA1	Message	Date
verglor	09a5a69f86	djvu_html5 0.3.0-beta1 static assets	2020-11-15 13:09:32 +01:00
Ozzieisaacs	4081895a78	exclude _pysqlite.so from being overwritten	2020-11-14 15:53:56 +01:00
Ozzieisaacs	013c4e9c35	Merge remote-tracking branch 'epub/recompute_epub' into master	2020-11-14 13:22:42 +01:00
Ozzieisaacs	067f289050	Merge remote-tracking branch 'comic/comic' into master	2020-11-14 13:21:56 +01:00
Ozzieisaacs	06511b92aa	Merge remote-tracking branch 'epub/GruberMarkus-patch-1' into master	2020-11-14 13:20:26 +01:00
Ozzieisaacs	32f4c9eabf	Merge remote-tracking branch 'fr/master' into master	2020-11-14 13:16:08 +01:00
Ozzieisaacs	14bc345883	Merge remote-tracking branch 'audio/fix-audio-icon' into master	2020-11-14 13:14:21 +01:00
Ozzieisaacs	d76b4fd7ea	Merge remote-tracking branch 'it/patch-17' into master	2020-11-14 13:12:36 +01:00
ElQuimm	83cdd7e9fb	update italian message.po ... some minor update to the translation.	2020-11-13 11:17:46 +01:00
verglor	50441bae62	Fix missing audio icon for other audio formats than mp3	2020-11-10 18:08:22 +01:00
Martin	5b0766a9b0	Correct spelling	2020-11-10 10:06:37 +01:00
Martin	d979fe8e5f	fix fr translation : sed cryptage/chiffrement	2020-11-10 10:04:47 +01:00
Markus Gruber	f2c52fd278	Update jszip to 3.5.0. Update epub.js to 0.3.88. ... Fixes several problems when viewing EPUBs in a browser, for example when jumping to a certain chapter in the table of contents does not work.	2020-11-09 15:47:27 +01:00
Ozzieisaacs	87d60308f2	Merge remote-tracking branch 'caliblur/issue/caliblur-981' into master	2020-11-08 19:29:10 +01:00
Ozzieisaacs	58d485cbb5	Fix #1702 (invalid timestamps during kobo sync caused by malformed database)	2020-11-07 12:49:39 +01:00
Ozzieisaacs	e99dd3310c	Exchanged douban apikey	2020-11-07 12:18:33 +01:00
Ozzieisaacs	400f6e02a5	Fix #1668 (upload of books with language set to different than UI language and not showing all books) ... Fix for only showing external port if kobo is really activated in admin menu	2020-11-07 11:44:02 +01:00
jvoisin	700b0609df	Don't recompute metadata for epubs	2020-11-06 21:36:49 +01:00
cbartondock	bc52f90ed4	Merge remote-tracking branch 'upstream/master'	2020-11-02 11:36:45 -05:00
Ozzieisaacs	0771546dad	Log exception on user import	2020-11-01 18:25:38 +01:00
jvoisin	95a1a71a66	Minor refactor of comic.py	2020-10-31 22:28:24 +01:00
Ozzieisaacs	25da6aeeca	Merge remote-tracking branch 'sec_fixes/space' into master	2020-10-31 20:04:42 +01:00
Ozzieisaacs	00b422807b	Merge remote-tracking branch 'sec_fixes/edit_auth' into master	2020-10-31 20:04:12 +01:00
Ozzieisaacs	130701a7bb	Merge remote-tracking branch 'sec_fixes/admin_update' into master	2020-10-31 20:02:42 +01:00
Ozzieisaacs	ff88e68904	Add missing locale files	2020-10-31 19:58:22 +01:00
Ozzieisaacs	55fcf23d2b	Merge remote-tracking branch 'sec_fixes/negate' into master	2020-10-31 19:37:47 +01:00
Ozzieisaacs	1b0b4c4cc5	Merge remote-tracking branch 'sec_fixes/ldap' into master	2020-10-31 19:29:17 +01:00
Ozzieisaacs	cd57731593	Merge remote-tracking branch 'sec_fixes/unused_imports' into master	2020-10-31 19:24:46 +01:00
Ozzieisaacs	37a80b935d	Added greek translation	2020-10-31 19:20:00 +01:00
Ozzieisaacs	4d61aec153	Merge remote-tracking branch 'zh/trans' into master	2020-10-31 19:07:10 +01:00
Ozzieisaacs	1adf25d50b	Update Italian translation	2020-10-31 19:06:09 +01:00
Julian Naydichev	ae33aee3f6	When serving a download URL via KoboSync, use a URL that is specific to Kobo	2020-10-31 14:50:08 +01:00
jvoisin	2c99e71626	Remove a superfluous space	2020-10-29 18:17:32 +01:00
jvoisin	e7f7775efa	Require edit permissions to edit books, even via ajax	2020-10-29 14:52:20 +01:00
jvoisin	8b60a19577	Don't leak to non-admin users the current installed version	2020-10-29 14:03:18 +01:00
Ozzieisaacs	5701e08db9	Fix for #1668	2020-10-28 20:37:52 +01:00
jvoisin	d2617322c6	Negate a condition ... - removes two levels of indentation - makes it clear that if the wrong tokens are provided nothing will happen - remove a useless nested function	2020-10-27 19:41:05 +01:00
jvoisin	fa82745f64	Put import_ldap_users behind a login	2020-10-27 19:26:04 +01:00
jvoisin	19b2a334e4	Remove unused imports	2020-10-27 11:06:43 +01:00
vagra	627c2adf08	SImple Chinese translation updated.	2020-10-26 22:56:58 +08:00
ElQuimm	e3e137ca50	updated italian message.po	2020-10-22 16:31:25 +02:00
cbartondock	0978be580f	Merge remote-tracking branch 'upstream/master'	2020-10-21 13:01:25 -04:00
Ozzieisaacs	5792838333	Add OSError to catched Gevent Error	2020-10-20 17:38:37 +02:00
Ozzieisaacs	f9995583a5	Merge remote-tracking branch 'translate/patch-1' into master	2020-10-20 17:12:25 +02:00
KN4CK3R	4cc68bd139	Fixed typo.	2020-10-20 13:45:01 +02:00
cbartondock	d2510ad1bc	Merge remote-tracking branch 'upstream/master'	2020-10-17 21:46:26 -04:00
celogeek	4d81d3613c	display the check when books are read	2020-10-17 16:49:57 +02:00
celogeek	7d28963a32	connect read books to all render	2020-10-17 16:49:38 +02:00
celogeek	b2594468b4	add helper to get all read books	2020-10-17 16:49:06 +02:00
celogeek	754b9832e9	fix height container	2020-10-17 13:30:19 +02:00
celogeek	097ac879ea	render read	2020-10-17 13:24:46 +02:00
Ozzieisaacs	bc0416cbb4	Fix for #1660 (advanced search for custom columns working, headline for advanced search working)	2020-10-16 20:24:15 +02:00
Ozzieisaacs	2814617e4b	Fix for #1660 (Pagination in advanced search not working, error 500 for no filter in advanced search) ... Fix #1666 (Pagination in search not working)	2020-10-16 19:56:24 +02:00
cbartondock	da9dfd166d	fixed incorrect cover widths	2020-10-16 13:51:48 -04:00
cbartondock	1be07a42df	Flex display to fix columns issue	2020-10-16 13:41:48 -04:00
cbartondock	1d83a6a898	distinguish convert from and convert to extensions	2020-10-16 11:51:59 -04:00
Ghighi	2ff286b672	natural solution, pagination is changing on new page	2020-10-16 00:43:57 +03:00
Ozzie Isaacs	e8620a0986	Fix logging error on windows with invalid goodreads key/secret	2020-10-14 20:48:01 +02:00
Ozzieisaacs	5b67b687d3	Removed remaining code from view downloaded books in user section ... Fixes for #1661	2020-10-13 19:45:27 +02:00
Ghighi Eftimie	9adcfa99f4	trigger infinite scroll script only on templates where .load-more class is present	2020-10-11 22:35:56 +03:00
Ghighi Eftimie	e723aaa5f6	fix for history state (+1 not needed)	2020-10-11 21:56:49 +03:00
Ozzie Isaacs	d128b037a5	Fix for editing files on windows	2020-10-11 18:01:26 +02:00
Ghighi Eftimie	f574f8faf0	better js check	2020-10-10 18:34:55 +03:00
Ghighi Eftimie	cedfa90d76	fix for #981	2020-10-10 17:51:46 +03:00
Ghighi Eftimie	f1e6f6e505	fixes for #1560	2020-10-10 14:58:06 +03:00
Ozzieisaacs	e16c0caebb	Fix opds search	2020-10-10 12:53:10 +02:00
Ozzieisaacs	52489a484a	Merge remote-tracking branch 'Knepherbird/master' into master ... # Conflicts: # cps/jinjia.py # cps/templates/detail.html # cps/templates/discover.html # cps/templates/index.html # cps/web.py	2020-10-10 12:47:49 +02:00
Ozzieisaacs	e1d5c2c578	Merge remote-tracking branch 'caliblur/issue/caliblur-1594' into master	2020-10-10 12:29:30 +02:00
Ozzieisaacs	49f49632ad	Renamed CalibLur.css	2020-10-10 12:22:52 +02:00
Ghighi Eftimie	6dadc6fb1e	same fix but hopefully better	2020-10-10 13:15:02 +03:00
Ozzieisaacs	a58a2f5fe4	Added missing file for tr locale of datepicker	2020-10-10 11:53:15 +02:00
Ghighi Eftimie	c33c6bbff0	fix for #1594	2020-10-10 12:39:52 +03:00
Ozzieisaacs	093f90d4c1	Update translation files	2020-10-10 11:38:40 +02:00
Ozzieisaacs	20ffa325d3	Fix #1642	2020-10-10 10:53:08 +02:00
OzzieIsaacs	df295e92ee	Merge remote-tracking branch 'origin/Develop' into Develop	2020-10-10 10:33:12 +02:00
Ozzieisaacs	2e67bd2407	Fix add to shelf from search	2020-10-10 10:32:53 +02:00
OzzieIsaacs	9aa01ee8cf	Merge branch 'master' into Develop	2020-10-10 10:14:33 +02:00
OzzieIsaacs	d70ded0993	Fix for search	2020-10-10 07:47:27 +02:00
OzzieIsaacs	bb03026589	Fixes from merge problems	2020-10-10 07:30:03 +02:00
Ozzieisaacs	1f4564da76	Merge remote-tracking branch 'es/patch-1' into master	2020-10-06 21:48:42 +02:00
OzzieIsaacs	3b8e5ddfb3	Merge remote-tracking branch 'worker/db' into Develop ... # Conflicts: # cps/tasks/convert.py	2020-10-06 21:40:47 +02:00
Nacho Soler	edc293f96a	Update ... Add some missings translations	2020-10-06 16:43:00 +02:00
Ozzieisaacs	6e6f144b7a	Paginated search and advanced search ... Wraparound on books list deactivated	2020-10-04 19:23:06 +02:00
Ozzieisaacs	e3f4f24c3e	Fixes for failed email and conversions with gdrive	2020-10-04 13:59:33 +02:00
Ozzieisaacs	eb37e3a52b	Fix UI Deelete Buttons in Edit Books page ... Fix Conversion of multiple formats of one book in the queue with gdrive	2020-10-04 12:09:52 +02:00
Ozzieisaacs	95d540630e	Change ldap_certpath to file	2020-10-04 06:15:35 +02:00
Ozzieisaacs	23d66a0d68	Fix	2020-10-03 21:43:48 +02:00
Ozzieisaacs	0d64692c84	Fix for convert + email task with gdrive	2020-09-30 19:29:57 +02:00
OzzieIsaacs	376001100a	Bugfixes from last testrun	2020-09-28 21:24:47 +02:00
Ozzieisaacs	e2954249f8	Update chinese translation	2020-09-27 19:22:41 +02:00
Ozzieisaacs	cc0b0196f4	Store UI settings in flask session for guest user	2020-09-27 19:12:10 +02:00
Ozzieisaacs	6dfa171b4e	Added id's for testing ... moved downloaded books section	2020-09-27 16:00:17 +02:00
Ozzieisaacs	b140073988	Merge branch 'master' into Develop ... Fix #1629 (Gevent Tracebacks with SSL encryption)	2020-09-27 13:02:25 +02:00
Ozzieisaacs	c22bc857b0	Fix #1629 (Gevent Tracebacks with SSL encryption)	2020-09-27 13:00:07 +02:00
Ozzieisaacs	497fbdcdfc	Save view settings	2020-09-27 12:37:41 +02:00
Ozzieisaacs	861f1b2ca3	Merge branch 'master' into Develop ... # Conflicts: # test/Calibre-Web TestSummary_Linux.html	2020-09-27 08:54:32 +02:00
Ozzieisaacs	6108ef4c89	Version update to 0.6.10 Beta	2020-09-27 07:43:56 +02:00
OzzieIsaacs	a9c0bcb4a2	Updated testresults ... Version bump for release	2020-09-27 07:15:03 +02:00
Ozzieisaacs	e61e94f0fa	Merge remote-tracking branch 'it/patch-15' into master ... Updated Translations	2020-09-26 16:19:34 +02:00
Ozzieisaacs	85aac02593	Merge remote-tracking branch 'css/master' into master	2020-09-26 16:13:53 +02:00
Ozzieisaacs	9a678c41fe	Fix error from merge	2020-09-26 09:42:40 +02:00
Ozzieisaacs	7c8f6ce62f	Merge branch 'master' into Develop ... # Conflicts: # cps/comic.py # cps/editbooks.py # cps/isoLanguages.py	2020-09-26 07:54:38 +02:00
Ozzieisaacs	9a896ea81e	Removed logging of headers as it caused trouble while showing logfile in UI	2020-09-26 07:51:29 +02:00
Ozzieisaacs	422c1893c0	Fix for the fix cover_url	2020-09-24 11:02:12 +02:00
ElQuimm	f1cb5276d7	Update italian message.po ... removed typo line 127	2020-09-24 10:54:06 +02:00
Ozzieisaacs	bed1b24340	Fixes from test of upload restrictions	2020-09-24 10:54:02 +02:00
Ozzieisaacs	da909ff084	Fixes from test of upload restrictions	2020-09-23 20:50:34 +02:00
Ozzieisaacs	8f743b70a4	Revert the tolino stuff	2020-09-22 20:25:58 +02:00
Ozzieisaacs	a761017116	Additional debug output for #1527	2020-09-21 19:09:02 +02:00
Ozzieisaacs	f06cc25a99	Fix for immediate logout with next="/logout" ... Fix tolino per default with deactivated Strict-Transport-Security	2020-09-21 18:34:39 +02:00
Ozzieisaacs	eff8480d5c	Show listen in browser formats in lowercase	2020-09-21 18:24:50 +02:00
ElQuimm	07a936c5e8	italian version of messages.po updated	2020-09-21 10:53:29 +02:00
Ryan Long	a6002a2c6c	1622_updated_css	2020-09-20 23:41:20 -04:00
Ozzieisaacs	7ba014ba49	Fix "is not a valid language" on upload of comic books ... Fix metadata excration of comic books updated bootstrap table updated handling of upload formats restrictions	2020-09-20 15:05:52 +02:00
Ozzieisaacs	165c649f31	Fix "is not a valid language" on upload	2020-09-20 11:44:03 +02:00
Ozzieisaacs	4cf71dd336	Fix "is not a valid language" on upload	2020-09-20 11:41:44 +02:00
Ozzieisaacs	2d712a3841	Fix #1612	2020-09-20 10:03:05 +02:00
blitzmann	0480edce2a	Clarify need for WeakSet	2020-09-18 21:52:45 -04:00
Alexander Yakovlev	4eded82102	Add ISFDB	2020-09-15 17:39:13 +07:00
Alexander Yakovlev	ec4ff83465	Add ISSN tags	2020-09-15 13:50:34 +07:00
Alexander Yakovlev	8745b8b051	nice title for Litres tags	2020-09-15 13:47:57 +07:00
Alexander Yakovlev	4e28c3cadb	add Litres references	2020-09-15 13:41:01 +07:00
blitzmann	76c724c783	Remove global session object, this is now wrapped in the CalibreDB class	2020-09-13 21:37:47 -04:00
blitzmann	032cb59388	Fix resetting the session when first configuring the calibre-db on first boot up	2020-09-13 13:16:11 -04:00
OzzieIsaacs	e29247774c	Bugfixes for uploading books to GDrive with new worker	2020-09-12 13:55:36 +02:00
blitzmann	18d16f9a8b	Initial attempt at setting up CalibreDB as a class that carries the engine and DB connection, and the instance being the session	2020-09-11 22:52:40 -04:00
OzzieIsaacs	d137735be1	Fix #805 (First request to gdrive fails)	2020-09-11 20:56:54 +02:00
dickreckard	65929c02bc	isolanguage parsing of xmp data	2020-09-11 10:49:45 +00:00
root	22466d6b98	xmp data processing added to the uploader	2020-09-11 10:08:55 +00:00
dickreckard	23fe79c618	Update uploader.py	2020-09-11 03:42:19 +02:00
OzzieIsaacs	7929711fea	Improvements for file uploading format restriction	2020-09-08 20:57:39 +02:00
OzzieIsaacs	49a028a599	Bugfix not unlink generic cover on upload	2020-09-08 19:04:04 +02:00
OzzieIsaacs	670cbcd336	Merge branch 'master' into Develop	2020-09-07 21:33:11 +02:00
Ozzieisaacs	449d31e8a1	Refactored update_dir_structure_file	2020-09-07 21:26:59 +02:00
Ozzieisaacs	1450a21d00	Fix links to amazon (#1461)	2020-09-07 18:27:43 +02:00
Ozzieisaacs	ae15544aed	Merge branch 'master' into database_fix ... # Conflicts: # cps/editbooks.py	2020-09-07 18:21:33 +02:00
Ozzieisaacs	4b7a37cf7d	Bugfix empty email attachment size	2020-09-07 18:19:54 +02:00
dickreckard	cb7727900c	Update uploader.py ... default cover changed from none to pdf_preview when metadata parsing fails	2020-09-07 13:30:03 +02:00
Ozzieisaacs	e012726cd4	Fix #1461 (parse Amazon_* identifiers)	2020-09-06 19:31:31 +02:00
Ozzieisaacs	f49688fdb9	Fix #1461 (parse Amazon_* identifiers)	2020-09-06 19:31:03 +02:00
Ozzieisaacs	e32b017431	Revert "Test revert global Session" ... This reverts commit 393869e538.	2020-09-06 10:59:34 +02:00
Ozzieisaacs	393869e538	Test revert global Session	2020-09-06 10:27:10 +02:00
Ozzieisaacs	d3bde0408f	Improvederror handling for editing identifier	2020-09-05 18:47:28 +02:00
Ozzieisaacs	34d3225984	Errorhandling edit identifier	2020-09-05 18:46:11 +02:00
Ozzieisaacs	eaed53e25b	Fix for author edit error (2 same sort_authors lead maybe to choose wrong one)	2020-09-05 18:23:14 +02:00
OzzieIsaacs	feacbe8ebd	Possible Fix for database crash after adding new format and accessing calibre database afterwards	2020-09-05 10:24:32 +02:00
norangebit	bdf6052388	Conversion to kepub when creating a sync token	2020-09-03 21:57:14 +02:00
Ozzieisaacs	ec0a0190e7	Merge remote-tracking branch 'polish/master' into master	2020-09-01 20:18:29 +02:00
norangebit	99d653eece	Add automatic conversion in kepub ... Automatic conversion from epub to kepub of new book on Kobo sync.	2020-09-01 19:27:14 +02:00
OzzieIsaacs	f825c5ae83	Merge branch 'master' into Develop	2020-09-01 19:26:13 +02:00
OzzieIsaacs	173484c30e	Fix #1002, #1581 (Public shelfs not accessible as guest user)	2020-09-01 19:25:57 +02:00
OzzieIsaacs	884270093b	Merge remote-tracking branch 'worker/tasks' into Develop	2020-08-31 13:00:13 +02:00
Dawid Gliwka	62e7ab8c2b	Update polish translation	2020-08-30 21:17:56 +02:00
blitzmann	ded480207b	Add link to convert task, fixes #1589	2020-08-30 13:54:51 -04:00
blitzmann	ef49e2b5b3	Revert daemon in favor of timeout	2020-08-30 13:49:45 -04:00
blitzmann	b0a055a870	Rename email.py -> mail.py to avoid shadowing standard email module	2020-08-30 13:31:59 -04:00
blitzmann	9b9e29a3b6	Implement worker thread as a daemon	2020-08-30 13:29:42 -04:00
OzzieIsaacs	1a9a436cbe	Fixed wrong translation string ... Removed unused variables from callback in server.py Update Testresults	2020-08-30 17:11:11 +02:00
OzzieIsaacs	62dd29d2f3	Renamed email to mail due to naming conflict in python2	2020-08-30 08:49:53 +02:00
OzzieIsaacs	d406d91856	Merge remote-tracking branch 'worker/tasks' into Develop	2020-08-30 08:32:09 +02:00
OzzieIsaacs	98494c610a	Merge branch 'master' into Develop	2020-08-30 08:31:35 +02:00
OzzieIsaacs	649a553fa4	Merge remote-tracking branch 'metadata/master' into master	2020-08-30 08:30:32 +02:00
OzzieIsaacs	e17a06d7bd	Merge remote-tracking branch 'oauth/oauth-typo' into master	2020-08-30 08:28:27 +02:00
OzzieIsaacs	4b14cc6a74	Merge remote-tracking branch 'oauth/oauth-typo' into Develop	2020-08-30 08:28:14 +02:00
OzzieIsaacs	b65095fd0f	Merge remote-tracking branch 'google_oauth/patch-1' into Develop	2020-08-30 08:26:34 +02:00
OzzieIsaacs	28733179d2	Merge remote-tracking branch 'caliblur/editMetaFix' into Develop	2020-08-30 08:25:17 +02:00
OzzieIsaacs	960d23ca50	Merge remote-tracking branch 'caliblur/blurPaginationFix' into Develop	2020-08-30 08:23:06 +02:00
Michael Knepher	057f70ea9c	Add author sort	2020-08-29 18:53:00 -07:00
blitzmann	3e378bd665	Some more clean up	2020-08-29 21:04:49 -04:00
blitzmann	c120138f26	Fixes for pagination ugliness for caliBlur! style	2020-08-29 20:58:30 -04:00
blitzmann	31b20362ec	caliBlur! style: Fixes issue with edit metadata button not getting styled correctly	2020-08-29 18:45:23 -04:00
blitzmann	e7eb5b6ea6	Improvements to task processing ... * Moves clean up to separate function for organization * moves the `self.dequeued.append(item)` immediately after `self.queue.get()` so that we don't wait for it to show up (cherry picked from commit bc9372e88f0c8855694431f811702d7fb899a97e)	2020-08-29 12:25:33 -04:00
OzzieIsaacs	9e5cad0dc8	Merge new worker thread	2020-08-29 11:14:52 +02:00
blitzmann	4cb82ea9bd	Revert testing condition that decreased number of tasks kept	2020-08-27 21:49:55 -04:00
blitzmann	572ac4a17b	Fix for deleting old, completed tasks ... (cherry picked from commit e066d7a4b0f47d3327696a11795cdc923ff0f6f3)	2020-08-27 21:46:20 -04:00
Ozzie Isaacs	dc5191f8ba	Added unrar binary is found on windows	2020-08-27 21:01:45 +02:00
Ozzie Isaacs	8ab5710098	Updated testresuts Windows	2020-08-26 21:43:58 +02:00
OzzieIsaacs	61d628d596	oauth problem solved	2020-08-26 18:22:56 +02:00
Sean Leonard	078fc25845	Remove Google+ OAuth scope ... The scope is no longer available per https://developers.google.com/+/api-shutdown Fixes #1472 Fixes #1573	2020-08-26 08:56:56 -07:00
Marvel Renju	67eb4b317a	Fix typo ... google oauth provider obtain link was pointing to github	2020-08-26 03:15:39 +01:00
blitzmann	6322919bc7	Merge branch 'Develop' into tasks ... # Conflicts: # cps/db.py	2020-08-25 00:15:41 -04:00
blitzmann	b81b8a1dea	Fix registration email	2020-08-25 00:05:20 -04:00
blitzmann	f3a3797850	Fail the convert task if the email subtask fails	2020-08-24 21:28:55 -04:00
blitzmann	5ec1283bb1	Remove threading for the calibre DB class	2020-08-24 21:03:59 -04:00
blitzmann	8634b0c6f0	Remove left over placeholder code	2020-08-24 21:00:15 -04:00
Ozzie Isaacs	d89830af61	Fix anonymous user has no modified_flag error	2020-08-24 21:00:13 +02:00
Ozzie Isaacs	ef1736b571	Fix error on guest user (view settings missing)	2020-08-24 20:38:06 +02:00
Dave Mogle	d951ee4b83	Prefer kepub (#1439) ... Only offer kepub download URL over Kobo sync API when available	2020-08-24 13:43:54 -04:00
blitzmann	04081f62c4	Delete old worker thread class / logic	2020-08-23 23:34:41 -04:00
blitzmann	0f28dc5e55	Remove the queue stuff for CalibreDB (is no longer used)	2020-08-23 23:17:07 -04:00
blitzmann	508f49df18	Remove completed tasks and sort the tasks by date added when calling .tasks	2020-08-23 23:00:23 -04:00
blitzmann	bec280c6b1	Add some error handling	2020-08-23 21:51:44 -04:00
blitzmann	6a8ae9c0c4	Merge remote-tracking branch 'upstream/master' into tasks ... # Conflicts: # cps/helper.py	2020-08-23 21:38:56 -04:00
blitzmann	ac22483f98	Add error handling to the email task within the convert task	2020-08-23 21:35:05 -04:00
blitzmann	59d56d5c83	py27 support (I think) and some clean up	2020-08-23 21:21:55 -04:00
OzzieIsaacs	cdaad2fb4a	Merge branch 'master' into Develop	2020-08-23 21:23:00 +02:00
OzzieIsaacs	843279bacb	Merge remote-tracking branch 'jef/jef/download-kobo' into master	2020-08-23 21:22:44 +02:00
blitzmann	a000de0270	Some clean up	2020-08-23 13:33:57 -04:00
blitzmann	bf41b04cfa	Remove convert task from db.py - with the fixed from #1565, this no longer seems to be needed	2020-08-23 13:07:24 -04:00
blitzmann	9ce2e8ea53	Fix progress indication for emails that have been completed.	2020-08-23 12:58:24 -04:00
OzzieIsaacs	f066926fc9	Merge branch 'master' into Develop	2020-08-23 10:56:10 +02:00
OzzieIsaacs	4c38b0ab10	Prepare for save name sort order	2020-08-23 10:56:00 +02:00
OzzieIsaacs	cf35c9dcef	Merge remote-tracking branch 'name/patch-2' into master	2020-08-23 10:53:18 +02:00
OzzieIsaacs	45ff9394f2	Fix comma separated author names during for upload	2020-08-23 09:44:42 +02:00
blitzmann	414043ded1	Remove references to old worker, turn off calibre_db task queue (for now until I can determine if it's needed still), and attempt to re-implement email progress tracking (not working at the moment)	2020-08-22 23:35:48 -04:00
blitzmann	2533c9c14e	Continue converting tasks - email and upload tasks	2020-08-22 22:44:28 -04:00
blitzmann	f10f0dada6	First working PoC with a new task structure	2020-08-22 16:31:00 -04:00
OzzieIsaacs	282859bc1b	Merge remote-tracking branch 'github/master' into master	2020-08-22 15:38:40 +02:00
OzzieIsaacs	a3ae97a5a3	Fix #1574 (author name not shown in change book order in shelfs)	2020-08-22 15:37:40 +02:00
OzzieIsaacs	ed8275a20b	Fix #1574 (author name not shown in change book order in shelfs)	2020-08-22 15:35:21 +02:00
OzzieIsaacs	f2add3f788	Migration of view settings working in User database ... Book Merge gives now feedback on what is done	2020-08-22 10:27:09 +02:00
OzzieIsaacs	ad144922fb	Merge with master	2020-08-22 09:23:29 +02:00
OzzieIsaacs	b9c0f2a3d3	Merge remote-tracking branch 'origin/master' into master	2020-08-21 19:27:19 +02:00
OzzieIsaacs	0cc07362b8	Fix for #1573	2020-08-21 19:26:58 +02:00
Brandon Ingli	4ee5dcaff3	Elevate Log Messages in web.py ... Elevates login failure log messages and register failure log messages from INFO to WARNING, "Unknown Error" to ERROR, and fixes misspelling of "address" in web.py log messages. Misspelling remains in variable names to avoid breaking changes.	2020-08-17 11:29:10 -05:00
Ozzie Isaacs	4d44746a88	Change settings database gdrive watch to JSON	2020-08-15 15:07:03 +02:00
OzzieIsaacs	1535bdbcd8	Merge remote-tracking branch 'memorydatabase/issue/1564'	2020-08-15 12:08:59 +02:00
OzzieIsaacs	f9c6fb30bf	Excluded series type again, as it causes problems upon reconnect	2020-08-14 19:43:54 +02:00
Ozzie Isaacs	94ad93ebd7	Added series like custom columns #1501	2020-08-11 18:56:34 +02:00
blitzmann	0e1ec5034e	Fix for #1564 - using memory database in multiple threads. ... See also: https://docs.sqlalchemy.org/en/13/dialects/sqlite.html#using-a-memory-database-in-multiple-threads	2020-08-11 12:44:55 -04:00
OzzieIsaacs	b309c1fc91	Fix filenames (Escape "\") for searching calibre excecutable on windows	2020-08-09 15:11:54 +02:00
Ryan Holmes	969105b205	Trim whitespace from filename ... This avoids an OSError when the book's metadata has whitespace at the end of it.	2020-08-09 01:08:00 -04:00
Ryan Holmes	28bfb06c67	Revert the deletion of another line ... This was done by mistake, whoops!	2020-08-09 00:57:30 -04:00
Ryan Holmes	704dcb3e58	Move assignment of new_coverpath ... With the assignment originally being within the try, if the try failed, the exception wouldn't have access to the value	2020-08-09 00:55:56 -04:00
Ren Wei	4c6f5096be	get metadata, typo, if no result from google, it will display the noresult msg, regardless of the others results.	2020-08-01 15:12:20 +08:00
Ozzie Isaacs	1a1d105fae	Fix #1538 (Floating point numbers showing 2 decimals on details page	2020-07-23 19:31:48 +02:00
Ozzie Isaacs	42a0639bb5	Fix #1533 (Invalid LDAP Cert Path no longer crashes app)	2020-07-23 19:23:57 +02:00
Ozzie Isaacs	e27b08203d	Fix #1531 (white background on transparent cover instead of black one)	2020-07-23 18:41:38 +02:00
Clément Poissonnier	1ca4583896	feat(ldap): add a field that allows to override LDAP User Object Filter when a user is imported	2020-07-23 12:12:00 +02:00
Ozzie Isaacs	25fc6f1937	Further fixes for #1530 (Handle improper migrated database with config_mature_content_tags, allowed_tags, denied_tags, denied_column_value, allowed_column_value NULL instead of "")	2020-07-22 18:44:11 +02:00
Ozzie Isaacs	0ccc3f7252	Fixes for windows (moving files not allowed -> Close pdf after metadata extracting, add os.path.normcase to path while renaming folders, as thi caused also trouble ... Added hint for missing ghostcript on cover extraction	2020-07-21 20:14:08 +02:00
Ozzie Isaacs	66acd1821d	Update Gdrive integration (Error Handling on Callback and wording)	2020-07-21 18:01:38 +02:00
Ozzie Isaacs	93a0217d5f	Fix for #1530 (Handle improper migrated database with config_mature_content_tags NULL instead of "")	2020-07-20 20:28:10 +02:00
Jef LeCompte	711a697570	Merge remote-tracking branch 'upstream/master' into jef/download-kobo	2020-07-13 01:50:38 -04:00
Ozzieisaacs	f8139f3198	Store last selected view for sidebar (not for categories, series, publishers, ..) ... Started making search paged	2020-07-11 12:09:34 +02:00
Ozzieisaacs	df01022f49	Added save user view settings	2020-07-08 21:18:38 +02:00
Ozzieisaacs	450411a732	#1344 (Support Multiple authors, but not showing up on Kobo reader) ... Fix for #1439 (reading progress was not stored, as user login was wrong)	2020-07-05 20:54:36 +02:00
Ozzieisaacs	f80c67828b	Fix #1500 (Custom ratings of increment 0.5 are allowed)	2020-07-05 14:35:57 +02:00
Ozzieisaacs	d1889a5e06	Fix #1502 (program info only visible in about section if user is admin)	2020-07-05 14:00:40 +02:00
Ozzieisaacs	12263ff02f	Fix #1423 (OverflowError thrown during sync on some Linux Systems if one of the timestamps is outside range 1970 to 2038)	2020-07-05 13:55:59 +02:00
Ozzieisaacs	76f914cbc2	Fixed logging in SyncToken	2020-07-05 13:52:29 +02:00
Ozzieisaacs	c1f5252b3f	Fix #1509 (OSError thrown during sync on Windows if one of the timestamps is outside range 1970 to 2038)	2020-07-05 13:40:33 +02:00
Ozzieisaacs	20c6f79a44	Changed behavior delete books with subfolders (additional warning message, but book is deleted)	2020-07-05 10:44:49 +02:00
Ozzieisaacs	ee6f1405d4	Fix #1456 (Added route to robots.txt)	2020-07-04 21:22:19 +02:00
Ozzieisaacs	ee3541d74e	Fix kobo links for reverse proxies with subdomains (and docker?) #1470	2020-07-04 13:35:08 +02:00
Jef LeCompte	e048388213	feat(api): include external port option ... Signed-off-by: Jef LeCompte <jeffreylec@gmail.com>	2020-07-03 12:58:58 -04:00
Ozzieisaacs	3ff3431b17	Merge branch 'master' into Develop	2020-06-30 19:59:38 +02:00
Ozzieisaacs	8608ff11f7	Fix #1507 (Password generation on python2 working again)	2020-06-30 19:58:07 +02:00
Michael Knepher	7e0d9fbace	series_index filter to show x.0 as x	2020-06-29 23:34:26 -07:00
Ozzieisaacs	c6c9cfea22	Merging books basically working	2020-06-29 20:14:48 +02:00
Ozzieisaacs	a758976c69	Merge branch 'master' into Develop	2020-06-29 18:47:16 +02:00
OzzieIsaacs	601464083b	Fix for task wrap around	2020-06-28 13:44:21 +02:00
Ozzieisaacs	ccca5d4d1c	Merge branch 'master' into Develop ... # Conflicts: # cps/templates/layout.html	2020-06-28 12:11:46 +02:00
Ozzieisaacs	ba10657829	Add fix for read only gdrive file	2020-06-28 12:06:27 +02:00
Ozzieisaacs	6315655f93	Re-add missing po files	2020-06-28 12:05:16 +02:00
Ozzieisaacs	533cb23b73	Merge remote-tracking branch 'next/bug/login-next-get-param'	2020-06-28 10:01:41 +02:00
Ozzieisaacs	852f252d13	Prevent invalid variable ... Make text in kobo_auth_screen consistent	2020-06-28 09:48:05 +02:00
Ozzieisaacs	080042882f	Merge remote-tracking branch 'cz/master'	2020-06-28 09:33:18 +02:00
Ozzieisaacs	dde5b08c47	Re enabled gevent as dependency ... Fix #1399 (Calibre-web starting with installed and not activated gdrive denpendencies without internet connection again)	2020-06-27 13:36:33 +02:00
Ozzieisaacs	88d2c60ee8	Catch some errors related to non writable settings db	2020-06-27 13:22:16 +02:00
Ghighi Eftimie	eeff5a5d43	fix for hidden input 'next' on login form	2020-06-27 12:00:08 +03:00
Michael Knepher	67dd4a72b0	Add series info to all book "meta" displays	2020-06-26 12:26:36 -07:00
Ozzieisaacs	a0b8cc21cc	Fix #1503 (js error on login screen)	2020-06-23 15:07:14 +02:00
Ozzieisaacs	329a7a03a5	Fix for errors editing/uploading books with duplicate tags/authors/language names ... Additional parsing of epubs for cover files Fix for change of database with linked read_column and read column isn't present any more	2020-06-22 19:11:58 +02:00
Ozzieisaacs	d0a3503d74	Fix #1493 (stay logged in with enabled remember token, use remember token)	2020-06-20 19:02:23 +02:00
Ozzieisaacs	59b78f9984	enable disabling of remember_me function	2020-06-20 15:41:26 +02:00
Ozzieisaacs	bf75f16169	Updated Chinese translation	2020-06-20 13:55:34 +02:00
Ozzieisaacs	2f833dc457	Fix login with remember me token	2020-06-20 13:46:12 +02:00
Ozzieisaacs	22344a3971	Improvements for delete book	2020-06-18 20:39:45 +02:00
Ozzieisaacs	8dde6ba60f	UI improvements table buttons	2020-06-12 21:40:09 +02:00
Ozzieisaacs	d44f283a05	View status in books table is stored	2020-06-12 16:15:54 +02:00
Ozzieisaacs	c18d5786dd	Improved validation check	2020-06-12 13:45:07 +02:00
Ozzieisaacs	f26ccfe16c	Table edit: validator routine to prevent empty fields working	2020-06-11 21:36:12 +02:00
Ozzieisaacs	1c681ee378	Improvements for books table editor	2020-06-11 21:19:09 +02:00
Ozzieisaacs	94b5ec91cc	Title in table translatable ... Edit some elements in table possible Checkbox state is kept over page change in book table Fix missing div in layout	2020-06-11 08:48:23 +02:00
Ozzieisaacs	6bfbf3ee41	Update layout	2020-06-11 08:35:23 +02:00
Ozzieisaacs	7b4306b1d6	UI improvements (same colors of buttons, etc.) ... Changed Editable default value	2020-06-09 20:46:02 +02:00
Ozzieisaacs	4516cc0d65	Listen button only visible if user has read permissions ... Audioformat fix Table edit functions only available if user has edit rights	2020-06-08 21:57:52 +02:00
Ozzieisaacs	308784c601	Hide listen button if user has no read/listen permissions	2020-06-08 21:56:40 +02:00
Ozzieisaacs	9145c9a52c	Fix #1397 (Reenabled m4a, m4b audio playback)	2020-06-08 21:50:11 +02:00
Ozzieisaacs	4038cb5b85	Internal paged Search prepared ... Search for table list is working	2020-06-08 17:34:03 +02:00
Ozzieisaacs	628658972c	Merge branch 'master' into Develop	2020-06-07 19:39:17 +02:00
Ozzieisaacs	db0fe9a755	Fix for #1474 (old comicapi with installed unrar, but missing unrar-lib)	2020-06-07 15:41:53 +02:00
Ozzieisaacs	fdf10e3d2e	Fix #1473 (reconnect not working via web-route access)	2020-06-07 14:11:41 +02:00
Ozzieisaacs	ded3e06a9b	Updated french translation	2020-06-07 06:48:51 +02:00
Ozzieisaacs	0dd0605a1f	Book list for merging	2020-06-06 21:21:10 +02:00
Ozzieisaacs	827b0c6e50	Changed pubdate to timestamp	2020-06-06 09:52:35 +02:00
Ozzieisaacs	d1b533848d	Changed pubdate to timestamp	2020-06-05 20:13:39 +02:00
Ozzieisaacs	13ae28edab	Fix #1449 (Shelf download menu wasn't working for books with more than one format)	2020-06-04 20:34:31 +02:00
Ozzieisaacs	82253219e8	Fix #1449 (Shelf download menu wasn't working for books with more than one format)	2020-06-04 20:33:14 +02:00
Ozzieisaacs	94592b74a6	Merge branch 'master' into Develop	2020-06-03 20:15:55 +02:00
Ozzieisaacs	eef2112e1e	#1430 (changed color of rating stars)	2020-06-03 20:14:07 +02:00
Ozzieisaacs	b83d56eff2	Version bump	2020-06-03 19:10:36 +02:00
Ozzieisaacs	4c539b6db4	Fix #1448 (Public shelfs are accessible even if not logged in)	2020-06-03 19:10:07 +02:00
OzzieIsaacs	2ad329e64c	Preparation for release	2020-06-02 22:12:36 +02:00
Ozzieisaacs	4de89ec6ce	Merge remote-tracking branch 'it/patch-14'	2020-06-02 20:58:17 +02:00
Ozzieisaacs	fc885c8fa2	Merge remote-tracking branch 'cz/patch-1'	2020-06-02 20:51:31 +02:00
Ozzieisaacs	ef2c98ba39	Fix #1453 (error unrar binary not found)	2020-06-02 20:51:08 +02:00
ElQuimm	41d922867e	updated italian version of message.po ... Thank you.	2020-06-02 09:02:44 +02:00
Ozzieisaacs	89223760e6	Merge branch 'master' into Develop	2020-06-01 10:58:49 +02:00
Ozzieisaacs	9a8a1f75ca	For for error unrar binary not found	2020-06-01 10:54:41 +02:00
flying-sausages	52e8e7e4b0	Some czech translations	2020-05-31 22:51:41 +01:00
Ozzieisaacs	7d08cde8b8	Update error handling cover upload	2020-05-29 06:59:40 +02:00
Ozzieisaacs	d3c2bf7dd4	Merge remote-tracking branch 'es/patch-1'	2020-05-28 18:50:16 +02:00
Michael Knepher	54cf3652b0	Add series name and index to book cover info	2020-05-27 21:57:59 -07:00
Ozzieisaacs	5607d2086d	Added error handling for cover upload	2020-05-27 20:41:16 +02:00
Ozzieisaacs	27ed918896	Enabled search for archived books	2020-05-27 19:19:17 +02:00
Ozzieisaacs	9b2df9cfd9	Fix #1441 (list copy function not available on python2, crashes edit metadata)	2020-05-27 18:38:50 +02:00
Wolviex	dde7cf18f7	removed extra reference to calibre_db (calibre_db.calibre_db..) typo?	2020-05-27 01:41:15 -07:00
Rafael Roa	48aadbf716	Update messages.po	2020-05-26 23:28:29 +02:00
Ozzieisaacs	5514af60e5	Merge remote-tracking branch 'it/patch-13'	2020-05-26 18:43:12 +02:00
ElQuimm	e8449eb02f	Updated version of italian message.po ... Thank you.	2020-05-26 18:37:15 +02:00
Ozzieisaacs	9ea21a7ecb	Possible fix for #1436	2020-05-26 18:20:32 +02:00
Ozzieisaacs	fec86c2862	Update Grid/list view of series	2020-05-26 15:19:32 +02:00
Ozzieisaacs	11e5d4c5b7	Merge remote-tracking branch 'es/patch-2'	2020-05-25 21:57:26 +02:00
Ozzieisaacs	b852fb0e26	Merge branch 'Develop'	2020-05-25 21:30:21 +02:00
Ozzieisaacs	0fc18bf3b1	Fix for #1398 (prevent empty series_index field)	2020-05-25 19:34:31 +02:00
Rafael Roa	d4be584782	Update messages.po ... Here is the whole file traslated	2020-05-25 17:35:46 +02:00
Ozzieisaacs	6f9c08f906	Fix typo RarExecutable	2020-05-24 20:54:23 +02:00
Ozzieisaacs	70c666c380	Upload book without reload complete library	2020-05-24 20:40:58 +02:00
Ozzieisaacs	46197d82b5	Edit and Upload books refactored	2020-05-24 20:19:43 +02:00
Ozzie Isaacs	e4eab17595	Fix version detect of binaries on windows	2020-05-24 17:24:54 +02:00
Ozzieisaacs	cf10244f20	Fix for failed recovery of config_logfile	2020-05-24 09:59:45 +02:00
Ozzieisaacs	570684d308	Fix custom bool column not visible in adv search if linked to read status	2020-05-23 21:26:39 +02:00
Ozzieisaacs	244db8d894	Fix from tests advanced search for custom columns	2020-05-23 21:17:58 +02:00
Ozzieisaacs	96d6018ecc	Added ability to view comicapi version ... Changed required comicapi version Unified "cannot" and "Cannot" texts Removed annoying "was already removed" string from log	2020-05-23 16:20:19 +02:00
OzzieIsaacs	73ad6dd0c4	Fix kobo sync (sync tags)	2020-05-23 14:40:50 +02:00
OzzieIsaacs	d0e15da352	Fix lcase function	2020-05-23 12:51:48 +02:00
Ozzieisaacs	b1b293a3ec	Fix order_authors	2020-05-23 11:09:50 +02:00
Ozzieisaacs	5f0660a4e5	Refactored helper.py and db.py	2020-05-23 10:16:29 +02:00
Ozzieisaacs	ec3a3a73ef	Merge branch 'master' into Develop	2020-05-23 08:50:24 +02:00
Ozzieisaacs	087c4c5929	Merge remote-tracking branch 'opds/master'	2020-05-23 08:48:08 +02:00
Ozzieisaacs	e0ee2e0801	Merge remote-tracking branch 'typo/master'	2020-05-23 08:47:08 +02:00
Michael Knepher	c79a9e9858	Fix typo "Shelfs" to "Shelves"	2020-05-22 11:43:52 -07:00
OzzieIsaacs	b7535b9526	Merging master branch ... - fix title sort function - fix focus on search	2020-05-21 22:31:29 +02:00
OzzieIsaacs	0cf1cc5587	Fixes from tests	2020-05-21 22:26:19 +02:00
Ozzieisaacs	098dab889a	Fixed title sorting routine	2020-05-21 19:37:54 +02:00
Ozzieisaacs	cc856c7cd1	Merge remote-tracking branch 'search_focus/activate-search-focus-if-search-in-progress'	2020-05-21 19:18:02 +02:00
Ozzieisaacs	a20a155d39	Merge remote-tracking branch 'typo/patch-2' into Develop	2020-05-21 19:14:29 +02:00
Ozzieisaacs	1a458fe39f	Fix for #1407 converting books should now be possible again	2020-05-21 18:16:11 +02:00
celogeek	051ffdda35	activate search focus if search in progress	2020-05-21 16:42:02 +02:00
OzzieIsaacs	a48418364c	Fiexes from tests	2020-05-21 13:54:28 +02:00
Ozzieisaacs	b75497231e	Additional fix for #1407 (metadata.db is now held in memory, app.db is attached to it -> joins between both databases possible -> book_read_link is joined for getting result)	2020-05-21 09:28:35 +02:00
Knepherbird	5cceeb6ef2	Fix: correct property typo ... Correcting 'box-sizeing' to 'box-sizing'	2020-05-19 13:10:25 -07:00
Ozzieisaacs	29b94c5615	Fix for #1407 (to many read books lead to to large sql query) -> only fix for linked calibre-column	2020-05-19 21:36:22 +02:00
Ozzieisaacs	81fc1eccd3	Fix for #1407 (to many read books lead to to large sql query) -> only fix for linked calibre-column	2020-05-19 21:35:56 +02:00
Braincoke	22fae51c9d	Fix XML parsing error when using OPDS feeds ... Using the OPDS feeds with MoonReader yielded the following error: "Error parsing XML: unbound prefix". This was due to a missing namespace in the feed.xml template. See https://github.com/janeczku/calibre-web/issues/1403 for more information.	2020-05-18 20:07:02 +02:00
Ozzieisaacs	4332f7a640	Better detection of localhost for kobo sync (possibly related to #1400)	2020-05-17 21:44:12 +02:00
Ozzieisaacs	d0e603e62d	Better detection of localhost for kobo sync	2020-05-17 21:42:25 +02:00
Ozzieisaacs	38c28f4358	Merge branch 'master' into Develop ... # Conflicts: # cps/admin.py # cps/constants.py # cps/static/css/caliBlur.min.css # cps/uploader.py	2020-05-17 16:22:58 +02:00
Ozzieisaacs	742799b4ac	Added missing float custom column to search form	2020-05-17 16:10:10 +02:00
Ozzieisaacs	5405dc5141	Fix for #1387 (saving settings with enabled gdrive metadata watch led to crash)	2020-05-17 11:15:46 +02:00
Ozzieisaacs	013793f989	Fix for #1391 (Kobo sync not working if series is given, but no series_index)	2020-05-17 10:46:48 +02:00
Ozzieisaacs	2468cf63cc	Fix for #1397 (changed supported audio files) ... Changed max gevent version Fix for #1397 (changed supported audio files)	2020-05-17 10:07:36 +02:00
Ozzieisaacs	8e9b5d7e50	Merge remote-tracking branch 'caliblur/master'	2020-05-15 21:01:08 +02:00
Ozzieisaacs	a33515d907	Merge remote-tracking branch 'refactor/refactor_uploader'	2020-05-15 20:36:00 +02:00
Ozzieisaacs	a276a33081	Merge remote-tracking branch 'nl/master'	2020-05-15 20:34:30 +02:00
h1f0x	e325c3dbf6	fixed div selection in caliBlur.js	2020-05-14 12:29:52 +02:00
h1f0x	b3fef625a8	Fixed Calibur views: series, authors, publishers, ratings, file formats, detail view	2020-05-14 11:57:38 +02:00
Ozzieisaacs	13994a5f96	Merge branch 'master' into Develop	2020-05-13 20:16:29 +02:00
Ozzieisaacs	e8ac62cdd8	Moved password replace to prevent incomplete session	2020-05-13 20:15:35 +02:00
Ozzieisaacs	1bc7134ec2	Fix error 500 on reset password in debug mode	2020-05-13 20:04:43 +02:00
Ozzieisaacs	273572f44c	Merge branch 'master' into Develop ... # Conflicts: # cps/ub.py	2020-05-13 20:03:54 +02:00
Ozzieisaacs	ac37483d47	Fix for #1391 (kobo sync errors out if read/unread books had been present in app.db during initial database migration)	2020-05-13 19:43:14 +02:00
Ozzieisaacs	0cc2b49296	Merge branch 'master' into Develop ... # Conflicts: # cps/templates/book_edit.html	2020-05-12 19:10:19 +02:00
Ozzieisaacs	44d5adc16f	Fix #1390	2020-05-12 19:08:51 +02:00
Ozzieisaacs	f749fc641b	Temporary fix for #1390	2020-05-12 17:42:24 +02:00
Ozzieisaacs	87c76c09e2	temporary fix for #1390	2020-05-12 17:41:49 +02:00
Ozzieisaacs	e787f9dd9f	Automatic username (#1172)	2020-05-12 17:23:58 +02:00
Ozzieisaacs	ec7d5b17ab	Added table view for books	2020-05-12 16:32:26 +02:00
Ozzieisaacs	47641eee59	Merge branch 'master' into Develop	2020-05-12 16:16:04 +02:00
Ozzieisaacs	42abe28cc1	Fix for #1389 (import ldap users with whitespaces)	2020-05-12 16:13:56 +02:00
Ozzieisaacs	b48afa38ac	Fix #1386 (Add asin to recognized identifiers)	2020-05-12 14:44:57 +02:00
Ozzieisaacs	f7269d8df2	Fix for #1385 (Private shelves are listed twice in the "Add to shelf" dropdown menu)	2020-05-12 14:39:13 +02:00
Ozzieisaacs	ce0fab8d2f	Fix duplicate shelf names in "search"	2020-05-12 14:37:13 +02:00
Ozzieisaacs	33472567de	Improved Debug output on send email	2020-05-11 19:28:22 +02:00
Ozzieisaacs	f5e12328dc	Fix for #1382 (Restrictions with "&" in it can't be deleted)	2020-05-11 18:41:34 +02:00
Ozzieisaacs	486c0f2937	Fix for #1382 (Restrictions with "&" in it can't be deleted)	2020-05-11 18:41:16 +02:00
jvoisin	e69c4cd1dc	Refactor a bit cps/uploader.py	2020-05-11 13:15:30 +02:00
Marcel	e0d3ccd8d1	Update messages.po	2020-05-10 21:05:39 +02:00
Ozzieisaacs	16a3deec2c	Merge branch 'master' into Develop ... # Conflicts: # cps/helper.py	2020-05-10 19:24:55 +02:00
OzzieIsaacs	92db00692a	Merge all headers to download response ... Updated test results	2020-05-10 14:58:18 +02:00
OzzieIsaacs	fe88010a72	Merge remote-tracking branch 'sec_fixes/minor_fix_caliblur'	2020-05-10 14:57:19 +02:00
OzzieIsaacs	99ae4be2c2	Merge remote-tracking branch 'sec_fixes/bump_jquery'	2020-05-10 10:43:20 +02:00
OzzieIsaacs	a9085752c1	Fix error "email" not in to_save	2020-05-10 10:26:22 +02:00
OzzieIsaacs	e1fbc9255c	Merge remote-tracking branch 'sec_fixes/bump_underscore'	2020-05-10 10:26:01 +02:00
OzzieIsaacs	f33e25ac40	Merge remote-tracking branch 'sec_fixes/cookies_improvement'	2020-05-10 10:22:21 +02:00
OzzieIsaacs	51365ab006	Merge remote-tracking branch 'sec_fixes/strong_session_protection'	2020-05-10 10:21:19 +02:00
OzzieIsaacs	d61b7e48d7	Merge remote-tracking branch 'sec_fixes/random_password'	2020-05-10 10:18:40 +02:00
OzzieIsaacs	f590b24f85	Merge remote-tracking branch 'sec_fixes/https'	2020-05-10 10:17:36 +02:00
Ozzieisaacs	308fd55483	#1141 (Setting for file size limit on email)	2020-05-09 20:29:17 +02:00
Ozzieisaacs	fefb44e612	#1356 (fixes for readonly metadata.db) ... Fix remove trailing metadata.db at entering calibre_db_path	2020-05-09 19:54:28 +02:00
jvoisin	dd3b562f1a	Change some links from http to https	2020-05-09 17:11:56 +02:00
jvoisin	30c9aa3df9	Minor fixes to caliBlur.js ... - Add alt attributes to images - Fix a broken tag	2020-05-09 17:07:22 +02:00
jvoisin	688184e255	Bump jquery	2020-05-09 17:00:03 +02:00
Ozzieisaacs	75fb7c2e95	Allowing upload extensions (#1119)	2020-05-09 16:54:22 +02:00
jvoisin	264b4b669e	Bump underscorejs version from 1.9.1 to 1.12.2	2020-05-09 16:54:21 +02:00
Ozzieisaacs	51f12c51ad	Fix #1361 (covers of archived books not shown)	2020-05-09 16:37:02 +02:00
Ozzieisaacs	03d134697c	Fix #1361 (covers of archived books not shown)	2020-05-09 16:36:08 +02:00
Ozzieisaacs	ff3f42db95	Fix #1364 (translated format identifier) ... Updated french Translation	2020-05-09 16:12:55 +02:00