Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							1d7e52c198 
							
						 
					 
					
						
						
							
							Merge with develop:  
						
						 
						
						... 
						
						
						
						- No. of unread books correct calculated
- logviewer handles stream output correct
- Id for testablility in email server setup 
						
					 
					
						2020-01-13 18:37:29 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							68ca0b86da 
							
						 
					 
					
						
						
							
							Updated tiniymce + locale  
						
						 
						
						... 
						
						
						
						updated datepicker + locale
Included cs, fi language, updated ru language 
						
					 
					
						2020-01-12 14:11:53 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							513ac6cfb4 
							
						 
					 
					
						
						
							
							Fix for  #768  (If email server is configured, admins can send user passwords, also domains can be denied from registration)  
						
						 
						
						... 
						
						
						
						Fixes from tests
Fix response opds with read/unread
changed db_reconnect
Changed output for error 500 (now including error message)
Fix in task queue after 20 messages 
						
					 
					
						2020-01-01 17:29:01 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							b586a32843 
							
						 
					 
					
						
						
							
							Fix   #1115  (comic reader not working under iOS, maybe invalid issue)  
						
						 
						
						... 
						
						
						
						Improvement for #925  (Next/Prev buttons are bigger) 
						
					 
					
						2019-12-22 15:24:22 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zhiyue 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							222797e631 
							
						 
					 
					
						
						
							
							support douban book search using apikey  
						
						 
						
						
						
					 
					
						2019-12-04 11:59:06 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							0c40e40dc3 
							
						 
					 
					
						
						
							
							Fix logfile loading behind reverse proxy ( #1047 )  
						
						 
						
						
						
					 
					
						2019-09-27 08:15:10 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Dmitriy Istomin 
							
						 
					 
					
						
						
						
						
							
						
						
							a65ad9483c 
							
						 
					 
					
						
						
							
							update Bootstrap v3.4.0 -> 3.4.1  
						
						 
						
						
						
					 
					
						2019-08-16 11:18:39 -04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							c6542fdec6 
							
						 
					 
					
						
						
							
							New Oauth code  
						
						 
						
						
						
					 
					
						2019-07-20 20:01:05 +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 
							
						 
					 
					
						
						
						
						
							
						
						
							f79d549910 
							
						 
					 
					
						
						
							
							Fix duplicate user and email (now case insensitive  #948 )  
						
						 
						
						... 
						
						
						
						Fix sorting in comics (#950 )
Fix log error on Calibre converter error (#953 )
Fix long running tasks (#954 ) 
						
					 
					
						2019-07-06 14:35:12 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							cd546eb6d4 
							
						 
					 
					
						
						
							
							Update comic reader js  
						
						 
						
						
						
					 
					
						2019-06-17 19:48:17 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							c81d4edb7d 
							
						 
					 
					
						
						
							
							Fix for  #923  
						
						 
						
						
						
					 
					
						2019-06-10 16:38:29 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							26e45f1f57 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'comic-reader/master'  
						
						 
						
						
						
					 
					
						2019-05-31 08:43:51 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							ecedf92783 
							
						 
					 
					
						
						
							
							Update version  
						
						 
						
						... 
						
						
						
						Make custom columns visible (#904 ) 
						
					 
					
						2019-05-30 10:21:11 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								subdiox 
							
						 
					 
					
						
						
						
						
							
						
						
							867aa2f0bd 
							
						 
					 
					
						
						
							
							Beautify bitjs  
						
						 
						
						
						
					 
					
						2019-05-14 04:28:06 +09:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								subdiox 
							
						 
					 
					
						
						
						
						
							
						
						
							7982ed877c 
							
						 
					 
					
						
						
							
							Downgrade bitjs to es5 branch  
						
						 
						
						
						
					 
					
						2019-05-13 14:53:25 +09:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								subdiox 
							
						 
					 
					
						
						
						
						
							
						
						
							c0d136ccd8 
							
						 
					 
					
						
						
							
							Fix slow loading  
						
						 
						
						
						
					 
					
						2019-05-10 08:16:03 +09:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								subdiox 
							
						 
					 
					
						
						
						
						
							
						
						
							c2bfb29726 
							
						 
					 
					
						
						
							
							Add reading direction settings to readcbr page  
						
						 
						
						
						
					 
					
						2019-04-21 18:20:15 +09:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								subdiox 
							
						 
					 
					
						
						
						
						
							
						
						
							204de4aef6 
							
						 
					 
					
						
						
							
							Fix an issue that fullscreen doens't work on some browsers  
						
						 
						
						
						
					 
					
						2019-04-21 18:02:02 +09:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							0b8624b542 
							
						 
					 
					
						
						
							
							Deleted load metadata from douban, as API seems to be shut down ( #858 )  
						
						 
						
						
						
					 
					
						2019-04-17 19:55:32 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							436c2671d1 
							
						 
					 
					
						
						
							
							Fix delete domain entries  
						
						 
						
						... 
						
						
						
						Fix error handling smtp.authentication error 
						
					 
					
						2019-04-14 14:08:49 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							dc933f3d66 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'pdf.js/epubjs'  
						
						 
						
						... 
						
						
						
						Updated pdf.js 
						
					 
					
						2019-04-13 15:02:01 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Pavel 
							
						 
					 
					
						
						
						
						
							
						
						
							439ce19b5d 
							
						 
					 
					
						
						
							
							Updated epub.js to v0.3.66  
						
						 
						
						
						
					 
					
						2019-03-28 07:23:45 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							4b301a7961 
							
						 
					 
					
						
						
							
							Additional fix for  #845  (in case of error)  
						
						 
						
						
						
					 
					
						2019-03-26 18:19:39 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							8612dce97c 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'author/shorten-authors'  
						
						 
						
						
						
					 
					
						2019-03-09 20:14:16 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							0b0e62fdf2 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'dialog/master'  
						
						 
						
						... 
						
						
						
						Fix for #833  
						
					 
					
						2019-03-09 20:02:17 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							6f80a63ca6 
							
						 
					 
					
						
						
							
							Fix for  #827  
						
						 
						
						
						
					 
					
						2019-03-09 07:05:43 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Andrew Sullivan 
							
						 
					 
					
						
						
						
						
							
						
						
							3dfc2f2580 
							
						 
					 
					
						
						
							
							fixing issue  #833  
						
						 
						
						
						
					 
					
						2019-03-08 20:44:45 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							6f0b3bbda0 
							
						 
					 
					
						
						
							
							Fix for  #812  
						
						 
						
						
						
					 
					
						2019-03-05 21:28:55 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							466af21548 
							
						 
					 
					
						
						
							
							Code Cosmetics  
						
						 
						
						
						
					 
					
						2019-03-05 16:31:09 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							361a1243d7 
							
						 
					 
					
						
						
							
							Improvements  #828  
						
						 
						
						
						
					 
					
						2019-02-27 19:30:13 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Virgil Grigoras 
							
						 
					 
					
						
						
						
						
							
						
						
							bd7b0175a1 
							
						 
					 
					
						
						
							
							Fix remaining shown by codacy  
						
						 
						
						
						
					 
					
						2019-02-26 17:24:13 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Virgil Grigoras 
							
						 
					 
					
						
						
						
						
							
						
						
							f5cf62f209 
							
						 
					 
					
						
						
							
							Fix issues shown by codacy  
						
						 
						
						
						
					 
					
						2019-02-26 11:17:06 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Virgil Grigoras 
							
						 
					 
					
						
						
						
						
							
						
						
							d3ed0317bb 
							
						 
					 
					
						
						
							
							styling and javascript for hiding authors  
						
						 
						
						
						
					 
					
						2019-02-25 19:25:08 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							f6fbe2e135 
							
						 
					 
					
						
						
							
							Fix   #766  
						
						 
						
						... 
						
						
						
						Update pdf upload
Translation of uploadprogress dialog 
						
					 
					
						2019-02-24 19:23:51 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							17b7333992 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'caliblur/master'  
						
						 
						
						
						
					 
					
						2019-02-20 20:00:08 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								hexeth 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							9a0e8fefb7 
							
						 
					 
					
						
						
							
							re-add loader code  
						
						 
						
						
						
					 
					
						2019-02-19 13:56:49 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Matt 
							
						 
					 
					
						
						
						
						
							
						
						
							c07cb23ef2 
							
						 
					 
					
						
						
							
							Merge branch 'master' of git://github.com/janeczku/calibre-web  
						
						 
						
						
						
					 
					
						2019-02-19 13:47:53 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								hexeth 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							5a863541de 
							
						 
					 
					
						
						
							
							Fix object object  
						
						 
						
						
						
					 
					
						2019-02-19 13:44:40 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							4c80db4324 
							
						 
					 
					
						
						
							
							Revert bootstrap update 3.4.0 -> 3.3.7  
						
						 
						
						
						
					 
					
						2019-02-19 19:32:00 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							56826f67fc 
							
						 
					 
					
						
						
							
							progressbar during upload thanks to jim3ma  
						
						 
						
						
						
					 
					
						2019-02-16 10:05:51 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								lorek123 
							
						 
					 
					
						
						
						
						
							
						
						
							d508b909d1 
							
						 
					 
					
						
						
							
							update js and css libs, especially to fix xss in Jquery and Bootstrap  
						
						 
						
						
						
					 
					
						2019-02-10 18:17:33 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							9128615f48 
							
						 
					 
					
						
						
							
							Fix   #424  
						
						 
						
						... 
						
						
						
						Fix  #425  
						
					 
					
						2019-01-26 09:43:17 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							ec81a3cd92 
							
						 
					 
					
						
						
							
							Fix Authors page pagination  
						
						 
						
						... 
						
						
						
						Update infinite scroll plugin 
						
					 
					
						2019-01-25 21:58:19 +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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								hexeth 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							83a905bfe1 
							
						 
					 
					
						
						
							
							Don't remove the dropdown toggle  
						
						 
						
						
						
					 
					
						2019-01-18 11:35:13 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								hexeth 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							c0792b7225 
							
						 
					 
					
						
						
							
							Add .sendtokindle-drop to click-off  
						
						 
						
						
						
					 
					
						2019-01-18 11:10:54 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Matt 
							
						 
					 
					
						
						
						
						
							
						
						
							8825352af6 
							
						 
					 
					
						
						
							
							Revert "Add sendtokindle-drop to click-off array"  
						
						 
						
						... 
						
						
						
						This reverts commit d83ba315f0 . 
						
					 
					
						2019-01-18 11:09:26 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								hexeth 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							d83ba315f0 
							
						 
					 
					
						
						
							
							Add sendtokindle-drop to click-off array  
						
						 
						
						
						
					 
					
						2019-01-18 11:07:50 -08:00