Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							22add37b64 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'fix typo in config_edit.html  #1097 '  
						
						 
						
						... 
						
						
						
						Updated translations 
						
					 
					
						2019-12-08 10:10:32 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							ab5873984e 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'translation/patch-3'  
						
						 
						
						
						
					 
					
						2019-11-17 06:59:22 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							a4416c202d 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'rename/develop'  
						
						 
						
						
						
					 
					
						2019-11-16 08:01:18 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jony 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							1f5edffccf 
							
						 
					 
					
						
						
							
							Fix typo and update translation  
						
						 
						
						
						
					 
					
						2019-11-16 07:49:07 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							2e4344f7ea 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'swedish/master'  
						
						 
						
						
						
					 
					
						2019-11-16 07:27:08 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jony 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							3cb7e77b60 
							
						 
					 
					
						
						
							
							Update messages.po  
						
						 
						
						
						
					 
					
						2019-11-14 18:52:06 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							ca5e285c5a 
							
						 
					 
					
						
						
							
							Merge branch 'Develop'  
						
						 
						
						
						
					 
					
						2019-09-06 19:05:02 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							12576393cf 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'spanish/patch-1'  
						
						 
						
						... 
						
						
						
						Merge remote-tracking branch 'german/master' 
						
					 
					
						2019-07-26 16:41:52 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							4708347c16 
							
						 
					 
					
						
						
							
							Merge branch 'Develop'  
						
						 
						
						... 
						
						
						
						# Conflicts:
#	MANIFEST.in
#	README.md
#	cps/helper.py
#	cps/static/js/archive/archive.js
#	cps/translations/nl/LC_MESSAGES/messages.mo
#	cps/translations/nl/LC_MESSAGES/messages.po
#	cps/ub.py
#	cps/updater.py
#	cps/web.py
#	cps/worker.py
#	optional-requirements.txt 
						
					 
					
						2019-07-13 20:54:21 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							32af660f86 
							
						 
					 
					
						
						
							
							Improvements for logfile viewer  
						
						 
						
						... 
						
						
						
						Fix for tornado-server with deactivated accesslog doesn't log to normal log anymore
Merge from master for unique user ids, get_metadata,
fix Goodreads integration
Update Translation (merge NL, update DE) 
						
					 
					
						2019-06-22 19:55:59 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							6662a58cb0 
							
						 
					 
					
						
						
							
							Update translationfiles  
						
						 
						
						
						
					 
					
						2019-05-31 15:48:19 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							4fecce0a0d 
							
						 
					 
					
						
						
							
							Merge branch 'master' into Develop  
						
						 
						
						... 
						
						
						
						# Conflicts:
#	cps/helper.py
#	cps/static/js/archive/unrar.js
#	cps/templates/readcbr.html
#	cps/templates/readpdf.html
#	cps/translations/de/LC_MESSAGES/messages.mo
#	cps/translations/de/LC_MESSAGES/messages.po
#	cps/translations/es/LC_MESSAGES/messages.mo
#	cps/translations/es/LC_MESSAGES/messages.po
#	cps/translations/fr/LC_MESSAGES/messages.mo
#	cps/translations/fr/LC_MESSAGES/messages.po
#	cps/translations/it/LC_MESSAGES/messages.mo
#	cps/translations/it/LC_MESSAGES/messages.po
#	cps/translations/ja/LC_MESSAGES/messages.mo
#	cps/translations/ja/LC_MESSAGES/messages.po
#	cps/translations/km/LC_MESSAGES/messages.mo
#	cps/translations/km/LC_MESSAGES/messages.po
#	cps/translations/nl/LC_MESSAGES/messages.mo
#	cps/translations/nl/LC_MESSAGES/messages.po
#	cps/translations/pl/LC_MESSAGES/messages.mo
#	cps/translations/pl/LC_MESSAGES/messages.po
#	cps/translations/ru/LC_MESSAGES/messages.mo
#	cps/translations/ru/LC_MESSAGES/messages.po
#	cps/translations/sv/LC_MESSAGES/messages.mo
#	cps/translations/sv/LC_MESSAGES/messages.po
#	cps/translations/uk/LC_MESSAGES/messages.mo
#	cps/translations/zh_Hans_CN/LC_MESSAGES/messages.mo
#	cps/translations/zh_Hans_CN/LC_MESSAGES/messages.po
#	cps/web.py
#	messages.pot
#	optional-requirements.txt 
						
					 
					
						2019-05-31 11:17:47 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							d106ada9ed 
							
						 
					 
					
						
						
							
							Changed version  
						
						 
						
						... 
						
						
						
						Update translation 
						
					 
					
						2019-05-30 09:07:52 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							479b4b7d82 
							
						 
					 
					
						
						
							
							Update translations, integrated update of Italian translation  
						
						 
						
						
						
					 
					
						2019-05-08 20:24:10 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							07649d04a3 
							
						 
					 
					
						
						
							
							Fix updater  
						
						 
						
						... 
						
						
						
						Update translations
Code cleaning updater 
						
					 
					
						2019-03-24 15:27:23 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								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