林檎 
							
						 
					 
					
						
						
						
						
							
						
						
							6d687a517c 
							
						 
					 
					
						
						
							
							Merge branch 'refactor/patch-bookmeta-20170304' into travis  
						
						 
						
						
						
					 
					
						2017-03-04 16:09:37 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								林檎 
							
						 
					 
					
						
						
						
						
							
						
						
							a850e64bfb 
							
						 
					 
					
						
						
							
							Refactor cover detection  
						
						 
						
						... 
						
						
						
						obsolate hardcode %cover_id%= ‘cover’ in <pkg:item name=%cover_id% href=%coverfile%>
now  %cover_id% retrieve from <meta name=“cover” content=%cover_id%> 
						
					 
					
						2017-03-04 15:48:59 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								林檎 
							
						 
					 
					
						
						
						
						
							
						
						
							29f21480ab 
							
						 
					 
					
						
						
							
							Reuse original code logic.  
						
						 
						
						... 
						
						
						
						iteration loop dc:*  add dc:language
removal of bookmeta[‘comments’] , reusing bootmeta[‘description’] 
						
					 
					
						2017-03-04 15:37:30 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								林檎 
							
						 
					 
					
						
						
						
						
							
						
						
							622a2fc4b8 
							
						 
					 
					
						
						
							
							Merge branch 'master' into travis  
						
						 
						
						
						
					 
					
						2017-03-04 13:15:56 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jack Darlington 
							
						 
					 
					
						
						
						
						
							
						
						
							c702b14340 
							
						 
					 
					
						
						
							
							Fixes for READ/UNREAD  
						
						 
						
						
						
					 
					
						2017-03-03 21:38:54 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jack Darlington 
							
						 
					 
					
						
						
						
						
							
						
						
							27cbab6cb7 
							
						 
					 
					
						
						
							
							Fixes for READ/UNREAD  
						
						 
						
						
						
					 
					
						2017-03-03 21:09:53 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								OzzieIsaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							8c7ba2ccdf 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'gitignore/bookmeta-patch-20170302'  
						
						 
						
						... 
						
						
						
						# Conflicts:
#	cps/epub.py 
						
					 
					
						2017-03-03 19:48:02 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								林檎 
							
						 
					 
					
						
						
						
						
							
						
						
							1a10859a57 
							
						 
					 
					
						
						
							
							When upload pub, add description to comment accord opf file  
						
						 
						
						
						
					 
					
						2017-03-03 12:50:06 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jack Darlington 
							
						 
					 
					
						
						
						
						
							
						
						
							015d82ae2b 
							
						 
					 
					
						
						
							
							Revert "Merging ignorable columns"  
						
						 
						
						... 
						
						
						
						This reverts commit 8745d65ff6 . 
						
					 
					
						2017-03-03 00:03:46 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jack Darlington 
							
						 
					 
					
						
						
						
						
							
						
						
							b6da3c3153 
							
						 
					 
					
						
						
							
							Fix for read/unread for anonymous users  
						
						 
						
						
						
					 
					
						2017-03-02 23:56:07 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jack Darlington 
							
						 
					 
					
						
						
						
						
							
						
						
							fb6a37eec3 
							
						 
					 
					
						
						
							
							Update for covers download via opds + inserts permissions if needed (only available with a link)  
						
						 
						
						
						
					 
					
						2017-03-02 23:55:32 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kennyl 
							
						 
					 
					
						
						
						
						
							
						
						
							19f939a46c 
							
						 
					 
					
						
						
							
							Update epub.py  
						
						 
						
						... 
						
						
						
						initialize covefile to None first 
						
					 
					
						2017-03-03 00:27:54 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								林檎 
							
						 
					 
					
						
						
						
						
							
						
						
							d5e525305d 
							
						 
					 
					
						
						
							
							Lower case text, some epub have uppercased which is beyond iso639 standard.  
						
						 
						
						
						
					 
					
						2017-03-02 23:20:37 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								林檎 
							
						 
					 
					
						
						
						
						
							
						
						
							13b4ae4c24 
							
						 
					 
					
						
						
							
							more error adaptive  
						
						 
						
						
						
					 
					
						2017-03-02 23:15:15 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								林檎 
							
						 
					 
					
						
						
						
						
							
						
						
							879510da82 
							
						 
					 
					
						
						
							
							Upload support detection of  language  
						
						 
						
						
						
					 
					
						2017-03-02 22:57:02 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								林檎 
							
						 
					 
					
						
						
						
						
							
						
						
							4afb486986 
							
						 
					 
					
						
						
							
							add languages field for BookMeta  
						
						 
						
						
						
					 
					
						2017-03-02 19:59:35 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								林檎 
							
						 
					 
					
						
						
						
						
							
						
						
							6caf132fef 
							
						 
					 
					
						
						
							
							init travis  
						
						 
						
						
						
					 
					
						2017-03-02 18:31:21 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jack Darlington 
							
						 
					 
					
						
						
						
						
							
						
						
							df9124f78b 
							
						 
					 
					
						
						
							
							Fix OPDS download  
						
						 
						
						
						
					 
					
						2017-03-02 09:14:46 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jack 
							
						 
					 
					
						
						
						
						
							
						
						
							b8137d2c70 
							
						 
					 
					
						
						
							
							Fixing error with uploading new book / metadata as file was being backed up  
						
						 
						
						
						
					 
					
						2017-03-02 00:28:30 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jack Darlington 
							
						 
					 
					
						
						
						
						
							
						
						
							8e85d1b5bd 
							
						 
					 
					
						
						
							
							Merge branch 'develop' into personal  
						
						 
						
						
						
					 
					
						2017-03-01 22:40:28 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jack Darlington 
							
						 
					 
					
						
						
						
						
							
						
						
							78abf81b2f 
							
						 
					 
					
						
						
							
							Fix for editing metadata and uploading for GDrive  
						
						 
						
						
						
					 
					
						2017-03-01 22:38:03 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								OzzieIsaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							896dc04648 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'gitignore/cover-patch-20170301'  
						
						 
						
						
						
					 
					
						2017-03-01 18:10:14 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								OzzieIsaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							01a1f838f5 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'gitignore/kindlegen-patch-20170301'  
						
						 
						
						
						
					 
					
						2017-03-01 18:02:59 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								林檎 
							
						 
					 
					
						
						
						
						
							
						
						
							c439f5088c 
							
						 
					 
					
						
						
							
							ignore kindlegen in vendor folder  
						
						 
						
						
						
					 
					
						2017-03-01 17:42:56 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								林檎 
							
						 
					 
					
						
						
						
						
							
						
						
							583380e71a 
							
						 
					 
					
						
						
							
							path join bug  
						
						 
						
						... 
						
						
						
						, instead of + because get_main_dir is not endswith os.sep 
						
					 
					
						2017-03-01 17:20:58 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								林檎 
							
						 
					 
					
						
						
						
						
							
						
						
							9a2877ebd5 
							
						 
					 
					
						
						
							
							situation when opf file content is  
						
						 
						
						... 
						
						
						
						<meta name="cover" content="cover.jpg"/> 
						
					 
					
						2017-03-01 14:36:31 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								林檎 
							
						 
					 
					
						
						
						
						
							
						
						
							7972b987d4 
							
						 
					 
					
						
						
							
							Read img tag of cover file if cover is (x)html  
						
						 
						
						... 
						
						
						
						for example
‘<item id="cover" href="Text/cover.xhtml" media-type="application/xhtml+xml”/>’ 
						
					 
					
						2017-03-01 13:18:14 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jack Darlington 
							
						 
					 
					
						
						
						
						
							
						
						
							8745d65ff6 
							
						 
					 
					
						
						
							
							Merging ignorable columns  
						
						 
						
						
						
					 
					
						2017-02-28 23:53:32 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jack Darlington 
							
						 
					 
					
						
						
						
						
							
						
						
							141eb7901c 
							
						 
					 
					
						
						
							
							Add ignorable columns  
						
						 
						
						
						
					 
					
						2017-02-28 23:42:46 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jack Darlington 
							
						 
					 
					
						
						
						
						
							
						
						
							ee5870c6cf 
							
						 
					 
					
						
						
							
							Merge branch 'master' into develop  
						
						 
						
						
						
					 
					
						2017-02-28 22:19:44 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								idalin 
							
						 
					 
					
						
						
						
						
							
						
						
							338ca61cf9 
							
						 
					 
					
						
						
							
							fixed douban api not working in some cases  
						
						 
						
						
						
					 
					
						2017-02-28 15:17:37 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								idalin 
							
						 
					 
					
						
						
						
						
							
						
						
							f44574af67 
							
						 
					 
					
						
						
							
							update Chinese translation.  
						
						 
						
						
						
					 
					
						2017-02-28 15:05:14 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								idalin 
							
						 
					 
					
						
						
						
						
							
						
						
							54bc299e88 
							
						 
					 
					
						
						
							
							get metadata from douban and google while editing.  
						
						 
						
						
						
					 
					
						2017-02-28 14:58:11 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								idalin 
							
						 
					 
					
						
						
						
						
							
						
						
							67df150aba 
							
						 
					 
					
						
						
							
							Merge branch 'janeczku-master'  
						
						 
						
						
						
					 
					
						2017-02-28 14:54:43 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								idalin 
							
						 
					 
					
						
						
						
						
							
						
						
							e100702345 
							
						 
					 
					
						
						
							
							get metadata from douban and google while editing.  
						
						 
						
						
						
					 
					
						2017-02-28 14:52:55 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Radosław Kierznowski 
							
						 
					 
					
						
						
						
						
							
						
						
							9dfd30e6f3 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/master'  
						
						 
						
						... 
						
						
						
						# Conflicts:
