Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							da3fcb9a72 
							
						 
					 
					
						
						
							
							Merge branch 'master' into Develop  
						
						 
						
						... 
						
						
						
						# Conflicts:
#	cps/book_formats.py
#	cps/static/css/style.css
#	cps/static/js/uploadprogress.js
#	cps/templates/author.html
#	cps/templates/detail.html
#	cps/templates/discover.html
#	cps/templates/index.html
#	cps/templates/layout.html
#	cps/templates/osd.xml
#	cps/templates/search.html
#	cps/templates/shelf.html
#	cps/translations/de/LC_MESSAGES/messages.mo
#	cps/translations/de/LC_MESSAGES/messages.po
#	cps/web.py
#	messages.pot 
						
					 
					
						2019-03-10 08:31:10 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							76d40411dd 
							
						 
					 
					
						
						
							
							Translation updated  
						
						 
						
						
						
					 
					
						2019-03-10 08:04:31 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							fad62a0909 
							
						 
					 
					
						
						
							
							translation update  
						
						 
						
						
						
					 
					
						2019-02-24 19:23:51 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							ea98323c06 
							
						 
					 
					
						
						
							
							Fixes Google Drive  
						
						 
						
						... 
						
						
						
						Improved user guidance for Google Drive
Improved Errorhandling for Google Drive
Update french translation
Added ukranian translation
Improvements on updater: calibre-web.log1, calibre-web.log2, gdrive_credentials, settings.yaml, gdrive.db, .git are no longer deleted upon update 
						
					 
					
						2019-02-03 16:38:27 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							836c6fd245 
							
						 
					 
					
						
						
							
							Updated translations  
						
						 
						
						... 
						
						
						
						Added license texts in flies 
						
					 
					
						2019-01-20 19:37:45 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							c527d1f49a 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'theme/master'  
						
						 
						
						... 
						
						
						
						Added translations for some tooltips
Updated translations 
						
					 
					
						2019-01-12 09:01:08 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							47424e5c1a 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'swedish/master'  
						
						 
						
						... 
						
						
						
						Improved server stop command 
						
					 
					
						2018-11-24 20:47:11 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jony 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							bc0d19f33d 
							
						 
					 
					
						
						
							
							Fix typo  
						
						 
						
						
						
					 
					
						2018-11-23 03:03:02 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jony 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							cbc9169973 
							
						 
					 
					
						
						
							
							Update messages.po  
						
						 
						
						
						
					 
					
						2018-11-23 03:01:34 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							c574b779fb 
							
						 
					 
					
						
						
							
							Added swedish translation  
						
						 
						
						
						
					 
					
						2018-11-17 16:41:47 +01:00