OzzieIsaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							77c4da0f07 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'button_padding/tinymce'  
						
						 
						
						
						
					 
					
						2017-07-08 11:03:21 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								OzzieIsaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							4f08608d75 
							
						 
					 
					
						
						
							
							Move download button to top of detail page ( #174 )  
						
						 
						
						
						
					 
					
						2017-07-08 11:01:40 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								OzzieIsaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							b876a03f26 
							
						 
					 
					
						
						
							
							- Changed link color on download button to white  
						
						 
						
						... 
						
						
						
						- removed file icons on download button
- removed shadow style on download button 
						
					 
					
						2017-07-08 10:57:40 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								OzzieIsaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							6b71e77436 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'Download/feature/download-icon-20170410'  
						
						 
						
						
						
					 
					
						2017-07-08 09:35:09 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jonathan Rehm 
							
						 
					 
					
						
						
						
						
							
						
						
							7853cb2602 
							
						 
					 
					
						
						
							
							Add TinyMCE to provide rich-text editing for descriptions  
						
						 
						
						
						
					 
					
						2017-06-22 08:59:28 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								OzzieIsaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							7ab8a5877b 
							
						 
					 
					
						
						
							
							read PDF/TXT without temporary files ( #197 )  
						
						 
						
						
						
					 
					
						2017-05-25 08:46:33 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								OzzieIsaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							1366b36c32 
							
						 
					 
					
						
						
							
							Added integer-field to supported custom colums  
						
						 
						
						
						
					 
					
						2017-05-25 08:20:19 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								nanu-c 
							
						 
					 
					
						
						
						
						
							
						
						
							26f314d371 
							
						 
					 
					
						
						
							
							support int custom fields  
						
						 
						
						
						
					 
					
						2017-05-22 22:54:53 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								OzzieIsaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							2b50dea304 
							
						 
					 
					
						
						
							
							Updated pdf.js to 1.7.225 (Fix   #193 )  
						
						 
						
						
						
					 
					
						2017-05-13 14:01:52 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								林檎 
							
						 
					 
					
						
						
						
						
							
						
						
							45eeb6588a 
							
						 
					 
					
						
						
							
							Change Download Style.  
						
						 
						
						
						
					 
					
						2017-04-26 17:14:18 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							ede8ae6742 
							
						 
					 
					
						
						
							
							Fix   #182 ,  #176  
						
						 
						
						
						
					 
					
						2017-04-21 20:44:17 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								OzzieIsaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							cd0d450829 
							
						 
					 
					
						
						
							
							Allow deleting books ( fixes   #119 )  
						
						 
						
						
						
					 
					
						2017-04-14 20:29:11 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								OzzieIsaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							7c6d527a55 
							
						 
					 
					
						
						
							
							Code cosmetics  
						
						 
						
						
						
					 
					
						2017-04-02 10:05:07 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								OzzieIsaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							986f40b80a 
							
						 
					 
					
						
						
							
							Code cosmetics  
						
						 
						
						
						
					 
					
						2017-03-30 21:17:18 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								OzzieIsaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							cbc807f3ff 
							
						 
					 
					
						
						
							
							Fix   #138  
						
						 
						
						
						
					 
					
						2017-03-19 20:29:35 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								OzzieIsaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							60f3fefaec 
							
						 
					 
					
						
						
							
							Added Read/Unread to feed  
						
						 
						
						... 
						
						
						
						Prevent books from getting multiple times added to shelf
Updated German Translation 
						
					 
					
						2017-03-19 19:22:45 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								OzzieIsaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							33427d7610 
							
						 
					 
					
						
						
							
							Bugfix opds feed for lists  
						
						 
						
						
						
					 
					
						2017-03-19 17:32:49 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								OzzieIsaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							0e0e72fb71 
							
						 
					 
					
						
						
							
							Fixes for gevent/gdrive  
						
						 
						
						
						
					 
					
						2017-03-19 17:14:16 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jack Darlington 
							
						 
					 
					
						
						
						
						
							
						
						
							06a4af44cc 
							
						 
					 
					
						
						
							
							Merge branch 'master' into develop  
						
						 
						
						... 
						
						
						
						# Conflicts:
#	cps/web.py 
						
					 
					
						2017-03-16 21:02:11 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								OzzieIsaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							a87fab8774 
							
						 
					 
					
						
						
							
							- Smaller cover picturees on small devices  
						
						 
						
						... 
						
						
						
						- filename for download with underscore 
						
					 
					
						2017-03-14 19:48:17 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jack Darlington 
							
						 
					 
					
						
						
						
						
							
						
						
							ff89d9c20d 
							
						 
					 
					
						
						
							
							Merge branch 'master' into develop  
						
						 
						
						
						
					 
					
						2017-03-13 14:56:51 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jack Darlington 
							
						 
					 
					
						
						
						
						
							
						
						
							7d31abf920 
							
						 
					 
					
						
						
							
							added jquery.form.js to project locally  
						
						 
						
						
						
					 
					
						2017-03-12 21:20:09 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jack Darlington 
							
						 
					 
					
						
						
						
						
							
						
						
							537977e497 
							
						 
					 
					
						
						
							
							Changed “have read” to checkbox  
						
						 
						
						
						
					 
					
						2017-03-12 21:13:14 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jack Darlington 
							
						 
					 
					
						
						
						
						
							
						
						
							8f2088a3ea 
							
						 
					 
					
						
						
							
							Updated use google drive checkbox  
						
						 
						
						
						
					 
					
						2017-03-12 21:03:01 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jack Darlington 
							
						 
					 
					
						
						
						
						
							
						
						
							5a2e77baaf 
							
						 
					 
					
						
						
							
							fix for form input ID  
						
						 
						
						
						
					 
					
						2017-03-12 20:52:56 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								OzzieIsaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							74a3e6842a 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'kennyl/travis'  
						
						 
						
						... 
						
						
						
						# Conflicts:
#	cps/web.py 
						
					 
					
						2017-03-12 21:13:25 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								OzzieIsaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							16cac6ac4f 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'polish_update/master'  
						
						 
						
						... 
						
						
						
						# Conflicts:
#	cps/translations/pl/LC_MESSAGES/messages.mo
#	cps/translations/pl/LC_MESSAGES/messages.po
Fix for #147  
						
					 
					
						2017-03-12 19:12:17 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								林檎 
							
						 
					 
					
						
						
						
						
							
						
						
							2ef4933f7a 
							
						 
					 
					
						
						
							
							Merge branch 'feature/download-suffix-20170309' into travis  
						
						 
						
						... 
						
						
						
						# Conflicts:
#	cps/templates/detail.html 
						
					 
					
						2017-03-09 12:38:55 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								林檎 
							
						 
					 
					
						
						
						
						
							
						
						
							045419e880 
							
						 
					 
					
						
						
							
							Fix   #146  
						
						 
						
						... 
						
						
						
						For WebUI only
OPDS remains previous behaviour 
						
					 
					
						2017-03-09 12:32:10 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								林檎 
							
						 
					 
					
						
						
						
						
							
						
						
							a766784ef1 
							
						 
					 
					
						
						
							
							Merge branch 'feature/download-suffix-20170308' into travis  
						
						 
						
						
						
					 
					
						2017-03-09 12:19:46 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								林檎 
							
						 
					 
					
						
						
						
						
							
						
						
							7bae79d826 
							
						 
					 
					
						
						
							
							fix conflict  
						
						 
						
						
						
					 
					
						2017-03-08 23:56:20 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								林檎 
							
						 
					 
					
						
						
						
						
							
						
						
							8c625dfb93 
							
						 
					 
					
						
						
							
							Fix   #146  
						
						 
						
						... 
						
						
						
						For WebUI only
OPDS remains previous behaviour 
						
					 
					
						2017-03-08 13:56:13 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jack Darlington 
							
						 
					 
					
						
						
						
						
							
						
						
							cf1ca21bbc 
							
						 
					 
					
						
						
							
							Merge branch 'master' into develop  
						
						 
						
						... 
						
						
						
						# Conflicts:
#	cps/db.py
#	cps/ub.py
#	cps/web.py
#	readme.md
#	requirements.txt 
						
					 
					
						2017-03-07 22:03:10 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								OzzieIsaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							c725afc3a8 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'JackED42/feature/ignorable_columns'  
						
						 
						
						
						
					 
					
						2017-03-07 20:36:43 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								OzzieIsaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							38c782fcf1 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'Douban/prod'  
						
						 
						
						... 
						
						
						
						# Conflicts:
#	cps/templates/book_edit.html 
						
					 
					
						2017-03-07 20:30:55 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								OzzieIsaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							edadf84710 
							
						 
					 
					
						
						
							
							Added editing star rating graphically  
						
						 
						
						... 
						
						
						
						Added ability to reload database connection (refresh problem)
Bugfix display hot books (no hot books, hot books are deleted books, no longer result in error 500) 
						
					 
					
						2017-03-07 19:10:17 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								idalin 
							
						 
					 
					
						
						
						
						
							
						
						
							a6b2977286 
							
						 
					 
					
						
						
							
							add i18n message for getmeta feature.  
						
						 
						
						
						
					 
					
						2017-03-07 09:46:09 +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 
							
						 
					 
					
						
						
						
						
							
						
						
							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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								idalin 
							
						 
					 
					
						
						
						
						
							
						
						
							54bc299e88 
							
						 
					 
					
						
						
							
							get metadata from douban and google while editing.  
						
						 
						
						
						
					 
					
						2017-02-28 14:58:11 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								idalin 
							
						 
					 
					
						
						
						
						
							
						
						
							e100702345 
							
						 
					 
					
						
						
							
							get metadata from douban and google while editing.  
						
						 
						
						
						
					 
					
						2017-02-28 14:52:55 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jack Darlington 
							
						 
					 
					
						
						
						
						
							
						
						
							d9c48a6203 
							
						 
					 
					
						
						
							
							Merge branch 'master' into develop  
						
						 
						
						... 
						
						
						
						# Conflicts:
#	cps/db.py
#	cps/web.py 
						
					 
					
						2017-02-26 19:49:49 +00: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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								OzzieIsaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							40c6ef3a18 
							
						 
					 
					
						
						
							
							More generic aproach for postion of epub coverfile ( #122 )  
						
						 
						
						
						
					 
					
						2017-02-24 20:20:41 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								OzzieIsaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							41a20fe3e1 
							
						 
					 
					
						
						
							
							Added version info of dependencys in about section  
						
						 
						
						
						
					 
					
						2017-02-23 19:58:56 +01:00