#	cps/translations/pl/LC_MESSAGES/messages.mo
#	cps/translations/pl/LC_MESSAGES/messages.po 
						
					 
					
						2017-02-27 23:04:34 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Radosław Kierznowski 
							
						 
					 
					
						
						
						
						
							
						
						
							2f7fd1d957 
							
						 
					 
					
						
						
							
							Aktualizacja stanu tłumaczenia  
						
						 
						
						
						
					 
					
						2017-02-27 22:57:29 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Radosław Kierznowski 
							
						 
					 
					
						
						
						
						
							
						
						
							76c907484b 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'refs/remotes/janeczku/master'  
						
						 
						
						
						
					 
					
						2017-02-27 22:40:42 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								OzzieIsaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							90aa269e92 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'polish_translation/master'  
						
						 
						
						... 
						
						
						
						@radzio1993 : Thanks 
						
					 
					
						2017-02-27 21:15:36 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Radosław Kierznowski 
							
						 
					 
					
						
						
						
						
							
						
						
							36264e7400 
							
						 
					 
					
						
						
							
							Update polish translation (POT: 2017-02-20 19:47)  
						
						 
						
						
						
					 
					
						2017-02-27 20:48:46 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jack Darlington 
							
						 
					 
					
						
						
						
						
							
						
						
							d9c48a6203 
							
						 
					 
					
						
						
							
							Merge branch 'master' into develop  
						
						 
						
						... 
						
						
						
						# Conflicts:
#	cps/db.py
#	cps/web.py 
						
					 
					
						2017-02-26 19:49:49 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Radosław Kierznowski 
							
						 
					 
					
						
						
						
						
							
						
						
							9ec5303fdc 
							
						 
					 
					
						
						
							
							Update polish translation (POT: 2017-02-20 19:47)  
						
						 
						
						
						
					 
					
						2017-02-26 18:29:38 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Radosław Kierznowski 
							
						 
					 
					
						
						
						
						
							
						
						
							1a2aa10c00 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'refs/remotes/janeczku/master'  
						
						 
						
						
						
					 
					
						2017-02-26 17:52:32 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								OzzieIsaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							679effbaef 
							
						 
					 
					
						
						
							
							Bugfix placement of "recent downloads in "edit user section"  
						
						 
						
						
						
					 
					
						2017-02-25 13:34:33 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								OzzieIsaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							156a653c49 
							
						 
					 
					
						
						
							
							Make better usage of big screens in lists  
						
						 
						
						
						
					 
					
						2017-02-25 13:28:57 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								OzzieIsaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							00763d6e4c 
							
						 
					 
					
						
						
							
							Read book is now tied to the right downlolad books for guest users ( fixes   #110 )  
						
						 
						
						
						
					 
					
						2017-02-25 11:14:45 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								OzzieIsaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							1a83ad713c 
							
						 
					 
					
						
						
							
							Additional version info for sqlite database  
						
						 
						
						
						
					 
					
						2017-02-25 09:02:59 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							b876505f22 
							
						 
					 
					
						
						
							
							Delete doubtable.js  
						
						 
						
						
						
					 
					
						2017-02-25 06:15:00 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								OzzieIsaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							40c6ef3a18 
							
						 
					 
					
						
						
							
							More generic aproach for postion of epub coverfile ( #122 )  
						
						 
						
						
						
					 
					
						2017-02-24 20:20:41 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								idalin 
							
						 
					 
					
						
						
						
						
							
						
						
							4a2b5b46a3 
							
						 
					 
					
						
						
							
							merge  
						
						 
						
						
						
					 
					
						2017-02-24 14:36:10 +08:00