2395 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Ozzieisaacs	0771546dad	Log exception on user import	2020-11-01 18:25:38 +01:00
OzzieIsaacs	b9b8e3f632	Update testresults	2020-10-31 20:12:22 +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
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
Ozzie Isaacs	72a2fc49f8	Update Windows testresults	2020-10-28 20:23:19 +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
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
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
Ozzie Isaacs	e8620a0986	Fix logging error on windows with invalid goodreads key/secret	2020-10-14 20:48:01 +02:00
Ozzie Isaacs	7fb18bbdc7	Update Testresults on windows	2020-10-14 19:54:58 +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
Ozzie Isaacs	d128b037a5	Fix for editing files on windows	2020-10-11 18:01:26 +02:00
Ozzieisaacs	99fda00442	Merge remote-tracking branch 'caliblur/issue/caliblur-1560' into master	2020-10-11 12:43:21 +02:00
Ghighi Eftimie	f1e6f6e505	fixes for #1560	2020-10-10 14:58:06 +03:00
Ghighi Eftimie	b4f95cced7	Merge remote-tracking branch 'upstream/master'	2020-10-10 14:51:55 +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
Ghighi Eftimie	5027304801	Merge remote-tracking branch 'upstream/master'	2020-10-10 11:50:19 +03:00
Ozzieisaacs	85d5afd6d9	Merge branch 'Develop' into master	2020-10-10 10:38:11 +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	6b993ad329	Update test results	2020-10-10 10:14:09 +02:00
OzzieIsaacs	d70ded0993	Fix for search	2020-10-10 07:47:27 +02:00