bodybybuddha 
							
						 
					 
					
						
						
						
						
							
						
						
							d2e74a27cd 
							
						 
					 
					
						
						
							
							Merge branch 'master' of  https://github.com/janeczku/calibre-web  into 621  
						
						 
						
						
						
					 
					
						2018-09-23 19:51:32 -04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								OzzieIsaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							ba7c734657 
							
						 
					 
					
						
						
							
							Fixes from testing:  
						
						 
						
						... 
						
						
						
						Certificate files are rejected if not both files are provided
Server shuts down controlled after pressing crtl+c
Logfile location is better checked
improvements for better testing (added ids and name in templates) 
						
					 
					
						2018-09-23 19:15:50 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								OzzieIsaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							cab98a9165 
							
						 
					 
					
						
						
							
							Update translation files  
						
						 
						
						
						
					 
					
						2018-09-23 19:03:14 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								OzzieIsaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							aa5127cd16 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'lxml/master'  
						
						 
						
						
						
					 
					
						2018-09-23 18:58:08 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								OzzieIsaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							b841baf714 
							
						 
					 
					
						
						
							
							Comment for adding publishers  
						
						 
						
						
						
					 
					
						2018-09-23 18:56:19 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								eddriesen 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							522e897fee 
							
						 
					 
					
						
						
							
							Updated Dutch translation to current codebase  
						
						 
						
						... 
						
						
						
						As requested,
A Dutch update 
						
					 
					
						2018-09-23 15:52:11 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Fatih Ka 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							76e3be58e6 
							
						 
					 
					
						
						
							
							Delete book fixed  
						
						 
						
						... 
						
						
						
						There was an incorrect parameter. 
						
					 
					
						2018-09-19 21:38:40 +03:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bodybybuddha 
							
						 
					 
					
						
						
						
						
							
						
						
							b4122e9858 
							
						 
					 
					
						
						
							
							Partial fix to  #617 . Local status messages now work.  
						
						 
						
						
						
					 
					
						2018-09-19 11:26:52 -04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								trasba 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							9cf376f115 
							
						 
					 
					
						
						
							
							Merge pull request  #2  from trasba/trasba-patch-fileformats  
						
						 
						
						... 
						
						
						
						added formats for upload and conversion 
						
					 
					
						2018-09-17 21:56:21 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								trasba 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							3fa41d0e4a 
							
						 
					 
					
						
						
							
							added formats for upload and conversion  
						
						 
						
						... 
						
						
						
						added formats for upload and conversion (html, rtf, odt) 
						
					 
					
						2018-09-17 21:55:41 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bodybybuddha 
							
						 
					 
					
						
						
						
						
							
						
						
							be0ddf25e4 
							
						 
					 
					
						
						
							
							Fix for  #621  - Login page always in english  
						
						 
						
						
						
					 
					
						2018-09-17 13:03:29 -04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								trasba 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							d5f711c46e 
							
						 
					 
					
						
						
							
							Merge pull request  #1  from trasba/trasba-patch-lxml-requirement  
						
						 
						
						... 
						
						
						
						Update optional-requirements.txt -> increase lxml requirement 
						
					 
					
						2018-09-16 19:57:23 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								trasba 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							6d4d6aceaf 
							
						 
					 
					
						
						
							
							Update optional-requirements.txt  
						
						 
						
						... 
						
						
						
						changed optional requirement from lxml==3.7.2 to >=3.8.0 ebook-convert is not working properly with a version < 3.8.0 
						
					 
					
						2018-09-16 19:43:47 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							0bb148e6e3 
							
						 
					 
					
						
						
							
							Update Format string generation  
						
						 
						
						
						
					 
					
						2018-09-14 21:23:32 +02: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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								OzzieIsaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							36d26f2089 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch '625/625'  
						
						 
						
						... 
						
						
						
						Update russian translation 
						
					 
					
						2018-09-14 20:36:45 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bodybybuddha 
							
						 
					 
					
						
						
						
						
							
						
						
							03dc179bc3 
							
						 
					 
					
						
						
							
							Fixed Codacy Issues  
						
						 
						
						
						
					 
					
						2018-09-14 10:35:01 -04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bodybybuddha 
							
						 
					 
					
						
						
						
						
							
						
						
							89c0904ac9 
							
						 
					 
					
						
						
							
							Fix to  #625  - Check to see if target book format already exists before executing conversion.  
						
						 
						
						
						
					 
					
						2018-09-13 21:24:21 -04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Admiral Laser Beard 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							21582f097e 
							
						 
					 
					
						
						
							
							update translation  
						
						 
						
						
						
					 
					
						2018-09-14 00:06:53 +03:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								OzzieIsaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							968cddf2b0 
							
						 
					 
					
						
						
							
							Fix for  #620  
						
						 
						
						
						
					 
					
						2018-09-10 19:31:56 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Virgil Grigoras 
							
						 
					 
					
						
						
						
						
							
						
						
							e08eccba5a 
							
						 
					 
					
						
						
							
							Satisfy "Codacy/PR Quality Review"  
						
						 
						
						
						
					 
					
						2018-09-10 18:21:44 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Virgil Grigoras 
							
						 
					 
					
						
						
						
						
							
						
						
							50ded1afc1 
							
						 
					 
					
						
						
							
							typo fix  
						
						 
						
						
						
					 
					
						2018-09-10 11:28:32 +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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Virgil Grigoras 
							
						 
					 
					
						
						
						
						
							
						
						
							f7872aded0 
							
						 
					 
					
						
						
							
							Own function for getting the current commit hash and datetime  
						
						 
						
						
						
					 
					
						2018-09-10 10:42:28 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Virgil Grigoras 
							
						 
					 
					
						
						
						
						
							
						
						
							cb5adb3a31 
							
						 
					 
					
						
						
							
							Display "what's new" information for newer versions than the current one  
						
						 
						
						
						
					 
					
						2018-09-09 21:54:51 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								OzzieIsaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							01fb8ee681 
							
						 
					 
					
						
						
							
							Fix   #609  
						
						 
						
						... 
						
						
						
						Removed formats which are not possible to convert from list of convertable books
