Ozzie Isaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							fac232229e
							
						
					 | 
					
						
						
							
							Added missing ead/unread category in user list #1938
						
						
						
						
						
					 | 
					
						2021-04-07 17:49:19 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzie Isaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							a43021e87c
							
						
					 | 
					
						
						
							
							Fix for #1938
						
						
						
						
						
					 | 
					
						2021-04-07 17:46:17 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzie Isaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							1a0de3b3cf
							
						
					 | 
					
						
						
							
							Merge remote-tracking branch 'de_translation/patch-1' into master
						
						
						
						
						
					 | 
					
						2021-04-06 18:08:32 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzie Isaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							8acd1f1fe4
							
						
					 | 
					
						
						
							
							Code refactoring and improved error handling for edit user list
						
						
						
						
						
						
						
						Update teststatus 
						
					 | 
					
						2021-04-06 17:29:42 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzie Isaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							665210e506
							
						
					 | 
					
						
						
							
							Fixes for book edit with title sort and author sort
						
						
						
						
						
					 | 
					
						2021-04-04 14:01:06 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzie Isaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							91b9370a21
							
						
					 | 
					
						
						
							
							Merge branch 'master' into development
						
						
						
						
						
						
						
						# Conflicts:
#	cps/static/css/libs/bootstrap-table.min.css
#	cps/static/js/libs/bootstrap-table/bootstrap-table-editable.min.js
#	cps/static/js/libs/bootstrap-table/bootstrap-table.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-af-ZA.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-ar-SA.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-bg-BG.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-ca-ES.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-cs-CZ.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-da-DK.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-de-DE.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-el-GR.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-en-US.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-es-AR.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-es-CL.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-es-CR.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-es-ES.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-es-MX.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-es-NI.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-es-SP.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-et-EE.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-eu-EU.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-fa-IR.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-fi-FI.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-fr-BE.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-fr-CH.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-fr-FR.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-fr-LU.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-he-IL.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-hr-HR.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-hu-HU.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-id-ID.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-it-IT.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-ja-JP.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-ka-GE.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-ko-KR.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-ms-MY.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-nb-NO.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-nl-BE.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-nl-NL.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-pl-PL.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-pt-BR.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-pt-PT.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-ro-RO.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-ru-RU.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-sk-SK.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-sr-Cyrl-RS.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-sr-Latn-RS.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-sv-SE.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-th-TH.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-tr-TR.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-uk-UA.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-ur-PK.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-uz-Latn-UZ.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-vi-VN.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-zh-CN.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-zh-TW.min.js 
						
					 | 
					
						2021-04-02 17:13:22 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzie Isaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							ca0aa600b4
							
						
					 | 
					
						
						
							
							Bugfix german translation
						
						
						
						
						
					 | 
					
						2021-04-02 17:12:26 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzie Isaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							1c42c4c969
							
						
					 | 
					
						
						
							
							Update bootstrap-table
						
						
						
						
						
						
						
						Fixes for book edit 
						
					 | 
					
						2021-04-02 17:11:16 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzie Isaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							6e406311c3
							
						
					 | 
					
						
						
							
							Fix #1928 (ldap_import_user_filter missing in to_save)
						
						
						
						
						
					 | 
					
						2021-04-02 08:40:29 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								robochud
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							87884c1af2
							
						
					 | 
					
						
						
							
							Update messages.po
						
						
						
						
						
						
						
						very little typo 
						
					 | 
					
						2021-03-31 00:56:12 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								cbartondock
							
						 
					 | 
					
						
						
						
						
							
						
						
							42a23ea23c
							
						
					 | 
					
						
						
							
							removed some dumb graphical inconsistencies
						
						
						
						
						
					 | 
					
						2021-03-29 14:35:48 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								cbartondock
							
						 
					 | 
					
						
						
						
						
							
						
						
							710c31d1ca
							
						
					 | 
					
						
						
							
							Fixed book details not loading after infinite scroll
						
						
						
						
						
					 | 
					
						2021-03-29 14:13:22 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								cbartondock
							
						 
					 | 
					
						
						
						
						
							
						
						
							f637ba4dad
							
						
					 | 
					
						
						
							
							Fixed border display in book details
						
						
						
						
						
					 | 
					
						2021-03-29 13:52:09 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzie Isaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							b17d71e4c3
							
						
					 | 
					
						
						
							
							Update optional-requirements.txt
						
						
						
						
						
						
						
						Bugfix Mail task after convert task 
						
					 | 
					
						2021-03-28 20:36:08 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzie Isaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							3c5bd3a605
							
						
					 | 
					
						
						
							
							Added gmail.json file to excluded file, added file also to excluded file during update
						
						
						
						
						
					 | 
					
						2021-03-28 15:01:56 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzie Isaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							99520d54a5
							
						
					 | 
					
						
						
							
							Added ability to send emails via gmail (#1905)
						
						
						
						
						
						
						
						Gmail email sending 
						
					 | 
					
						2021-03-28 14:51:01 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzie Isaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							e10a8c078b
							
						
					 | 
					
						
						
							
							Merge branch 'master' into development
						
						
						
						
						
						
						
						# Conflicts:
#	cps/templates/email_edit.html 
						
					 | 
					
						2021-03-27 18:36:11 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzie Isaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							7a196fed7c
							
						
					 | 
					
						
						
							
							Prevent empty email port and server address(#1906)
						
						
						
						
						
					 | 
					
						2021-03-27 18:34:57 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzie Isaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							c418c7e725
							
						
					 | 
					
						
						
							
							Prevent empty email from field (#1906)
						
						
						
						
						
					 | 
					
						2021-03-27 18:31:49 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzie Isaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							e35748deff
							
						
					 | 
					
						
						
							
							Fix wording and tabs
						
						
						
						
						
					 | 
					
						2021-03-27 17:30:54 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzie Isaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							b57efbe31c
							
						
					 | 
					
						
						
							
							Fix wording and tabs
						
						
						
						
						
					 | 
					
						2021-03-27 17:30:10 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzie Isaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							8f91437701
							
						
					 | 
					
						
						
							
							Implementation for gmail server with OAuth2 started
						
						
						
						
						
					 | 
					
						2021-03-27 16:36:24 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzie Isaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							a7eb547ca4
							
						
					 | 
					
						
						
							
							Renamed brazilian datepicker file
						
						
						
						
						
					 | 
					
						2021-03-27 12:40:23 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzie Isaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							0ceb12f74f
							
						
					 | 
					
						
						
							
							Renamed brazilian datepicker file
						
						
						
						
						
					 | 
					
						2021-03-27 12:40:01 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzie Isaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							4960624de7
							
						
					 | 
					
						
						
							
							Merge branch 'master' into development
						
						
						
						
						
					 | 
					
						2021-03-27 12:20:28 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzie Isaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							2c92f24d89
							
						
					 | 
					
						
						
							
							Added Brazilian translation
						
						
						
						
						
					 | 
					
						2021-03-27 12:20:07 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzie Isaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							0b7c679dba
							
						
					 | 
					
						
						
							
							Changed test email message (fix #657)
						
						
						
						
						
					 | 
					
						2021-03-27 09:48:43 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzie Isaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							aab3cdc58a
							
						
					 | 
					
						
						
							
							Changed test email message
						
						
						
						
						
					 | 
					
						2021-03-27 09:47:43 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzie Isaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							3c63f5b204
							
						
					 | 
					
						
						
							
							Merge branch 'master' into development
						
						
						
						
						
					 | 
					
						2021-03-27 09:46:12 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzie Isaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							0b97bbf827
							
						
					 | 
					
						
						
							
							Merge remote-tracking branch 'div_a/use-kobo-for-download-link' into master
						
						
						
						
						
					 | 
					
						2021-03-27 09:39:44 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzie Isaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							970dbb0c59
							
						
					 | 
					
						
						
							
							Merge branch 'master' into development
						
						
						
						
						
						
						
						# Conflicts:
#	cps/opds.py
#	cps/templates/admin.html 
						
					 | 
					
						2021-03-27 09:38:12 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzie Isaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							d21d3c2ceb
							
						
					 | 
					
						
						
							
							Merge remote-tracking branch 'div_a/use-btn-anchors' into master
						
						
						
						
						
					 | 
					
						2021-03-27 09:33:28 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzie Isaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							f26beec1d3
							
						
					 | 
					
						
						
							
							Updated pdf reader
						
						
						
						
						
					 | 
					
						2021-03-25 18:57:40 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzie Isaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							c4225e29ed
							
						
					 | 
					
						
						
							
							Updated pdf reader
						
						
						
						
						
					 | 
					
						2021-03-25 18:57:25 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzie Isaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							f4e134742b
							
						
					 | 
					
						
						
							
							Fix updater
						
						
						
						
						
						
						
						Bugfixes from testruns
Update Testresults 
						
					 | 
					
						2021-03-24 18:46:03 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzie Isaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							2b17bf4114
							
						
					 | 
					
						
						
							
							Update tests
						
						
						
						
						
						
						
						Fixes upload book 
						
					 | 
					
						2021-03-23 18:57:04 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzie Isaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							c4f0fc8f7b
							
						
					 | 
					
						
						
							
							Update tests
						
						
						
						
						
						
						
						Fixes upload book 
						
					 | 
					
						2021-03-23 17:57:49 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Gavin Mogan
							
						 
					 | 
					
						
						
						
						
							
						
						
							c279055af4
							
						
					 | 
					
						
						
							
							Use the kobo auth'd version for download link when proxied -- Fixes #1908
						
						
						
						
						
					 | 
					
						2021-03-22 18:08:41 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Gavin Mogan
							
						 
					 | 
					
						
						
						
						
							
						
						
							657cba042a
							
						
					 | 
					
						
						
							
							Use btn classes on anchors not div so the entire button is clickable
						
						
						
						
						
					 | 
					
						2021-03-22 17:25:38 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzie Isaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							7a58e48cae
							
						
					 | 
					
						
						
							
							Bugfixes opds feed
						
						
						
						
						
					 | 
					
						2021-03-22 19:01:18 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzie Isaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							670eab62bf
							
						
					 | 
					
						
						
							
							Update opds feed with letters for all titles, authors, categories and series
						
						
						
						
						
					 | 
					
						2021-03-22 17:46:15 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzie Isaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							fc85586809
							
						
					 | 
					
						
						
							
							Bugfixes for sqlalchemy 1.4.0
						
						
						
						
						
					 | 
					
						2021-03-22 16:33:21 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzie Isaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							837fc4988d
							
						
					 | 
					
						
						
							
							Letterize authors
						
						
						
						
						
					 | 
					
						2021-03-21 20:21:10 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzie Isaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							4664b47851
							
						
					 | 
					
						
						
							
							Fixed alphabetical order in list and grid view
						
						
						
						
						
						
						
						Completed download section 
						
					 | 
					
						2021-03-21 19:31:32 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzie Isaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							9864d932e0
							
						
					 | 
					
						
						
							
							Changed user.nickname to user.name
						
						
						
						
						
						
						
						Added function to view downloads of all users for admins 
						
					 | 
					
						2021-03-21 18:55:02 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzie Isaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							436f60caa9
							
						
					 | 
					
						
						
							
							refactored some functions
						
						
						
						
						
					 | 
					
						2021-03-21 14:17:07 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzie Isaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							e9530eda9d
							
						
					 | 
					
						
						
							
							Bugfix from refactoring
						
						
						
						
						
					 | 
					
						2021-03-21 13:46:13 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzie Isaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							f4ddac16f9
							
						
					 | 
					
						
						
							
							Improved error logging for #1905
						
						
						
						
						
					 | 
					
						2021-03-21 11:58:51 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzie Isaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							33bdc07f55
							
						
					 | 
					
						
						
							
							Fix for #1845 (ods not working in Moonreader an Librera)
						
						
						
						
						
						
						
						Fix opds search with wrong parameter no longer causes error 500 
						
					 | 
					
						2021-03-21 11:57:42 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzie Isaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							130a4ed2d3
							
						
					 | 
					
						
						
							
							Fix opds and error logging in mail
						
						
						
						
						
					 | 
					
						2021-03-21 11:54:39 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzie Isaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							59ebc1af8a
							
						
					 | 
					
						
						
							
							Code refactoring
						
						
						
						
						
					 | 
					
						2021-03-21 08:20:04 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzie Isaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							82e15d2e98
							
						
					 | 
					
						
						
							
							Merge branch 'master' into development
						
						
						
						
						
						
						
						# Conflicts:
#	test/Calibre-Web TestSummary_Linux.html 
						
					 | 
					
						2021-03-21 07:28:52 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzie Isaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							9c842f1895
							
						
					 | 
					
						
						
							
							Bugfixes pdf xmp parsing
						
						
						
						
						
					 | 
					
						2021-03-21 07:28:35 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzie Isaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							8cc849488b
							
						
					 | 
					
						
						
							
							Code cosmetics
						
						
						
						
						
					 | 
					
						2021-03-21 07:15:38 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzie Isaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							d3f8153b90
							
						
					 | 
					
						
						
							
							Merge branch 'master' into development
						
						
						
						
						
					 | 
					
						2021-03-20 19:34:16 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzie Isaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							b1b7ee65b4
							
						
					 | 
					
						
						
							
							Refactored advanced search
						
						
						
						
						
					 | 
					
						2021-03-20 18:10:27 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzie Isaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							6889456662
							
						
					 | 
					
						
						
							
							Merge remote-tracking branch 'adv_search/master' into master
						
						
						
						
						
					 | 
					
						2021-03-20 17:48:21 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzie Isaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							5d8d796807
							
						
					 | 
					
						
						
							
							Compatibility for sqlalchemy 2.0
						
						
						
						
						
					 | 
					
						2021-03-20 10:09:08 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzie Isaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							f3d88fc746
							
						
					 | 
					
						
						
							
							Update sqlalchemy 1.4 working
						
						
						
						
						
					 | 
					
						2021-03-20 09:31:29 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzie Isaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							d87ccae6c9
							
						
					 | 
					
						
						
							
							Merge branch 'master' into development
						
						
						
						
						
						
						
						# Conflicts:
#	cps/server.py
#	test/Calibre-Web TestSummary_Linux.html 
						
					 | 
					
						2021-03-19 20:33:38 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzie Isaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							2760a7816d
							
						
					 | 
					
						
						
							
							Fix metadata recognition fb2 files
						
						
						
						
						
					 | 
					
						2021-03-19 20:32:15 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzie Isaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							8f5c649d0f
							
						
					 | 
					
						
						
							
							Updated dependency comicapi (removed pypdf2)
						
						
						
						
						
						
						
						Updated dependency pyPDF2 ->pyPDF3
Fixed broken updater in case of http error
Bugfixes from testrun
Bugfix load cover for BasicMetadata 
						
					 | 
					
						2021-03-19 13:35:52 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzie Isaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							fcf9e7a1ef
							
						
					 | 
					
						
						
							
							Upload pdf fixes:
						
						
						
						
						
						
						
						Handle no title
Handle no author
Fix import of more than one language
Add missing pdf upload publisher handling 
						
					 | 
					
						2021-03-17 19:06:51 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzie Isaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							2be7b6480a
							
						
					 | 
					
						
						
							
							Merge remote-tracking branch 'pdf/XMP_Metadata3' into master
						
						
						
						
						
					 | 
					
						2021-03-17 19:05:26 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								cbartondock
							
						 
					 | 
					
						
						
						
						
							
						
						
							f5ded86c02
							
						
					 | 
					
						
						
							
							removed extraneous logs
						
						
						
						
						
					 | 
					
						2021-03-16 19:18:57 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								rra
							
						 
					 | 
					
						
						
						
						
							
						
						
							8abfaf0ffd
							
						
					 | 
					
						
						
							
							Parse XMP metadata in separate function, add exception, try multiple metadata formats
						
						
						
						
						
					 | 
					
						2021-03-16 17:53:33 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzie Isaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							b070ba142f
							
						
					 | 
					
						
						
							
							Selects are working in user management with generic confirm dialog
						
						
						
						
						
					 | 
					
						2021-03-16 15:52:31 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzie Isaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							bd7c6828bf
							
						
					 | 
					
						
						
							
							Selects are working in user management
						
						
						
						
						
					 | 
					
						2021-03-16 15:03:38 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								cbartondock
							
						 
					 | 
					
						
						
						
						
							
						
						
							d0671ec58c
							
						
					 | 
					
						
						
							
							Merge branch 'master' of https://github.com/janeczku/calibre-web
						
						
						
						
						
					 | 
					
						2021-03-15 21:09:51 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								cbartondock
							
						 
					 | 
					
						
						
						
						
							
						
						
							1e40ffd1cc
							
						
					 | 
					
						
						
							
							merge changes
						
						
						
						
						
					 | 
					
						2021-03-15 21:08:41 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzie Isaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							da2c3e9ed7
							
						
					 | 
					
						
						
							
							Edit user mass change checkbox working
						
						
						
						
						
					 | 
					
						2021-03-15 16:46:27 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzie Isaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							f62d6abb69
							
						
					 | 
					
						
						
							
							Merge branch 'master' into development
						
						
						
						
						
						
						
						# Conflicts:
#	cps/server.py
#	test/Calibre-Web TestSummary_Linux.html 
						
					 | 
					
						2021-03-15 13:53:23 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzie Isaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							12ad7a6322
							
						
					 | 
					
						
						
							
							Suppress some errors
						
						
						
						
						
					 | 
					
						2021-03-15 13:52:44 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzie Isaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							b75247ea3a
							
						
					 | 
					
						
						
							
							Suppress some errors
						
						
						
						
						
					 | 
					
						2021-03-15 13:48:05 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzie Isaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							9a963bbe79
							
						
					 | 
					
						
						
							
							Refactored code
						
						
						
						
						
						
						
						Testrun 
						
					 | 
					
						2021-03-15 13:10:17 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzie Isaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							994bc8b0e4
							
						
					 | 
					
						
						
							
							Removed dropdown button on single file listen/read (Fix #1840)
						
						
						
						
						
					 | 
					
						2021-03-15 09:06:40 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzie Isaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							2451605033
							
						
					 | 
					
						
						
							
							Merge remote-tracking branch 'djvu/read-djvu' into master
						
						
						
						
						
					 | 
					
						2021-03-15 08:43:25 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzie Isaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							10942527f3
							
						
					 | 
					
						
						
							
							Merge branch 'master' into development
						
						
						
						
						
						
						
						# Conflicts:
#	test/Calibre-Web TestSummary_Linux.html 
						
					 | 
					
						2021-03-15 08:22:12 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzie Isaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							4909ed5ccd
							
						
					 | 
					
						
						
							
							Merge remote-tracking branch 'cliblur/master' into development
						
						
						
						
						
						
						
						# Conflicts:
#	cps/static/css/style.css 
						
					 | 
					
						2021-03-15 08:21:44 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzie Isaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							5cf5df68dc
							
						
					 | 
					
						
						
							
							Merge remote-tracking branch 'cliblur/master' into master
						
						
						
						
						
					 | 
					
						2021-03-15 08:19:56 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzie Isaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							dd32cc99ea
							
						
					 | 
					
						
						
							
							Merge remote-tracking branch 'es/patch-1' into master
						
						
						
						
						
					 | 
					
						2021-03-15 08:17:14 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzie Isaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							79092dc8eb
							
						
					 | 
					
						
						
							
							Merge remote-tracking branch 'it/patch-21' into master
						
						
						
						
						
					 | 
					
						2021-03-15 08:11:41 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzie Isaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							6229e4610a
							
						
					 | 
					
						
						
							
							Updated teststatus and bugfix convert ebooks
						
						
						
						
						
					 | 
					
						2021-03-15 08:10:42 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Northguy
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							bfe36d3f4a
							
						
					 | 
					
						
						
							
							change in color definition
						
						
						
						
						
						
						
						Making color the same as in:
.container-fluid .book .meta .author, .container-fluid .book .meta .author > a {
    color: hsla(0, 0%, 100%, .45)
}
						
					 | 
					
						2021-03-15 00:12:02 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Northguy
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							d42bf44fad
							
						
					 | 
					
						
						
							
							Added same color for series name and series number
						
						
						
						
						
					 | 
					
						2021-03-14 23:46:33 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								rra
							
						 
					 | 
					
						
						
						
						
							
						
						
							33e352819c
							
						
					 | 
					
						
						
							
							Merge remote-tracking branch 'upstream/master' into XMP_Metadata3
						
						
						
						
						
					 | 
					
						2021-03-14 19:58:26 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzie Isaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							53ee0aaee1
							
						
					 | 
					
						
						
							
							Some functions refactored
						
						
						
						
						
					 | 
					
						2021-03-14 17:34:47 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzie Isaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							42707a19bd
							
						
					 | 
					
						
						
							
							Code cosmetics
						
						
						
						
						
					 | 
					
						2021-03-14 16:57:33 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzie Isaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							0888706790
							
						
					 | 
					
						
						
							
							Code cosmetics
						
						
						
						
						
					 | 
					
						2021-03-14 16:53:01 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzie Isaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							16453a05f8
							
						
					 | 
					
						
						
							
							Code cosmetics
						
						
						
						
						
					 | 
					
						2021-03-14 16:02:37 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzie Isaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							2fbb7466d3
							
						
					 | 
					
						
						
							
							Code cosmetics
						
						
						
						
						
					 | 
					
						2021-03-14 15:44:40 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzie Isaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							f29f94f45f
							
						
					 | 
					
						
						
							
							Code cosmetics
						
						
						
						
						
					 | 
					
						2021-03-14 15:41:36 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzie Isaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							cd973868fc
							
						
					 | 
					
						
						
							
							Code cosmetics
						
						
						
						
						
					 | 
					
						2021-03-14 15:29:34 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzie Isaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							3c35f02cac
							
						
					 | 
					
						
						
							
							Code cosmetics
						
						
						
						
						
					 | 
					
						2021-03-14 15:18:45 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzie Isaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							22c93e2389
							
						
					 | 
					
						
						
							
							Merge branch 'master' into development
						
						
						
						
						
					 | 
					
						2021-03-14 15:06:20 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzie Isaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							8c751eb532
							
						
					 | 
					
						
						
							
							Some code cosmetics
						
						
						
						
						
					 | 
					
						2021-03-14 15:06:09 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzie Isaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							4df443e007
							
						
					 | 
					
						
						
							
							Some code cosmetics
						
						
						
						
						
					 | 
					
						2021-03-14 14:40:04 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzie Isaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							f52fa41439
							
						
					 | 
					
						
						
							
							Fix restart server
						
						
						
						
						
						
						
						Some code cosmetics 
						
					 | 
					
						2021-03-14 14:29:40 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzie Isaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							f77d72fd86
							
						
					 | 
					
						
						
							
							Merge branch 'master' into development
						
						
						
						
						
						
						
						# Conflicts:
#	cps/static/css/style.css 
						
					 | 
					
						2021-03-14 14:06:33 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzie Isaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							9b80c84794
							
						
					 | 
					
						
						
							
							Some code cosmetics
						
						
						
						
						
					 | 
					
						2021-03-14 14:05:36 +01:00 | 
					
					
						
						
							
							
							
						
					 |