OzzieIsaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							b7535b9526 
							
						 
					 
					
						
						
							
							Merging master branch  
						
						 
						
						... 
						
						
						
						- fix title sort function
- fix focus on search 
						
					 
					
						2020-05-21 22:31:29 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								OzzieIsaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							0cf1cc5587 
							
						 
					 
					
						
						
							
							Fixes from tests  
						
						 
						
						
						
					 
					
						2020-05-21 22:26:19 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							098dab889a 
							
						 
					 
					
						
						
							
							Fixed title sorting routine  
						
						 
						
						
						
					 
					
						2020-05-21 19:37:54 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							cc856c7cd1 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'search_focus/activate-search-focus-if-search-in-progress'  
						
						 
						
						
						
					 
					
						2020-05-21 19:18:02 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							a20a155d39 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'typo/patch-2' into Develop  
						
						 
						
						
						
					 
					
						2020-05-21 19:14:29 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							1a458fe39f 
							
						 
					 
					
						
						
							
							Fix for  #1407  converting books should now be possible again  
						
						 
						
						
						
					 
					
						2020-05-21 18:16:11 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								celogeek 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							051ffdda35 
							
						 
					 
					
						
						
							
							activate search focus if search in progress  
						
						 
						
						
						
					 
					
						2020-05-21 16:42:02 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								OzzieIsaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							a48418364c 
							
						 
					 
					
						
						
							
							Fiexes from tests  
						
						 
						
						
						
					 
					
						2020-05-21 13:54:28 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							b75497231e 
							
						 
					 
					
						
						
							
							Additional fix for  #1407  (metadata.db is now held in memory, app.db is attached to it -> joins between both databases possible -> book_read_link is joined for getting result)  
						
						 
						
						
						
					 
					
						2020-05-21 09:28:35 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Knepherbird 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							5cceeb6ef2 
							
						 
					 
					
						
						
							
							Fix: correct property typo  
						
						 
						
						... 
						
						
						
						Correcting 'box-sizeing' to 'box-sizing' 
						
					 
					
						2020-05-19 13:10:25 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							29b94c5615 
							
						 
					 
					
						
						
							
							Fix for  #1407  (to many read books lead to to large sql query) -> only fix for linked calibre-column  
						
						 
						
						
						
					 
					
						2020-05-19 21:36:22 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							81fc1eccd3 
							
						 
					 
					
						
						
							
							Fix for  #1407  (to many read books lead to to large sql query) -> only fix for linked calibre-column  
						
						 
						
						
						
					 
					
						2020-05-19 21:35:56 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Braincoke 
							
						 
					 
					
						
						
						
						
							
						
						
							22fae51c9d 
							
						 
					 
					
						
						
							
							Fix XML parsing error when using OPDS feeds  
						
						 
						
						... 
						
						
						
						Using the OPDS feeds with MoonReader yielded the following error:
"Error parsing XML: unbound prefix".
This was due to a missing namespace in the feed.xml template.
See https://github.com/janeczku/calibre-web/issues/1403  for more
information. 
						
					 
					
						2020-05-18 20:07:02 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							4332f7a640 
							
						 
					 
					
						
						
							
							Better detection of localhost for kobo sync (possibly related to  #1400 )  
						
						 
						
						
						
					 
					
						2020-05-17 21:44:12 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							d0e603e62d 
							
						 
					 
					
						
						
							
							Better detection of localhost for kobo sync  
						
						 
						
						
						
					 
					
						2020-05-17 21:42:25 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							38c28f4358 
							
						 
					 
					
						
						
							
							Merge branch 'master' into Develop  
						
						 
						
						... 
						
						
						
						# Conflicts:
#	cps/admin.py
#	cps/constants.py
#	cps/static/css/caliBlur.min.css
#	cps/uploader.py 
						
					 
					
						2020-05-17 16:22:58 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							742799b4ac 
							
						 
					 
					
						
						
							
							Added missing float custom column to search form  
						
						 
						
						
						
					 
					
						2020-05-17 16:10:10 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							5405dc5141 
							
						 
					 
					
						
						
							
							Fix for  #1387  (saving settings with enabled gdrive metadata watch led to crash)  
						
						 
						
						
						
					 
					
						2020-05-17 11:15:46 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							013793f989 
							
						 
					 
					
						
						
							
							Fix for  #1391  (Kobo sync not working if series is given, but no series_index)  
						
						 
						
						
						
					 
					
						2020-05-17 10:46:48 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							2468cf63cc 
							
						 
					 
					
						
						
							
							Fix for  #1397  (changed supported audio files)  
						
						 
						
						... 
						
						
						
						Changed max gevent version
Fix for #1397  (changed supported audio files) 
						
					 
					
						2020-05-17 10:07:36 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							8e9b5d7e50 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'caliblur/master'  
						
						 
						
						
						
					 
					
						2020-05-15 21:01:08 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							a33515d907 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'refactor/refactor_uploader'  
						
						 
						
						
						
					 
					
						2020-05-15 20:36:00 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							a276a33081 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'nl/master'  
						
						 
						
						
						
					 
					
						2020-05-15 20:34:30 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								h1f0x 
							
						 
					 
					
						
						
						
						
							
						
						
							e325c3dbf6 
							
						 
					 
					
						
						
							
							fixed div selection in caliBlur.js  
						
						 
						
						
						
					 
					
						2020-05-14 12:29:52 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								h1f0x 
							
						 
					 
					
						
						
						
						
							
						
						
							b3fef625a8 
							
						 
					 
					
						
						
							
							Fixed Calibur views: series, authors, publishers, ratings, file formats, detail view  
						
						 
						
						
						
					 
					
						2020-05-14 11:57:38 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							13994a5f96 
							
						 
					 
					
						
						
							
							Merge branch 'master' into Develop  
						
						 
						
						
						
					 
					
						2020-05-13 20:16:29 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							e8ac62cdd8 
							
						 
					 
					
						
						
							
							Moved password replace to prevent incomplete session  
						
						 
						
						
						
					 
					
						2020-05-13 20:15:35 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							1bc7134ec2 
							
						 
					 
					
						
						
							
							Fix error 500 on reset password in debug mode  
						
						 
						
						
						
					 
					
						2020-05-13 20:04:43 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							273572f44c 
							
						 
					 
					
						
						
							
							Merge branch 'master' into Develop  
						
						 
						
						... 
						
						
						
						# Conflicts:
#	cps/ub.py 
						
					 
					
						2020-05-13 20:03:54 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							ac37483d47 
							
						 
					 
					
						
						
							
							Fix for  #1391  (kobo sync errors out if read/unread books had been present in app.db during initial database migration)  
						
						 
						
						
						
					 
					
						2020-05-13 19:43:14 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							0cc2b49296 
							
						 
					 
					
						
						
							
							Merge branch 'master' into Develop  
						
						 
						
						... 
						
						
						
						# Conflicts:
#	cps/templates/book_edit.html 
						
					 
					
						2020-05-12 19:10:19 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							44d5adc16f 
							
						 
					 
					
						
						
							
							Fix   #1390  
						
						 
						
						
						
					 
					
						2020-05-12 19:08:51 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							f749fc641b 
							
						 
					 
					
						
						
							
							Temporary fix for  #1390  
						
						 
						
						
						
					 
					
						2020-05-12 17:42:24 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							87c76c09e2 
							
						 
					 
					
						
						
							
							temporary fix for  #1390  
						
						 
						
						
						
					 
					
						2020-05-12 17:41:49 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							e787f9dd9f 
							
						 
					 
					
						
						
							
							Automatic username ( #1172 )  
						
						 
						
						
						
					 
					
						2020-05-12 17:23:58 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							ec7d5b17ab 
							
						 
					 
					
						
						
							
							Added table view for books  
						
						 
						
						
						
					 
					
						2020-05-12 16:32:26 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							47641eee59 
							
						 
					 
					
						
						
							
							Merge branch 'master' into Develop  
						
						 
						
						
						
					 
					
						2020-05-12 16:16:04 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							42abe28cc1 
							
						 
					 
					
						
						
							
							Fix for  #1389  (import ldap users with whitespaces)  
						
						 
						
						
						
					 
					
						2020-05-12 16:13:56 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							b48afa38ac 
							
						 
					 
					
						
						
							
							Fix   #1386  (Add asin to recognized identifiers)  
						
						 
						
						
						
					 
					
						2020-05-12 14:44:57 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							f7269d8df2 
							
						 
					 
					
						
						
							
							Fix for  #1385  (Private shelves are listed twice in the "Add to shelf" dropdown menu)  
						
						 
						
						
						
					 
					
						2020-05-12 14:39:13 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							ce0fab8d2f 
							
						 
					 
					
						
						
							
							Fix duplicate shelf names in "search"  
						
						 
						
						
						
					 
					
						2020-05-12 14:37:13 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							33472567de 
							
						 
					 
					
						
						
							
							Improved Debug output on send email  
						
						 
						
						
						
					 
					
						2020-05-11 19:28:22 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							f5e12328dc 
							
						 
					 
					
						
						
							
							Fix for  #1382  (Restrictions with "&" in it can't be deleted)  
						
						 
						
						
						
					 
					
						2020-05-11 18:41:34 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							486c0f2937 
							
						 
					 
					
						
						
							
							Fix for  #1382  (Restrictions with "&" in it can't be deleted)  
						
						 
						
						
						
					 
					
						2020-05-11 18:41:16 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								jvoisin 
							
						 
					 
					
						
						
						
						
							
						
						
							e69c4cd1dc 
							
						 
					 
					
						
						
							
							Refactor a bit cps/uploader.py  
						
						 
						
						
						
					 
					
						2020-05-11 13:15:30 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Marcel 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							e0d3ccd8d1 
							
						 
					 
					
						
						
							
							Update messages.po  
						
						 
						
						
						
					 
					
						2020-05-10 21:05:39 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							16a3deec2c 
							
						 
					 
					
						
						
							
							Merge branch 'master' into Develop  
						
						 
						
						... 
						
						
						
						# Conflicts:
#	cps/helper.py 
						
					 
					
						2020-05-10 19:24:55 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								OzzieIsaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							92db00692a 
							
						 
					 
					
						
						
							
							Merge all headers to download response  
						
						 
						
						... 
						
						
						
						Updated test results 
						
					 
					
						2020-05-10 14:58:18 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								OzzieIsaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							fe88010a72 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'sec_fixes/minor_fix_caliblur'  
						
						 
						
						
						
					 
					
						2020-05-10 14:57:19 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								OzzieIsaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							99ae4be2c2 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'sec_fixes/bump_jquery'  
						
						 
						
						
						
					 
					
						2020-05-10 10:43:20 +02:00