Update language files to be po-edit compatible 
						
					 
					
						2018-09-09 18:17:15 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Virgil Grigoras 
							
						 
					 
					
						
						
						
						
							
						
						
							9616562a76 
							
						 
					 
					
						
						
							
							Revert change from #10478594240d17f2bd73cda597439ade665a1e5c (move general information back to configuration block)  
						
						 
						
						
						
					 
					
						2018-09-09 14:18:56 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Virgil Grigoras 
							
						 
					 
					
						
						
						
						
							
						
						
							cfae6e893a 
							
						 
					 
					
						
						
							
							Move update relevant parts to own section  
						
						 
						
						
						
					 
					
						2018-09-09 14:12:12 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Virgil Grigoras 
							
						 
					 
					
						
						
						
						
							
						
						
							1047859424 
							
						 
					 
					
						
						
							
							Place general information (db location, amount of books...) on top  
						
						 
						
						
						
					 
					
						2018-09-09 14:01:28 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Virgil Grigoras 
							
						 
					 
					
						
						
						
						
							
						
						
							354eac1512 
							
						 
					 
					
						
						
							
							fix html errors and formating  
						
						 
						
						
						
					 
					
						2018-09-09 13:51:28 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Virgil Grigoras 
							
						 
					 
					
						
						
						
						
							
						
						
							6e2dbb7cd6 
							
						 
					 
					
						
						
							
							move current commit hash to its own file  
						
						 
						
						
						
					 
					
						2018-09-09 13:00:46 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Virgil Grigoras 
							
						 
					 
					
						
						
						
						
							
						
						
							f477d48c7c 
							
						 
					 
					
						
						
							
							More robust handling while checking for new updates  
						
						 
						
						
						
					 
					
						2018-09-09 11:46:00 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								OzzieIsaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							bb7d2c6273 
							
						 
					 
					
						
						
							
							Update Language translation table (now including the locale language)  
						
						 
						
						... 
						
						
						
						Fix  #602 
Fix for #593  
						
					 
					
						2018-09-09 10:13:08 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								OzzieIsaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							79ee07ea54 
							
						 
					 
					
						
						
							
							Fix for python3 and pickle  
						
						 
						
						
						
					 
					
						2018-09-09 09:41:46 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								OzzieIsaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							ce6cde545b 
							
						 
					 
					
						
						
							
							Update french language  
						
						 
						
						
						
					 
					
						2018-09-08 21:16:56 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								OzzieIsaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							919de60e8d 
							
						 
					 
					
						
						
							
							Final  fix   #615  
						
						 
						
						
						
					 
					
						2018-09-08 14:58:00 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								OzzieIsaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							a5d15a19de 
							
						 
					 
					
						
						
							
							Update Translation "->'  
						
						 
						
						
						
					 
					
						2018-09-08 14:50:52 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							2de41a5c86 
							
						 
					 
					
						
						
							
							improvement for  #615  
						
						 
						
						
						
					 
					
						2018-09-08 13:27:28 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								OzzieIsaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							9d0f583d4f 
							
						 
					 
					
						
						
							
							Updated french and chinese language. Thanks to @idalin and Olivier  
						
						 
						
						... 
						
						
						
						Fixed bug some translations are not shown 
						
					 
					
						2018-09-08 12:28:48 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								OzzieIsaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							2f1fe60cd6 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'chinese_translation/master'  
						
						 
						
						
						
					 
					
						2018-09-08 09:28:12 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								OzzieIsaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							0091006aad 
							
						 
					 
					
						
						
							
							Fix   #611  
						
						 
						
						... 
						
						
						
						Fix for #615  
						
					 
					
						2018-09-07 20:04:35 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								OzzieIsaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							b48de7dc77 
							
						 
					 
					
						
						
							
							Fix for  #609  
						
						 
						
						
						
					 
					
						2018-09-06 20:54:48 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								idalin 
							
						 
					 
					
						
						
						
						
							
						
						
							b103ecdb5c 
							
						 
					 
					
						
						
							
							update simplified Chinese  
						
						 
						
						
						
					 
					
						2018-09-06 16:59:30 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ethan Lin 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							9d8c10e24b 
							
						 
					 
					
						
						
							
							Merge pull request  #18  from janeczku/master  
						
						 
						
						... 
						
						
						
						merge from janeczku/master 
						
					 
					
						2018-09-06 10:33:59 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								OzzieIsaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							0bcb20f674 
							
						 
					 
					
						
						
							
							Fix   #604  
						
						 
						
						... 
						
						
						
						Added missing translation for "select option" 
						
					 
					
						2018-09-03 19:12:15 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Virgil Grigoras 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							db9561db89 
							
						 
					 
					
						
						
							
							Show add to shelf button only when there is a result  
						
						 
						
						
						
					 
					
						2018-09-02 22:21:37 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								OzzieIsaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							0e1711631c 
							
						 
					 
					
						
						
							
							Fix for  #600  
						
						 
						
						... 
						
						
						
						publisher-info  is shown on edit page (#599 ) 
						
					 
					
						2018-09-02 17:21:01 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								OzzieIsaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							3f2d0ea7bb 
							
						 
					 
					
						
						
							
							Fix   #601  
						
						 
						
						... 
						
						
						
						Removed trailing comma on edit page 
						
					 
					
						2018-09-02 14:05:09 +02:00