Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							e3db2796c9 
							
						 
					 
					
						
						
							
							Merge branch 'master' into Develop  
						
						 
						
						... 
						
						
						
						# Conflicts:
#	test/Calibre-Web TestSummary_Linux.html 
						
					 
					
						2021-08-30 20:18:21 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							86ef1d47e8 
							
						 
					 
					
						
						
							
							Bugfixes from testrun  
						
						 
						
						
						
					 
					
						2021-08-30 08:02:21 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							1d79d9ded2 
							
						 
					 
					
						
						
							
							Bugfix from tests (displaying of book languages in user list)  
						
						 
						
						
						
					 
					
						2021-08-29 11:31:10 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							1fa267ce1b 
							
						 
					 
					
						
						
							
							Final fix for escaping html special chars in tables  
						
						 
						
						
						
					 
					
						2021-08-28 15:47:57 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							3946ef8f0d 
							
						 
					 
					
						
						
							
							Merge branch 'master' into Develop  
						
						 
						
						... 
						
						
						
						# Conflicts:
#	cps.py
#	cps/web.py 
						
					 
					
						2021-08-27 16:16:24 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							91e6d94c83 
							
						 
					 
					
						
						
							
							Improved displaying of username and task title in tasks  
						
						 
						
						
						
					 
					
						2021-08-27 14:27:35 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							32e27712f0 
							
						 
					 
					
						
						
							
							Added lxml to needed requirements  
						
						 
						
						... 
						
						
						
						Improved displaying of series title, book of series, comments and custom comments 
						
					 
					
						2021-08-27 09:43:32 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							aa9fdd2ada 
							
						 
					 
					
						
						
							
							Merge branch 'master' into Develop  
						
						 
						
						
						
					 
					
						2021-08-18 20:32:33 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							275e073c42 
							
						 
					 
					
						
						
							
							Fix   #2085  (Missing spaces between glyphicon and text on sidebar)  
						
						 
						
						
						
					 
					
						2021-08-10 20:17:30 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								xlivevil 
							
						 
					 
					
						
						
						
						
							
						
						
							bce69b2dfc 
							
						 
					 
					
						
						
							
							Add pdf.js font file  
						
						 
						
						
						
					 
					
						2021-08-07 20:51:10 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								xlivevil 
							
						 
					 
					
						
						
						
						
							
						
						
							fb97e39d9f 
							
						 
					 
					
						
						
							
							Merge branch 'master' of  https://github.com/xlivevil/calibre-web  
						
						 
						
						
						
					 
					
						2021-08-05 21:39:04 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								xlivevil 
							
						 
					 
					
						
						
						
						
							
						
						
							913690df78 
							
						 
					 
					
						
						
							
							Fix #1913(set lazyload in pdf reader)  
						
						 
						
						... 
						
						
						
						Add favicon.ico in pdf reader 
						
					 
					
						2021-08-05 21:37:39 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							e68a3f18fa 
							
						 
					 
					
						
						
							
							Merge branch 'master' into Develop  
						
						 
						
						
						
					 
					
						2021-08-01 20:23:19 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							1534827ad7 
							
						 
					 
					
						
						
							
							With merge button disabled it's no longer possible to open merge dialog  
						
						 
						
						
						
					 
					
						2021-08-01 20:23:04 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							b36422bc05 
							
						 
					 
					
						
						
							
							Update list/grid button action (reverse proxy problem)  
						
						 
						
						
						
					 
					
						2021-08-01 20:06:48 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							41ca85268f 
							
						 
					 
					
						
						
							
							Update translation files  
						
						 
						
						
						
					 
					
						2021-08-01 17:27:18 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							0e9709f304 
							
						 
					 
					
						
						
							
							Make Book-No. of book-range to translatable text  
						
						 
						
						
						
					 
					
						2021-08-01 17:09:29 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							ceec1051d5 
							
						 
					 
					
						
						
							
							Added option to save books with no nenglish characters  
						
						 
						
						... 
						
						
						
						Imporvements on metadata search 
						
					 
					
						2021-08-01 13:50:17 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							53603f79bd 
							
						 
					 
					
						
						
							
							Get_meta button unfocused on return to edit books  
						
						 
						
						
						
					 
					
						2021-07-31 09:00:34 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							302679719d 
							
						 
					 
					
						
						
							
							Merge branch 'master' into Develop  
						
						 
						
						... 
						
						
						
						# Conflicts:
#	cps/admin.py
#	cps/converter.py
#	cps/subproc_wrapper.py
#	test/Calibre-Web TestSummary_Linux.html 
						
					 
					
						2021-07-30 16:33:06 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							0ec2bcd897 
							
						 
					 
					
						
						
							
							Fixes from testrun  
						
						 
						
						
						
					 
					
						2021-07-30 09:25:19 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							c5e39a7523 
							
						 
					 
					
						
						
							
							Fix divs in user edit page  
						
						 
						
						
						
					 
					
						2021-07-27 08:09:57 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							3c8bfc31e4 
							
						 
					 
					
						
						
							
							fix change name allowd as non admin  
						
						 
						
						
						
					 
					
						2021-07-23 19:34:46 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							616cc2018a 
							
						 
					 
					
						
						
							
							Fix show cover  
						
						 
						
						... 
						
						
						
						Update more debug output for kobo sync 
						
					 
					
						2021-07-12 14:58:03 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							e69b1adccd 
							
						 
					 
					
						
						
							
							Fix   #2053  (Add tooltip for complete title on hover over cover and title)  
						
						 
						
						
						
					 
					
						2021-07-12 14:17:28 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							aae81c3d24 
							
						 
					 
					
						
						
							
							Fix   #2048  (Display book title in reader)  
						
						 
						
						
						
					 
					
						2021-07-11 12:52:46 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							ec7803fa76 
							
						 
					 
					
						
						
							
							Update python search Metadata  
						
						 
						
						
						
					 
					
						2021-07-10 07:38:16 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							aa2d3d2b36 
							
						 
					 
					
						
						
							
							Update python search Metadata  
						
						 
						
						
						
					 
					
						2021-07-07 21:24:29 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							d5e9cdc5b7 
							
						 
					 
					
						
						
							
							Search Metadata improvements  
						
						 
						
						
						
					 
					
						2021-07-07 21:10:38 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							67836006c5 
							
						 
					 
					
						
						
							
							Successfull testrun  
						
						 
						
						
						
					 
					
						2021-06-19 14:44:57 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							1aca1b9fdd 
							
						 
					 
					
						
						
							
							Fixed duplicate ids in logviewer  
						
						 
						
						
						
					 
					
						2021-06-06 16:14:30 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							ced0bcfe33 
							
						 
					 
					
						
						
							
							Fix missing " in books table  
						
						 
						
						
						
					 
					
						2021-06-05 18:41:52 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							8c0aa79f78 
							
						 
					 
					
						
						
							
							Fix   #1915  (more than 10 books at a time are displayed in books table)  
						
						 
						
						
						
					 
					
						2021-06-05 18:41:52 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							a79600c81f 
							
						 
					 
					
						
						
							
							Mass change book title and author ( fix   #1996 )  
						
						 
						
						
						
					 
					
						2021-05-28 18:22:29 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							6de3aebf3a 
							
						 
					 
					
						
						
							
							Fix for  #1998  (Error 500 with configured oauth on user setup page accessed by admins)  
						
						 
						
						
						
					 
					
						2021-05-28 14:23:30 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							1b7e422772 
							
						 
					 
					
						
						
							
							Changed error page to display logout route in case of unconfigured  
						
						 
						
						
						
					 
					
						2021-05-28 13:56:07 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							b0f48b7f00 
							
						 
					 
					
						
						
							
							Merge branch 'master' into Develop  
						
						 
						
						
						
					 
					
						2021-05-26 19:58:10 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							94b07d05c1 
							
						 
					 
					
						
						
							
							First half of  #1996  (editing single books)  
						
						 
						
						
						
					 
					
						2021-05-26 19:57:58 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							4392fec7f5 
							
						 
					 
					
						
						
							
							Added fullscreen cover viewer  
						
						 
						
						
						
					 
					
						2021-05-26 19:40:41 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							a47d6cd937 
							
						 
					 
					
						
						
							
							Fix confirm dialog database change  
						
						 
						
						... 
						
						
						
						Gdrive setup basically working again
Moved basicconfig behind login
Database setup separated from other setup
Config page is using ajax (flask >2 and slow computers) 
						
					 
					
						2021-05-26 14:50:44 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							251780bed6 
							
						 
					 
					
						
						
							
							Added google scholar as metadata provider  
						
						 
						
						
						
					 
					
						2021-05-16 13:24:42 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							decc2a9c79 
							
						 
					 
					
						
						
							
							Merge branch 'master' into Develop  
						
						 
						
						
						
					 
					
						2021-05-16 13:19:38 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							b62d84424e 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'comic/comic_viewer_changes' into master  
						
						 
						
						
						
					 
					
						2021-05-16 13:19:28 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							e15324d2cd 
							
						 
					 
					
						
						
							
							Merge branch 'master' into Develop  
						
						 
						
						
						
					 
					
						2021-05-16 09:38:00 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							20b84a9459 
							
						 
					 
					
						
						
							
							Unified translations  
						
						 
						
						... 
						
						
						
						Update translations for release 
						
					 
					
						2021-05-16 09:37:45 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							3e5c944365 
							
						 
					 
					
						
						
							
							Changed backend for comic reader, now supports rar5  
						
						 
						
						
						
					 
					
						2021-05-16 08:35:20 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							d95838309e 
							
						 
					 
					
						
						
							
							Added config option for shelf sync behavior  
						
						 
						
						
						
					 
					
						2021-05-15 10:45:51 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							4745fc0db1 
							
						 
					 
					
						
						
							
							Bugfix search for publish dates and custom column dates  
						
						 
						
						... 
						
						
						
						Bugfix save umplauts in comments unescaped (as calibre does)
Improved testability 
						
					 
					
						2021-05-15 07:51:32 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							b3648187ff 
							
						 
					 
					
						
						
							
							Bugfix search for publishdates and custom column dates  
						
						 
						
						... 
						
						
						
						Bugfix save umplauts in comments unescaped (as calibre does)
Improved testability 
						
					 
					
						2021-05-15 07:51:12 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							f29088e854 
							
						 
					 
					
						
						
							
							Merge branch 'master' into Develop  
						
						 
						
						... 
						
						
						
						# Conflicts:
#	cps/kobo.py 
						
					 
					
						2021-05-14 19:59:35 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							b009dfe4ee 
							
						 
					 
					
						
						
							
							Always use bootstrap datepicker  
						
						 
						
						
						
					 
					
						2021-05-14 19:58:06 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							eba94f430c 
							
						 
					 
					
						
						
							
							Updated js libs  
						
						 
						
						
						
					 
					
						2021-05-14 09:29:24 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							06347b7e3c 
							
						 
					 
					
						
						
							
							Bugfixes from testrun  
						
						 
						
						
						
					 
					
						2021-05-14 08:26:56 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							6bf360fbfb 
							
						 
					 
					
						
						
							
							Added "comments" type to supported custom columns  
						
						 
						
						
						
					 
					
						2021-05-13 14:00:01 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							380292a8aa 
							
						 
					 
					
						
						
							
							Custom column datetime now searchable ( #1984 )  
						
						 
						
						
						
					 
					
						2021-05-13 13:31:36 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							b0cc52e0aa 
							
						 
					 
					
						
						
							
							Enable custom column datetime (adv. search not working yet)  #1984  
						
						 
						
						
						
					 
					
						2021-05-13 10:39:36 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							9ef705650b 
							
						 
					 
					
						
						
							
							Access pages with stored order per default ( #1987 )  
						
						 
						
						... 
						
						
						
						Fix for toggle-text of enable-sort button on shelf page 
						
					 
					
						2021-05-13 09:41:27 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							eb2273247f 
							
						 
					 
					
						
						
							
							Changed texts in edit shelf page for Kobo shelf sync  
						
						 
						
						
						
					 
					
						2021-05-02 15:59:40 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							8dc11e89bd 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'koko_sync/feature/kobo-shelf' into Develop  
						
						 
						
						
						
					 
					
						2021-05-02 09:43:47 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							64696fe973 
							
						 
					 
					
						
						
							
							Bugfixes edit user list ( Fix   #1938 )  
						
						 
						
						
						
					 
					
						2021-05-01 08:36:39 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								GarcaMan 
							
						 
					 
					
						
						
						
						
							
						
						
							7da40d1c2e 
							
						 
					 
					
						
						
							
							Added option to remove Y-Scrollbar and reset page scroll  
						
						 
						
						
						
					 
					
						2021-04-25 19:59:53 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							97e4707f72 
							
						 
					 
					
						
						
							
							user list column value and tags editor ( #1938 )  
						
						 
						
						... 
						
						
						
						Bugfixes for massedit in user list (#1938 )
Changed no. of debug messages 
						
					 
					
						2021-04-25 10:43:01 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							3be5b5f919 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'comic_reader/master' into master  
						
						 
						
						
						
					 
					
						2021-04-18 12:02:21 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							04ac5b69ac 
							
						 
					 
					
						
						
							
							Further improvements on user list  #1938  
						
						 
						
						
						
					 
					
						2021-04-18 12:01:11 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								BuildTools 
							
						 
					 
					
						
						
						
						
							
						
						
							755eb1405b 
							
						 
					 
					
						
						
							
							Fix progress bar direction  
						
						 
						
						
						
					 
					
						2021-04-18 04:25:45 +09:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							c0a4addf30 
							
						 
					 
					
						
						
							
							Cancel button in User edit now leads to the right page back  #1938  
						
						 
						
						
						
					 
					
						2021-04-17 18:30:55 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							39bbee0eeb 
							
						 
					 
					
						
						
							
							Books sort with non Books table column working  #1938  
						
						 
						
						
						
					 
					
						2021-04-17 10:27:30 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							f07cc8b103 
							
						 
					 
					
						
						
							
							Update optional-requirements: flask-dance  
						
						 
						
						... 
						
						
						
						Catch error for invalid oauth tokens
Fixes for displaying error messages on deleting books from list
Fixes for displaying error messages on deleting bookformats
Removed non working sorting in books list 
						
					 
					
						2021-04-13 19:26:10 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							67775bc797 
							
						 
					 
					
						
						
							
							Update requirements  
						
						 
						
						... 
						
						
						
						Catch error for invalid oauth tokens
Fixes for displaying error messages on deleting books from list
Fixes for displaying error messages on deleting bookformats 
						
					 
					
						2021-04-13 19:08:02 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							04971f8672 
							
						 
					 
					
						
						
							
							Bugfix wrong js file in user list  
						
						 
						
						
						
					 
					
						2021-04-11 20:01:40 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							b6177b27f4 
							
						 
					 
					
						
						
							
							Sorting of users in table according to selection possible  
						
						 
						
						
						
					 
					
						2021-04-11 19:59:20 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								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 
							
						 
					 
					
						
						
						
						
							
						
						
							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 
							
						 
					 
					
						
						
						
						
							
						
						
							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 
							
						 
					 
					
						
						
						
						
							
						
						
							8f91437701 
							
						 
					 
					
						
						
							
							Implementation for gmail server with OAuth2 started  
						
						 
						
						
						
					 
					
						2021-03-27 16:36:24 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							3c63f5b204 
							
						 
					 
					
						
						
							
							Merge branch 'master' into development  
						
						 
						
						
						
					 
					
						2021-03-27 09:46:12 +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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								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 
							
						 
					 
					
						
						
						
						
							
						
						
							670eab62bf 
							
						 
					 
					
						
						
							
							Update opds feed with letters for all titles, authors, categories and series  
						
						 
						
						
						
					 
					
						2021-03-22 17:46:15 +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 
							
						 
					 
					
						
						
						
						
							
						
						
							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 
							
						 
					 
					
						
						
						
						
							
						
						
							d3f8153b90 
							
						 
					 
					
						
						
							
							Merge branch 'master' into development  
						
						 
						
						
						
					 
					
						2021-03-20 19:34:16 +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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								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 
							
						 
					 
					
						
						
						
						
							
						
						
							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