Ozzieisaacs 
							
						 
					 
					
						
						
							
						
						bfd0e87a17 
					 
					
						
						
							
							Merge branch 'master' into Develop  
						
						 
						
						... 
						
						
						
						# Conflicts:
#	cps/helper.py
#	cps/reverseproxy.py 
						
						
					 
					
						2019-04-21 08:50:31 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
							
						
						6a7b8c7870 
					 
					
						
						
							
							Update Version info  
						
						 
						
						... 
						
						
						
						Fix  #816 
Clarified licences for isolanguages.py and reverseproxy.py 
						
						
					 
					
						2019-04-21 08:48:51 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
							
						
						2de4bfdcf2 
					 
					
						
						
							
							Merge branch 'master' into Develop  
						
						 
						
						... 
						
						
						
						# Conflicts:
#	cps/book_formats.py
#	cps/helper.py
#	cps/web.py 
						
						
					 
					
						2019-04-20 18:32:46 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
							
						
						67736fe187 
					 
					
						
						
							
							Catch errors on loading pickle file  
						
						 
						
						... 
						
						
						
						Fix for cover images without Pillow 
						
						
					 
					
						2019-04-18 21:17:59 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
							
						
						89516fc2d6 
					 
					
						
						
							
							Make PIL optional  #885  
						
						 
						
						
						
						
					 
					
						2019-04-17 20:45:08 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
							
						
						91ebe33879 
					 
					
						
						
							
							Merge remote-tracking branch 'image_formats/dev'  
						
						 
						
						
						
						
					 
					
						2019-04-15 20:57:25 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
							
						
						05da2ae3c7 
					 
					
						
						
							
							Update search for cyrillic letters  
						
						 
						
						
						
						
					 
					
						2019-04-14 18:20:45 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Yijun Zhao 
							
						 
					 
					
						
						
							
						
						6c493df2f5 
					 
					
						
						
							
							support issue:  #843  
						
						 
						
						
						
						
					 
					
						2019-03-26 14:34:51 +08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
							
						
						6940bb9b88 
					 
					
						
						
							
							Code improvement  
						
						 
						
						
						
						
					 
					
						2019-03-24 15:58:43 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
							
						
						a360b1759a 
					 
					
						
						
							
							Code cosmetics  
						
						 
						
						... 
						
						
						
						bugfix import HttpError from pydrive 
						
						
					 
					
						2019-03-16 17:20:14 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
							
						
						baf83b2f5a 
					 
					
						
						
							
							Refactored generating download links  
						
						 
						
						
						
						
					 
					
						2019-03-16 16:23:40 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
							
						
						9c1b3f136f 
					 
					
						
						
							
							Improved sorting for rated,random, hot books, read/unread book  
						
						 
						
						
						
						
					 
					
						2019-03-16 15:48:09 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
							
						
						eef4787b79 
					 
					
						
						
							
							Merge remote-tracking branch 'github/patch-1' into Develop  
						
						 
						
						... 
						
						
						
						Oauth is optional again 
						
						
					 
					
						2019-02-24 19:34:57 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
							
						
						f6fbe2e135 
					 
					
						
						
							
							Fix   #766  
						
						 
						
						... 
						
						
						
						Update pdf upload
Translation of uploadprogress dialog 
						
						
					 
					
						2019-02-24 19:23:51 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
							
						
						cc3088c52f 
					 
					
						
						
							
							Merge branch 'master' into Develop  
						
						 
						
						... 
						
						
						
						# Conflicts:
#	cps/book_formats.py
#	cps/static/js/libs/bootstrap.min.js
#	cps/templates/detail.html
#	cps/templates/layout.html
#	cps/web.py
Improvement updater (up to 100 releases are loaded at once)
Fix oauth pathes
Fix oauth without registering 
						
						
					 
					
						2019-02-24 10:39:37 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
							
						
						1a7052b287 
					 
					
						
						
							
							Update pdf upload  
						
						 
						
						... 
						
						
						
						Translation of uploadprogress dialog 
						
						
					 
					
						2019-02-23 14:26:02 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
							
						
						e92497b34e 
					 
					
						
						
							
							Merge branch 'master' into Develop  
						
						 
						
						... 
						
						
						
						# Conflicts:
#	cps/gdriveutils.py
#	cps/helper.py 
						
						
					 
					
						2019-02-20 18:09:42 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
							
						
						ae7c4908f9 
					 
					
						
						
							
							Fix   #767  
						
						 
						
						
						
						
					 
					
						2019-02-20 18:04:55 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
							
						
						2505f0c1e4 
					 
					
						
						
							
							Merge remote-tracking branch 'filename/patch-1'  
						
						 
						
						... 
						
						
						
						Fixes for Google Drive 
						
						
					 
					
						2019-02-18 20:52:58 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
							
						
						4230226716 
					 
					
						
						
							
							Link fixes  
						
						 
						
						... 
						
						
						
						Fixes reader button visible in detail view
Fix formats to convert (added htmlz)
Fix logger in updater
Added request "v3" of github api on update
Fix quotes parameter on external calls
E-Mail logger working more stable (also on python3)
Routing fixes
Change import in ub 
						
						
					 
					
						2019-02-16 07:23:36 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
							
						
						a00d93a2d9 
					 
					
						
						
							
							Working again (basically)  
						
						 
						
						
						
						
					 
					
						2019-02-06 21:52:32 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
							
						
						36229076f7 
					 
					
						
						
							
							Refactor subprocess calls  
						
						 
						
						
						
						
					 
					
						2019-02-03 18:32:27 +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 
							
						 
					 
					
						
						
							
						
						bacb6fb561 
					 
					
						
						
							
							New updater with default setting -> only stable releases  #653  
						
						 
						
						
						
						
					 
					
						2019-01-20 17:46:26 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
							
						
						32568c9009 
					 
					
						
						
							
							Update testing  
						
						 
						
						... 
						
						
						
						Update custom columns unicode enums 
						
						
					 
					
						2019-01-14 20:27:53 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
							
						
						fa4918a2db 
					 
					
						
						
							
							File renaming according to title and author ( #654 ) - gdrive is missing  
						
						 
						
						
						
						
					 
					
						2019-01-06 15:00:34 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
							
						
						4dcac07582 
					 
					
						
						
							
							Partly  fixed   #661 : Right order of Authors is still not shown  
						
						 
						
						
						
						
					 
					
						2019-01-05 21:44:29 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
							
						
						64b1b830d6 
					 
					
						
						
							
							Fix   #712  
						
						 
						
						
						
						
					 
					
						2018-11-25 13:29:58 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
							
						
						863b77a5d7 
					 
					
						
						
							
							Fix   #711  
						
						 
						
						... 
						
						
						
						Fixing for send to kindle after uploading
codecleaning 
						
						
					 
					
						2018-11-25 11:25:20 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
							
						
						dfa17956c9 
					 
					
						
						
							
							Merge remote-tracking branch 'bbb/295---Send-AZW-to-Kindle'  
						
						 
						
						... 
						
						
						
						Changed function for 295, azw3 is preferred format for sending to kindle 
						
						
					 
					
						2018-11-18 17:09:13 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
							
						
						399dffba5a 
					 
					
						
						
							
							log file name in case of filename not found ( #691 )  
						
						 
						
						
						
						
					 
					
						2018-11-03 18:37:38 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
							
						
						8d6d28eb57 
					 
					
						
						
							
							Merge remote-tracking branch 'titlelink/titles-links'  
						
						 
						
						... 
						
						
						
						Fix for #694  
						
						
					 
					
						2018-11-03 18:02:28 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
							
						
						c3bec48bc7 
					 
					
						
						
							
							Fix   #617  
						
						 
						
						... 
						
						
						
						Additional texts translated 
						
						
					 
					
						2018-11-03 13:43:38 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
							
						
						c582a70498 
					 
					
						
						
							
							Merge remote-tracking branch 'bbb/617'  
						
						 
						
						
						
						
					 
					
						2018-11-03 10:40:00 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
							
						
						cc7dcfb35a 
					 
					
						
						
							
							Update Updater  
						
						 
						
						... 
						
						
						
						Bugfix author in opds-feed 
						
						
					 
					
						2018-11-01 13:44:00 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
							
						
						ee85492c7d 
					 
					
						
						
							
							Fix   #662  
						
						 
						
						
						
						
					 
					
						2018-10-30 21:47:33 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
							
						
						3f83be00fd 
					 
					
						
						
							
							Fix   #687  
						
						 
						
						
						
						
					 
					
						2018-10-29 20:38:09 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bodybybuddha 
							
						 
					 
					
						
						
							
						
						ee686b5379 
					 
					
						
						
							
							Fix for  #617  
						
						 
						
						... 
						
						
						
						Task table: Status column and task messages have been localized
	Cleaned up the use of the task fields 'typ' and 'type' to be taskType and taskMessage 
						
						
					 
					
						2018-10-03 15:58:37 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bodybybuddha 
							
						 
					 
					
						
						
							
						
						54f8680058 
					 
					
						
						
							
							Merge branch 'master' of  https://github.com/janeczku/calibre-web  into 617  
						
						 
						
						
						
						
					 
					
						2018-10-03 11:58:25 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								OzzieIsaacs 
							
						 
					 
					
						
						
							
						
						40cc25de7a 
					 
					
						
						
							
							Merge remote-tracking branch 'bbb/621'  
						
						 
						
						... 
						
						
						
						Fixes after testing 
						
						
					 
					
						2018-10-03 14:03:08 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bodybybuddha 
							
						 
					 
					
						
						
							
						
						d8107fb50f 
					 
					
						
						
							
							Addressed Codacy trailing space  items ... again  
						
						 
						
						
						
						
					 
					
						2018-10-02 10:22:01 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bodybybuddha 
							
						 
					 
					
						
						
							
						
						46b2c9919a 
					 
					
						
						
							
							Fix for  #295  
						
						 
						
						... 
						
						
						
						Allow for azw and azw3 files to be "sent" to kindle - these books are actually converted to mobi first 
						
						
					 
					
						2018-10-01 15:35:51 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bodybybuddha 
							
						 
					 
					
						
						
							
						
						5d34fd7fec 
					 
					
						
						
							
							Send to Kindle button precheck added  
						
						 
						
						... 
						
						
						
						Based on existing book formats and which converter (if any) determine if button can be seen. 
						
						
					 
					
						2018-10-01 14:19:29 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bodybybuddha 
							
						 
					 
					
						
						
							
						
						b4122e9858 
					 
					
						
						
							
							Partial fix to  #617 . Local status messages now work.  
						
						 
						
						
						
						
					 
					
						2018-09-19 11:26:52 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								OzzieIsaacs 
							
						 
					 
					
						
						
							
						
						80e1a6910d 
					 
					
						
						
							
							Fix Updater  
						
						 
						
						
						
						
					 
					
						2018-09-14 21:18:20 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								OzzieIsaacs 
							
						 
					 
					
						
						
							
						
						b5ef63d327 
					 
					
						
						
							
							Removed fixed update Informations  
						
						 
						
						
						
						
					 
					
						2018-09-14 21:16:09 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								OzzieIsaacs 
							
						 
					 
					
						
						
							
						
						4eeeb02b1d 
					 
					
						
						
							
							Merge remote-tracking branch 'update_check/master'  
						
						 
						
						
						
						
					 
					
						2018-09-14 21:12:45 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Virgil Grigoras 
							
						 
					 
					
						
						
							
						
						e08eccba5a 
					 
					
						
						
							
							Satisfy "Codacy/PR Quality Review"  
						
						 
						
						
						
						
					 
					
						2018-09-10 18:21:44 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Virgil Grigoras 
							
						 
					 
					
						
						
							
						
						b2b092c190 
					 
					
						
						
							
							Bugfix for not displaying information when there is no update available + simplification  
						
						 
						
						
						
						
					 
					
						2018-09-10 11:20:34 +02:00