Jony 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							51a6cff411 
							
						 
					 
					
						
						
							
							Merge pull request  #2  from janeczku/master  
						
						 
						
						... 
						
						
						
						Update respository 
						
					 
					
						2020-01-18 11:24:03 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							8f4253adbd 
							
						 
					 
					
						
						
							
							Fix for limiting domains (now no restriction to domain only)  
						
						 
						
						
						
					 
					
						2020-01-18 10:32:09 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							ce66c752c4 
							
						 
					 
					
						
						
							
							Updated czech translation  
						
						 
						
						... 
						
						
						
						removed language selection for guest user 
						
					 
					
						2020-01-14 18:21:31 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Lukáš Heroudek 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							4e42a179fa 
							
						 
					 
					
						
						
							
							Update messages.po  
						
						 
						
						
						
					 
					
						2020-01-14 16:45:45 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								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 
							
						 
					 
					
						
						
						
						
							
						
						
							1b42dd1043 
							
						 
					 
					
						
						
							
							Update czech and german translation  
						
						 
						
						
						
					 
					
						2020-01-13 18:24:47 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Lukáš Heroudek 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							77e0022252 
							
						 
					 
					
						
						
							
							Update messages.po  
						
						 
						
						... 
						
						
						
						Added missing and clenup 
						
					 
					
						2020-01-13 10:29:14 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							68ca0b86da 
							
						 
					 
					
						
						
							
							Updated tiniymce + locale  
						
						 
						
						... 
						
						
						
						updated datepicker + locale
Included cs, fi language, updated ru language 
						
					 
					
						2020-01-12 14:11:53 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Lukáš Heroudek 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							434fb2e7cb 
							
						 
					 
					
						
						
							
							Add files via upload  
						
						 
						
						
						
					 
					
						2020-01-08 12:06:13 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Lukáš Heroudek 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							bce70bf17c 
							
						 
					 
					
						
						
							
							Update messages.po  
						
						 
						
						
						
					 
					
						2020-01-08 12:05:36 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Lukáš Heroudek 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							cde44178c4 
							
						 
					 
					
						
						
							
							Create messages.po  
						
						 
						
						
						
					 
					
						2020-01-08 12:03:52 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							c659f28334 
							
						 
					 
					
						
						
							
							Fix   #1128  
						
						 
						
						
						
					 
					
						2020-01-06 11:52:59 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							24ae7350f5 
							
						 
					 
					
						
						
							
							Fix #  #1127  (user template show random books in detail view not saved)  
						
						 
						
						
						
					 
					
						2020-01-05 16:18:51 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							c60277f4d3 
							
						 
					 
					
						
						
							
							Capitalize language selection in User settings  
						
						 
						
						... 
						
						
						
						Remove sql statement from log.debug statement upon creation of new column in settings database 
						
					 
					
						2020-01-05 14:07:26 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							6a07cfba65 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'proxy_login/1105-reverse-proxy-login'  
						
						 
						
						... 
						
						
						
						Fix for creation of bool config settings (before: new bool columns where always created with true as default) 
						
					 
					
						2020-01-05 13:38:51 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							c78c63e1d5 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'fix_reconnect'  
						
						 
						
						... 
						
						
						
						# Conflicts:
#	cps/web.py 
						
					 
					
						2020-01-05 08:47:03 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							56ee8c56ba 
							
						 
					 
					
						
						
							
							Fix   #1122  
						
						 
						
						... 
						
						
						
						(Uploading books with applied language restriction leads no longer to error 500) 
						
					 
					
						2020-01-05 08:40:57 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							8ad84a7ceb 
							
						 
					 
					
						
						
							
							Fix for  #1123  (mature content is visible in shelfs)  
						
						 
						
						
						
					 
					
						2020-01-02 17:11:30 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							32e818af6a 
							
						 
					 
					
						
						
							
							Fix   #1124  
						
						 
						
						
						
					 
					
						2020-01-02 16:09:06 +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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Michael Shavit 
							
						 
					 
					
						
						
						
						
							
						
						
							520c695401 
							
						 
					 
					
						
						
							
							Fix /reconnect endpoint, which was broken by  006e596c72 
						
						 
						
						
						
					 
					
						2019-12-22 16:54:16 -05: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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							7098d08888 
							
						 
					 
					
						
						
							
							Added option to convert AZW3 to mobi for sending to kindle  
						
						 
						
						
						
					 
					
						2019-12-15 18:44:02 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							eabc6e23be 
							
						 
					 
					
						
						
							
							Test Email now send to user's email address ( #834 )  
						
						 
						
						... 
						
						
						
						Added forgot/reset password routine (#1098 , #1063 ) 
						
					 
					
						2019-12-15 17:08:17 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							b6d7207ec3 
							
						 
					 
					
						
						
							
							Added platform information for better debugging  
						
						 
						
						
						
					 
					
						2019-12-15 13:33:38 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							c33623efee 
							
						 
					 
					
						
						
							
							Unified wording for recently added books, series, categories, etc in opds and web UI (  #1045 )  
						
						 
						
						... 
						
						
						
						Added file formats and languages to opds feed 
						
					 
					
						2019-12-15 13:32:34 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							2215bf3d7f 
							
						 
					 
					
						
						
							
							Implemented  #1083  (Advanced search for extensions)  
						
						 
						
						
						
					 
					
						2019-12-15 11:35:07 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							86fe970651 
							
						 
					 
					
						
						
							
							More fixes for googledrive  
						
						 
						
						
						
					 
					
						2019-12-14 22:22:27 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Andrew Roberts 
							
						 
					 
					
						
						
						
						
							
						
						
							3dc372c573 
							
						 
					 
					
						
						
							
							fixed typo  
						
						 
						
						
						
					 
					
						2019-12-12 21:38:45 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Andrew Roberts 
							
						 
					 
					
						
						
						
						
							
						
						
							efcee0a7b7 
							
						 
					 
					
						
						
							
							added reverse proxy configuration form and handler  
						
						 
						
						
						
					 
					
						2019-12-12 21:31:21 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Andrew Roberts 
							
						 
					 
					
						
						
						
						
							
						
						
							39b6b100f9 
							
						 
					 
					
						
						
							
							whitespace  
						
						 
						
						
						
					 
					
						2019-12-12 21:31:19 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Andrew Roberts 
							
						 
					 
					
						
						
						
						
							
						
						
							9351ff032f 
							
						 
					 
					
						
						
							
							whitespace  
						
						 
						
						
						
					 
					
						2019-12-12 21:31:17 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Andrew Roberts 
							
						 
					 
					
						
						
						
						
							
						
						
							f0760c07d8 
							
						 
					 
					
						
						
							
							added admin display of reverse proxy settings  
						
						 
						
						
						
					 
					
						2019-12-12 21:31:12 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Andrew Roberts 
							
						 
					 
					
						
						
						
						
							
						
						
							77b0954c70 
							
						 
					 
					
						
						
							
							use a macro for the display of boolean settings  
						
						 
						
						
						
					 
					
						2019-12-12 21:28:50 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Andrew Roberts 
							
						 
					 
					
						
						
						
						
							
						
						
							af7dbbf1e4 
							
						 
					 
					
						
						
							
							added logic for reverse proxy login  
						
						 
						
						
						
					 
					
						2019-12-12 21:27:40 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Andrew Roberts 
							
						 
					 
					
						
						
						
						
							
						
						
							b661c2fa92 
							
						 
					 
					
						
						
							
							added config fields to settings table  
						
						 
						
						
						
					 
					
						2019-12-12 21:27:38 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							e308a74dc2 
							
						 
					 
					
						
						
							
							Fix ( #1103 ) Internal server error with Goodreads and no result for author name on Goodreads  
						
						 
						
						
						
					 
					
						2019-12-12 20:08:16 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							eede894e72 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'merge-metadata'  
						
						 
						
						
						
					 
					
						2019-12-09 20:53:16 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							22add37b64 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'fix typo in config_edit.html  #1097 '  
						
						 
						
						... 
						
						
						
						Updated translations 
						
					 
					
						2019-12-08 10:10:32 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							8a9695d48e 
							
						 
					 
					
						
						
							
							Fix getting metadata from douban ( #858 )  
						
						 
						
						
						
					 
					
						2019-12-08 09:52:57 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							e0faad1e59 
							
						 
					 
					
						
						
							
							Handle no write permission to tmp folder ( #1060 )  
						
						 
						
						
						
					 
					
						2019-12-08 09:40:54 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Christian Keil 
							
						 
					 
					
						
						
						
						
							
						
						
							c61463447f 
							
						 
					 
					
						
						
							
							Merge metadata of uploaded book versions.  
						
						 
						
						
						
					 
					
						2019-12-06 15:00:01 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zhiyue 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							222797e631 
							
						 
					 
					
						
						
							
							support douban book search using apikey  
						
						 
						
						
						
					 
					
						2019-12-04 11:59:06 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								dalin 
							
						 
					 
					
						
						
						
						
							
						
						
							92841b46d7 
							
						 
					 
					
						
						
							
							update Simplified Chinese translations.  
						
						 
						
						
						
					 
					
						2019-12-03 16:32:03 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								dalin 
							
						 
					 
					
						
						
						
						
							
						
						
							6fe60d5c5e 
							
						 
					 
					
						
						
							
							Merge branch 'master' of  https://github.com/idalin/calibre-web  
						
						 
						
						
						
					 
					
						2019-12-03 16:07:09 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								dalin 
							
						 
					 
					
						
						
						
						
							
						
						
							4c2323fcc9 
							
						 
					 
					
						
						
							
							fix typo in config_edit.html  
						
						 
						
						
						
					 
					
						2019-12-03 16:06:25 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							fda0ab1e86 
							
						 
					 
					
						
						
							
							FIx for ( #1092  listening to mp3 not working)  
						
						 
						
						
						
					 
					
						2019-12-01 12:36:55 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							54079b36ae 
							
						 
					 
					
						
						
							
							Fix   #1095  (epub viewer not working if only viewer rule wa sapplied)  
						
						 
						
						
						
					 
					
						2019-12-01 12:21:21 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							f8a99c60d8 
							
						 
					 
					
						
						
							
							Fix for  #1096  (exception on digest request)  
						
						 
						
						
						
					 
					
						2019-12-01 09:33:11 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							2f27a7b0ce 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'd/master'  
						
						 
						
						
						
					 
					
						2019-11-26 10:50:55 +01:00