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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								OzzieIsaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							3dacdcc8bb
							
						
					 | 
					
						
						
							
							Merge remote-tracking branch 'worker/db' into Develop
						
						
						
						
						
					 | 
					
						2020-10-10 07:31:08 +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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								blitzmann
							
						 
					 | 
					
						
						
						
						
							
						
						
							3fa4149bb0
							
						
					 | 
					
						
						
							
							Fix reference issue
						
						
						
						
						
					 | 
					
						2020-10-05 23:15:42 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								OzzieIsaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							4b68a6ff23
							
						
					 | 
					
						
						
							
							Updates tests
						
						
						
						
						
					 | 
					
						2020-10-04 19:25:06 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzieisaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							28116c49dc
							
						
					 | 
					
						
						
							
							Merge branch 'worker_task' into Develop
						
						
						
						
						
					 | 
					
						2020-10-04 19:23:32 +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
							
						 
					 | 
					
						
						
						
						
							
						
						
							1cb640e51e
							
						
					 | 
					
						
						
							
							Update minimum required version of SQLAlchemy (Fix #1641)
						
						
						
						
						
					 | 
					
						2020-09-29 18:19:00 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzieisaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							2d98285545
							
						
					 | 
					
						
						
							
							Update minimum required version of SQLAlchemy
						
						
						
						
						
					 | 
					
						2020-09-29 18:16:56 +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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzie Isaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							8f9de05768
							
						
					 | 
					
						
						
							
							Update Test results windows
						
						
						
						
						
					 | 
					
						2020-09-27 06:33:41 +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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzieisaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							eec303de49
							
						
					 | 
					
						
						
							
							Fix #1621 (Link to contributing.md file wrong)
						
						
						
						
						
					 | 
					
						2020-09-21 14:18:23 +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 | 
					
					
						
						
							
							
							
						
					 |