2095 Commits

Author	SHA1	Message	Date
Ozzieisaacs	81ea24ad54	Merge branch 'master' into df	2020-11-22 09:34:11 +01:00
Ozzieisaacs	eed2f0a430	Merge remote-tracking branch 'comic/master' into master	2020-11-22 08:45:02 +01:00
Ozzieisaacs	31fe8cd263	Improvement for #1721 (shrinked generic cover)	2020-11-22 08:28:52 +01:00
Ozzieisaacs	a3fadbaa1a	Shrinked size of generic cover	2020-11-22 08:28:10 +01:00
Ozzieisaacs	e2be655d74	Update LDAP, fix Windows AD login (#1697)	2020-11-22 08:17:00 +01:00
Ozzieisaacs	6538aff02f	Merge branch 'master' into Develop	2020-11-22 08:08:27 +01:00
Ozzieisaacs	42c13ae135	Fix for #1718 (fetch of metadata from google without cover leads to exception)	2020-11-20 20:35:07 +01:00
Ozzieisaacs	9bd51c650b	Add config options for client certificate authentication	2020-11-20 19:47:50 +01:00
Ozzieisaacs	ba1c1c87c4	Merge remote-tracking branch 'kobo/feature/use-kobo-specific-download-urls' into Develop	2020-11-20 19:47:25 +01:00
Ozzieisaacs	ceefba2743	Fix for #1550 (password prompt for LDAP and anonymous browsing)	2020-11-15 17:16:01 +01:00
Ozzieisaacs	32b7b39223	Added function to download debug information	2020-11-15 14:25:27 +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