Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							2a63c35743 
							
						 
					 
					
						
						
							
							Activate serverside filepicker with parameter in unconfigured state  
						
						 
						
						
						
					 
					
						2020-12-27 11:27:15 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							27dcbcd7e1 
							
						 
					 
					
						
						
							
							paged and orderable shelfs  
						
						 
						
						... 
						
						
						
						Fix for non writable settings db with non configured calibre-web 
						
					 
					
						2020-12-27 10:24:51 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								OzzieIsaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							abf0f4d699 
							
						 
					 
					
						
						
							
							Updated Testresult  
						
						 
						
						... 
						
						
						
						Fixed delete book call 
						
					 
					
						2020-12-23 10:08:54 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							2bea447de5 
							
						 
					 
					
						
						
							
							Fix show archived books  
						
						 
						
						
						
					 
					
						2020-12-23 09:07:49 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							f6538b6110 
							
						 
					 
					
						
						
							
							New delete user button  
						
						 
						
						... 
						
						
						
						refactored confirm dialogs 
						
					 
					
						2020-12-21 19:50:12 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							2d3ae71a3d 
							
						 
					 
					
						
						
							
							Fixed button for email config ( Fix   #1766 )  
						
						 
						
						
						
					 
					
						2020-12-21 19:13:55 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							62da469fd1 
							
						 
					 
					
						
						
							
							Shelfs are now paginated (sorting buttons are disabled)  
						
						 
						
						... 
						
						
						
						Changed gevent dependencys 
						
					 
					
						2020-12-13 18:32:44 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							d64009e23e 
							
						 
					 
					
						
						
							
							preparation for filtered and ordered shelfs  
						
						 
						
						
						
					 
					
						2020-12-13 13:54:09 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							fd8b642d64 
							
						 
					 
					
						
						
							
							Code cosmetics css  
						
						 
						
						... 
						
						
						
						Code cosmetics js
Fixes for links with remote_login 
						
					 
					
						2020-12-13 09:53:18 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								OzzieIsaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							d5ed5cd665 
							
						 
					 
					
						
						
							
							Fixes from tests  
						
						 
						
						
						
					 
					
						2020-12-12 15:16:22 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							1905e0ee6f 
							
						 
					 
					
						
						
							
							refactoring to prevent web.py being the middle of the universe  
						
						 
						
						
						
					 
					
						2020-12-12 11:23:17 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							9130aceb5a 
							
						 
					 
					
						
						
							
							Changed admin page  
						
						 
						
						
						
					 
					
						2020-12-11 20:55:09 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							b8336c03c3 
							
						 
					 
					
						
						
							
							Changed admin page  
						
						 
						
						
						
					 
					
						2020-12-11 20:54:24 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							d3986ca14a 
							
						 
					 
					
						
						
							
							Server side file browser  
						
						 
						
						
						
					 
					
						2020-12-11 08:37:37 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							2508c1abb2 
							
						 
					 
					
						
						
							
							Started implement server side filechooser  
						
						 
						
						
						
					 
					
						2020-12-10 14:41:45 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							68513b775b 
							
						 
					 
					
						
						
							
							Wording  
						
						 
						
						
						
					 
					
						2020-12-03 16:20:31 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							a79dcc93f6 
							
						 
					 
					
						
						
							
							Fixed description for LDAP filter  
						
						 
						
						
						
					 
					
						2020-12-03 16:19:42 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							56505457eb 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'ldap_import/feat/ldap-import-user-identifier' into master  
						
						 
						
						... 
						
						
						
						# Conflicts:
#	cps/admin.py 
						
					 
					
						2020-12-03 16:01:15 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							8eb4b6288a 
							
						 
					 
					
						
						
							
							Added id's for testablility  
						
						 
						
						
						
					 
					
						2020-12-02 18:19:30 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							3372070a58 
							
						 
					 
					
						
						
							
							Fix change title regex  
						
						 
						
						... 
						
						
						
						Merge branch 'Develop' into master 
						
					 
					
						2020-12-02 11:09:55 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							f99e2ebd13 
							
						 
					 
					
						
						
							
							Changed wording for tooltips  
						
						 
						
						
						
					 
					
						2020-12-02 09:08:56 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							4feb26eefb 
							
						 
					 
					
						
						
							
							Added series order option ( #1715 )  
						
						 
						
						... 
						
						
						
						Added authors order option (#1301 )
Added tooltips for ordering options
Fixed ratings, formats, languages order option 
						
					 
					
						2020-12-01 14:51:25 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							cb1ebc1cd0 
							
						 
					 
					
						
						
							
							Drag 'n drop for files  
						
						 
						
						
						
					 
					
						2020-12-01 13:52:41 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							f620d4a9ca 
							
						 
					 
					
						
						
							
							Fix LDAP errors  
						
						 
						
						
						
					 
					
						2020-11-22 11:19:14 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							560ade00b4 
							
						 
					 
					
						
						
							
							Fix browser caching problem on change cover  
						
						 
						
						
						
					 
					
						2020-11-22 10:03:10 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							81ea24ad54 
							
						 
					 
					
						
						
							
							Merge branch 'master' into df  
						
						 
						
						
						
					 
					
						2020-11-22 09:34:11 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							eed2f0a430 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'comic/master' into master  
						
						 
						
						
						
					 
					
						2020-11-22 08:45:02 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							9bd51c650b 
							
						 
					 
					
						
						
							
							Add config options for client certificate authentication  
						
						 
						
						
						
					 
					
						2020-11-20 19:47:50 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							32b7b39223 
							
						 
					 
					
						
						
							
							Added function to download debug information  
						
						 
						
						
						
					 
					
						2020-11-15 14:25:27 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								verglor 
							
						 
					 
					
						
						
						
						
							
						
						
							2343c79126 
							
						 
					 
					
						
						
							
							Use djvu_html5 to read djvu format in browser  
						
						 
						
						
						
					 
					
						2020-11-15 13:19:37 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								verglor 
							
						 
					 
					
						
						
						
						
							
						
						
							50441bae62 
							
						 
					 
					
						
						
							
							Fix missing audio icon for other audio formats than mp3  
						
						 
						
						
						
					 
					
						2020-11-10 18:08:22 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							87d60308f2 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'caliblur/issue/caliblur-981' into master  
						
						 
						
						
						
					 
					
						2020-11-08 19:29:10 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							400f6e02a5 
							
						 
					 
					
						
						
							
							Fix   #1668  (upload of books with language set to different than UI language and not showing all books)  
						
						 
						
						... 
						
						
						
						Fix for only showing external port if kobo is really activated in admin menu 
						
					 
					
						2020-11-07 11:44:02 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								celogeek 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							4d81d3613c 
							
						 
					 
					
						
						
							
							display the check when books are read  
						
						 
						
						
						
					 
					
						2020-10-17 16:49:57 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								celogeek 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							097ac879ea 
							
						 
					 
					
						
						
							
							render read  
						
						 
						
						
						
					 
					
						2020-10-17 13:24:46 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								cbartondock 
							
						 
					 
					
						
						
						
						
							
						
						
							1be07a42df 
							
						 
					 
					
						
						
							
							Flex display to fix columns issue  
						
						 
						
						
						
					 
					
						2020-10-16 13:41:48 -04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ghighi Eftimie 
							
						 
					 
					
						
						
						
						
							
						
						
							cedfa90d76 
							
						 
					 
					
						
						
							
							fix for  #981  
						
						 
						
						
						
					 
					
						2020-10-10 17:51:46 +03:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ghighi Eftimie 
							
						 
					 
					
						
						
						
						
							
						
						
							f1e6f6e505 
							
						 
					 
					
						
						
							
							fixes for  #1560  
						
						 
						
						
						
					 
					
						2020-10-10 14:58:06 +03:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							52489a484a 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'Knepherbird/master' into master  
						
						 
						
						... 
						
						
						
						# Conflicts:
#	cps/jinjia.py
#	cps/templates/detail.html
#	cps/templates/discover.html
#	cps/templates/index.html
#	cps/web.py 
						
					 
					
						2020-10-10 12:47:49 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							e1d5c2c578 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'caliblur/issue/caliblur-1594' into master  
						
						 
						
						
						
					 
					
						2020-10-10 12:29:30 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							49f49632ad 
							
						 
					 
					
						
						
							
							Renamed CalibLur.css  
						
						 
						
						
						
					 
					
						2020-10-10 12:22:52 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ghighi Eftimie 
							
						 
					 
					
						
						
						
						
							
						
						
							6dadc6fb1e 
							
						 
					 
					
						
						
							
							same fix but hopefully better  
						
						 
						
						
						
					 
					
						2020-10-10 13:15:02 +03:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							6e6f144b7a 
							
						 
					 
					
						
						
							
							Paginated search and advanced search  
						
						 
						
						... 
						
						
						
						Wraparound on books list deactivated 
						
					 
					
						2020-10-04 19:23:06 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							eb37e3a52b 
							
						 
					 
					
						
						
							
							Fix UI Deelete Buttons in Edit Books page  
						
						 
						
						... 
						
						
						
						Fix Conversion of multiple formats of one book in the queue with gdrive 
						
					 
					
						2020-10-04 12:09:52 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								OzzieIsaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							376001100a 
							
						 
					 
					
						
						
							
							Bugfixes from last testrun  
						
						 
						
						
						
					 
					
						2020-09-28 21:24:47 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							6dfa171b4e 
							
						 
					 
					
						
						
							
							Added id's for testing  
						
						 
						
						... 
						
						
						
						moved downloaded books section 
						
					 
					
						2020-09-27 16:00:17 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							497fbdcdfc 
							
						 
					 
					
						
						
							
							Save view settings  
						
						 
						
						
						
					 
					
						2020-09-27 12:37:41 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							7c8f6ce62f 
							
						 
					 
					
						
						
							
							Merge branch 'master' into Develop  
						
						 
						
						... 
						
						
						
						# Conflicts:
#	cps/comic.py
#	cps/editbooks.py
#	cps/isoLanguages.py 
						
					 
					
						2020-09-26 07:54:38 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							da909ff084 
							
						 
					 
					
						
						
							
							Fixes from test of upload restrictions  
						
						 
						
						
						
					 
					
						2020-09-23 20:50:34 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							eff8480d5c 
							
						 
					 
					
						
						
							
							Show listen in browser formats in lowercase  
						
						 
						
						
						
					 
					
						2020-09-21 18:24:50 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							7ba014ba49 
							
						 
					 
					
						
						
							
							Fix "is not a valid language" on upload of comic books  
						
						 
						
						... 
						
						
						
						Fix metadata excration of comic books
updated bootstrap table
updated handling of upload formats restrictions 
						
					 
					
						2020-09-20 15:05:52 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								OzzieIsaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							7929711fea 
							
						 
					 
					
						
						
							
							Improvements for file uploading format restriction  
						
						 
						
						
						
					 
					
						2020-09-08 20:57:39 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							ae15544aed 
							
						 
					 
					
						
						
							
							Merge branch 'master' into database_fix  
						
						 
						
						... 
						
						
						
						# Conflicts:
#	cps/editbooks.py 
						
					 
					
						2020-09-07 18:21:33 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							4b7a37cf7d 
							
						 
					 
					
						
						
							
							Bugfix empty email attachment size  
						
						 
						
						
						
					 
					
						2020-09-07 18:19:54 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							d3bde0408f 
							
						 
					 
					
						
						
							
							Improvederror handling for editing identifier  
						
						 
						
						
						
					 
					
						2020-09-05 18:47:28 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							34d3225984 
							
						 
					 
					
						
						
							
							Errorhandling edit identifier  
						
						 
						
						
						
					 
					
						2020-09-05 18:46:11 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								blitzmann 
							
						 
					 
					
						
						
						
						
							
						
						
							c120138f26 
							
						 
					 
					
						
						
							
							Fixes for pagination ugliness for caliBlur! style  
						
						 
						
						
						
					 
					
						2020-08-29 20:58:30 -04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								OzzieIsaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							cdaad2fb4a 
							
						 
					 
					
						
						
							
							Merge branch 'master' into Develop  
						
						 
						
						
						
					 
					
						2020-08-23 21:23:00 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								OzzieIsaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							843279bacb 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'jef/jef/download-kobo' into master  
						
						 
						
						
						
					 
					
						2020-08-23 21:22:44 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								OzzieIsaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							a3ae97a5a3 
							
						 
					 
					
						
						
							
							Fix   #1574  (author name not shown in change book order in shelfs)  
						
						 
						
						
						
					 
					
						2020-08-22 15:37:40 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								OzzieIsaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							ed8275a20b 
							
						 
					 
					
						
						
							
							Fix   #1574  (author name not shown in change book order in shelfs)  
						
						 
						
						
						
					 
					
						2020-08-22 15:35:21 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								OzzieIsaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							f2add3f788 
							
						 
					 
					
						
						
							
							Migration of view settings working in User database  
						
						 
						
						... 
						
						
						
						Book Merge gives now feedback on what is done 
						
					 
					
						2020-08-22 10:27:09 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								OzzieIsaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							ad144922fb 
							
						 
					 
					
						
						
							
							Merge with master  
						
						 
						
						
						
					 
					
						2020-08-22 09:23:29 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								OzzieIsaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							0cc07362b8 
							
						 
					 
					
						
						
							
							Fix for  #1573  
						
						 
						
						
						
					 
					
						2020-08-21 19:26:58 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							94ad93ebd7 
							
						 
					 
					
						
						
							
							Added series like custom columns  #1501  
						
						 
						
						
						
					 
					
						2020-08-11 18:56:34 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							1a1d105fae 
							
						 
					 
					
						
						
							
							Fix   #1538  (Floating point numbers showing 2 decimals on details page  
						
						 
						
						
						
					 
					
						2020-07-23 19:31:48 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Clément Poissonnier 
							
						 
					 
					
						
						
						
						
							
						
						
							1ca4583896 
							
						 
					 
					
						
						
							
							feat(ldap): add a field that allows to override LDAP User Object Filter when a user is imported  
						
						 
						
						
						
					 
					
						2020-07-23 12:12:00 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							66acd1821d 
							
						 
					 
					
						
						
							
							Update Gdrive integration (Error Handling on Callback and wording)  
						
						 
						
						
						
					 
					
						2020-07-21 18:01:38 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jef LeCompte 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							711a697570 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'upstream/master' into jef/download-kobo  
						
						 
						
						
						
					 
					
						2020-07-13 01:50:38 -04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							f8139f3198 
							
						 
					 
					
						
						
							
							Store last selected view for sidebar (not for categories, series, publishers, ..)  
						
						 
						
						... 
						
						
						
						Started making search paged 
						
					 
					
						2020-07-11 12:09:34 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							f80c67828b 
							
						 
					 
					
						
						
							
							Fix   #1500  (Custom ratings of increment 0.5 are allowed)  
						
						 
						
						
						
					 
					
						2020-07-05 14:35:57 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							d1889a5e06 
							
						 
					 
					
						
						
							
							Fix   #1502  (program info only visible in about section if user is admin)  
						
						 
						
						
						
					 
					
						2020-07-05 14:00:40 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jef LeCompte 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							e048388213 
							
						 
					 
					
						
						
							
							feat(api): include external port option  
						
						 
						
						... 
						
						
						
						Signed-off-by: Jef LeCompte <jeffreylec@gmail.com> 
						
					 
					
						2020-07-03 12:58:58 -04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Michael Knepher 
							
						 
					 
					
						
						
						
						
							
						
						
							7e0d9fbace 
							
						 
					 
					
						
						
							
							series_index filter to show x.0 as x  
						
						 
						
						
						
					 
					
						2020-06-29 23:34:26 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							ccca5d4d1c 
							
						 
					 
					
						
						
							
							Merge branch 'master' into Develop  
						
						 
						
						... 
						
						
						
						# Conflicts:
#	cps/templates/layout.html 
						
					 
					
						2020-06-28 12:11:46 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							852f252d13 
							
						 
					 
					
						
						
							
							Prevent invalid variable  
						
						 
						
						... 
						
						
						
						Make text in kobo_auth_screen consistent 
						
					 
					
						2020-06-28 09:48:05 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Michael Knepher 
							
						 
					 
					
						
						
						
						
							
						
						
							67dd4a72b0 
							
						 
					 
					
						
						
							
							Add series info to all book "meta" displays  
						
						 
						
						
						
					 
					
						2020-06-26 12:26:36 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							a0b8cc21cc 
							
						 
					 
					
						
						
							
							Fix   #1503  (js error on login screen)  
						
						 
						
						
						
					 
					
						2020-06-23 15:07:14 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							2f833dc457 
							
						 
					 
					
						
						
							
							Fix login with remember me token  
						
						 
						
						
						
					 
					
						2020-06-20 13:46:12 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							22344a3971 
							
						 
					 
					
						
						
							
							Improvements for delete book  
						
						 
						
						
						
					 
					
						2020-06-18 20:39:45 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							8dde6ba60f 
							
						 
					 
					
						
						
							
							UI improvements table buttons  
						
						 
						
						
						
					 
					
						2020-06-12 21:40:09 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							d44f283a05 
							
						 
					 
					
						
						
							
							View status in books table is stored  
						
						 
						
						
						
					 
					
						2020-06-12 16:15:54 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							c18d5786dd 
							
						 
					 
					
						
						
							
							Improved validation check  
						
						 
						
						
						
					 
					
						2020-06-12 13:45:07 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							f26ccfe16c 
							
						 
					 
					
						
						
							
							Table edit: validator routine to prevent empty fields working  
						
						 
						
						
						
					 
					
						2020-06-11 21:36:12 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							1c681ee378 
							
						 
					 
					
						
						
							
							Improvements for books table editor  
						
						 
						
						
						
					 
					
						2020-06-11 21:19:09 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							94b5ec91cc 
							
						 
					 
					
						
						
							
							Title in table translatable  
						
						 
						
						... 
						
						
						
						Edit some elements in table possible
Checkbox state is kept over page change in book table
Fix missing div in layout 
						
					 
					
						2020-06-11 08:48:23 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							6bfbf3ee41 
							
						 
					 
					
						
						
							
							Update layout  
						
						 
						
						
						
					 
					
						2020-06-11 08:35:23 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							7b4306b1d6 
							
						 
					 
					
						
						
							
							UI improvements (same colors of buttons, etc.)  
						
						 
						
						... 
						
						
						
						Changed Editable default value 
						
					 
					
						2020-06-09 20:46:02 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							4516cc0d65 
							
						 
					 
					
						
						
							
							Listen button only visible if user has read permissions  
						
						 
						
						... 
						
						
						
						Audioformat fix
Table edit functions only available if user has edit rights 
						
					 
					
						2020-06-08 21:57:52 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							308784c601 
							
						 
					 
					
						
						
							
							Hide listen button if user has no read/listen permissions  
						
						 
						
						
						
					 
					
						2020-06-08 21:56:40 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							4038cb5b85 
							
						 
					 
					
						
						
							
							Internal paged Search prepared  
						
						 
						
						... 
						
						
						
						Search for table list is working 
						
					 
					
						2020-06-08 17:34:03 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							0dd0605a1f 
							
						 
					 
					
						
						
							
							Book list for merging  
						
						 
						
						
						
					 
					
						2020-06-06 21:21:10 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							827b0c6e50 
							
						 
					 
					
						
						
							
							Changed pubdate to timestamp  
						
						 
						
						
						
					 
					
						2020-06-06 09:52:35 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							13ae28edab 
							
						 
					 
					
						
						
							
							Fix   #1449  (Shelf download menu wasn't working for books with more than one format)  
						
						 
						
						
						
					 
					
						2020-06-04 20:34:31 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							82253219e8 
							
						 
					 
					
						
						
							
							Fix   #1449  (Shelf download menu wasn't working for books with more than one format)  
						
						 
						
						
						
					 
					
						2020-06-04 20:33:14 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							94592b74a6 
							
						 
					 
					
						
						
							
							Merge branch 'master' into Develop  
						
						 
						
						
						
					 
					
						2020-06-03 20:15:55 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							eef2112e1e 
							
						 
					 
					
						
						
							
							#1430  (changed color of rating stars)  
						
						 
						
						
						
					 
					
						2020-06-03 20:14:07 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							89223760e6 
							
						 
					 
					
						
						
							
							Merge branch 'master' into Develop  
						
						 
						
						
						
					 
					
						2020-06-01 10:58:49 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Michael Knepher 
							
						 
					 
					
						
						
						
						
							
						
						
							54cf3652b0 
							
						 
					 
					
						
						
							
							Add series name and index to book cover info  
						
						 
						
						
						
					 
					
						2020-05-27 21:57:59 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							fec86c2862 
							
						 
					 
					
						
						
							
							Update Grid/list view of series  
						
						 
						
						
						
					 
					
						2020-05-26 15:19:32 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							b852fb0e26 
							
						 
					 
					
						
						
							
							Merge branch 'Develop'  
						
						 
						
						
						
					 
					
						2020-05-25 21:30:21 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							0fc18bf3b1 
							
						 
					 
					
						
						
							
							Fix for  #1398  (prevent empty series_index field)  
						
						 
						
						
						
					 
					
						2020-05-25 19:34:31 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							ec3a3a73ef 
							
						 
					 
					
						
						
							
							Merge branch 'master' into Develop  
						
						 
						
						
						
					 
					
						2020-05-23 08:50:24 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							087c4c5929 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'opds/master'  
						
						 
						
						
						
					 
					
						2020-05-23 08:48:08 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							e0ee2e0801 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'typo/master'  
						
						 
						
						
						
					 
					
						2020-05-23 08:47:08 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Michael Knepher 
							
						 
					 
					
						
						
						
						
							
						
						
							c79a9e9858 
							
						 
					 
					
						
						
							
							Fix typo "Shelfs" to "Shelves"  
						
						 
						
						
						
					 
					
						2020-05-22 11:43:52 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								OzzieIsaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							b7535b9526 
							
						 
					 
					
						
						
							
							Merging master branch  
						
						 
						
						... 
						
						
						
						- fix title sort function
- fix focus on search 
						
					 
					
						2020-05-21 22:31:29 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							cc856c7cd1 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'search_focus/activate-search-focus-if-search-in-progress'  
						
						 
						
						
						
					 
					
						2020-05-21 19:18:02 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								celogeek 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							051ffdda35 
							
						 
					 
					
						
						
							
							activate search focus if search in progress  
						
						 
						
						
						
					 
					
						2020-05-21 16:42:02 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Braincoke 
							
						 
					 
					
						
						
						
						
							
						
						
							22fae51c9d 
							
						 
					 
					
						
						
							
							Fix XML parsing error when using OPDS feeds  
						
						 
						
						... 
						
						
						
						Using the OPDS feeds with MoonReader yielded the following error:
"Error parsing XML: unbound prefix".
This was due to a missing namespace in the feed.xml template.
See https://github.com/janeczku/calibre-web/issues/1403  for more
information. 
						
					 
					
						2020-05-18 20:07:02 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							38c28f4358 
							
						 
					 
					
						
						
							
							Merge branch 'master' into Develop  
						
						 
						
						... 
						
						
						
						# Conflicts:
#	cps/admin.py
#	cps/constants.py
#	cps/static/css/caliBlur.min.css
#	cps/uploader.py 
						
					 
					
						2020-05-17 16:22:58 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							742799b4ac 
							
						 
					 
					
						
						
							
							Added missing float custom column to search form  
						
						 
						
						
						
					 
					
						2020-05-17 16:10:10 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							273572f44c 
							
						 
					 
					
						
						
							
							Merge branch 'master' into Develop  
						
						 
						
						... 
						
						
						
						# Conflicts:
#	cps/ub.py 
						
					 
					
						2020-05-13 20:03:54 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							0cc2b49296 
							
						 
					 
					
						
						
							
							Merge branch 'master' into Develop  
						
						 
						
						... 
						
						
						
						# Conflicts:
#	cps/templates/book_edit.html 
						
					 
					
						2020-05-12 19:10:19 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							44d5adc16f 
							
						 
					 
					
						
						
							
							Fix   #1390  
						
						 
						
						
						
					 
					
						2020-05-12 19:08:51 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							f749fc641b 
							
						 
					 
					
						
						
							
							Temporary fix for  #1390  
						
						 
						
						
						
					 
					
						2020-05-12 17:42:24 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							87c76c09e2 
							
						 
					 
					
						
						
							
							temporary fix for  #1390  
						
						 
						
						
						
					 
					
						2020-05-12 17:41:49 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							e787f9dd9f 
							
						 
					 
					
						
						
							
							Automatic username ( #1172 )  
						
						 
						
						
						
					 
					
						2020-05-12 17:23:58 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							ec7d5b17ab 
							
						 
					 
					
						
						
							
							Added table view for books  
						
						 
						
						
						
					 
					
						2020-05-12 16:32:26 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							f7269d8df2 
							
						 
					 
					
						
						
							
							Fix for  #1385  (Private shelves are listed twice in the "Add to shelf" dropdown menu)  
						
						 
						
						
						
					 
					
						2020-05-12 14:39:13 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							ce0fab8d2f 
							
						 
					 
					
						
						
							
							Fix duplicate shelf names in "search"  
						
						 
						
						
						
					 
					
						2020-05-12 14:37:13 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							308fd55483 
							
						 
					 
					
						
						
							
							#1141  (Setting for file size limit on email)  
						
						 
						
						
						
					 
					
						2020-05-09 20:29:17 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							0a02caad04 
							
						 
					 
					
						
						
							
							Improvements  
						
						 
						
						
						
					 
					
						2020-05-09 11:01:00 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							a437c603c6 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'kepubify/Develop' into Develop  
						
						 
						
						... 
						
						
						
						# Conflicts:
#	cps/admin.py
#	cps/helper.py
#	cps/templates/config_edit.html
#	cps/web.py 
						
					 
					
						2020-05-08 14:53:21 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							48f4b12c0e 
							
						 
					 
					
						
						
							
							Merge branch 'master' into Develop  
						
						 
						
						... 
						
						
						
						# Conflicts:
#	cps/editbooks.py 
						
					 
					
						2020-05-06 18:47:33 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							e1439b529b 
							
						 
					 
					
						
						
							
							Config Options for limiting email size, change username to e-mail adress, use kepubify  
						
						 
						
						... 
						
						
						
						Added work on Unrar5 decompression (breaks comic reader totally) 
						
					 
					
						2020-05-04 18:19:30 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							0adcd1b3d9 
							
						 
					 
					
						
						
							
							UI Improvements  
						
						 
						
						... 
						
						
						
						Added additional restrictions to Calibre DB interface 
						
					 
					
						2020-05-03 10:55:33 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							0138ff9e16 
							
						 
					 
					
						
						
							
							Added additional config options  
						
						 
						
						
						
					 
					
						2020-05-02 10:18:01 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							9bc085a23e 
							
						 
					 
					
						
						
							
							Fixes for comic reader  
						
						 
						
						
						
					 
					
						2020-05-02 09:35:14 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							0a92d79ec0 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'cover-series/feature/add-cover-serie-view' into Develop  
						
						 
						
						... 
						
						
						
						# Conflicts:
#	cps/static/css/style.css
#	cps/ub.py
#	cps/web.py 
						
					 
					
						2020-05-01 17:25:13 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							d6f41d8dc0 
							
						 
					 
					
						
						
							
							Fix error 404 on reset password ( Fix   #1342 )  
						
						 
						
						
						
					 
					
						2020-05-01 08:33:50 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							b160a8de0b 
							
						 
					 
					
						
						
							
							Merge branch 'master' into Develop  
						
						 
						
						... 
						
						
						
						# Conflicts:
#	cps/__init__.py
#	cps/comic.py
#	cps/editbooks.py
#	cps/helper.py
#	cps/kobo.py
#	cps/translations/nl/LC_MESSAGES/messages.mo
#	cps/translations/nl/LC_MESSAGES/messages.po
#	cps/ub.py
#	cps/uploader.py
#	cps/web.py 
						
					 
					
						2020-04-30 18:08:28 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							01ff55c84e 
							
						 
					 
					
						
						
							
							Removed non working filters for search  
						
						 
						
						
						
					 
					
						2020-04-29 17:57:53 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							bea7223a0a 
							
						 
					 
					
						
						
							
							Renabled cbrimage extraction (via unrar and rarfile)  
						
						 
						
						
						
					 
					
						2020-04-28 16:50:08 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							44284ea5fb 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'opds/master'  
						
						 
						
						... 
						
						
						
						# Conflicts:
#	cps/translations/cs/LC_MESSAGES/messages.po
#	cps/translations/de/LC_MESSAGES/messages.po
#	cps/translations/es/LC_MESSAGES/messages.po
#	cps/translations/fi/LC_MESSAGES/messages.po
#	cps/translations/fr/LC_MESSAGES/messages.po
#	cps/translations/hu/LC_MESSAGES/messages.po
#	cps/translations/it/LC_MESSAGES/messages.po
#	cps/translations/ja/LC_MESSAGES/messages.po
#	cps/translations/km/LC_MESSAGES/messages.po
#	cps/translations/nl/LC_MESSAGES/messages.po
#	cps/translations/pl/LC_MESSAGES/messages.po
#	cps/translations/ru/LC_MESSAGES/messages.po
#	cps/translations/sv/LC_MESSAGES/messages.po
#	cps/translations/uk/LC_MESSAGES/messages.po
#	cps/translations/zh_Hans_CN/LC_MESSAGES/messages.po
#	messages.pot 
						
					 
					
						2020-04-26 18:55:23 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							87ec44aed5 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'improve_reaad/keep-focus-on-search-input'  
						
						 
						
						
						
					 
					
						2020-04-26 18:38:09 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							dc46ad16ae 
							
						 
					 
					
						
						
							
							Bugfix view shelfs on book detail page  
						
						 
						
						
						
					 
					
						2020-04-26 11:35:47 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							456550a943 
							
						 
					 
					
						
						
							
							Bugfix view shelfs on detiled page  
						
						 
						
						... 
						
						
						
						bugfix datetime in archive mode 
						
					 
					
						2020-04-26 11:34:10 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							b4d7733e0a 
							
						 
					 
					
						
						
							
							Merge branch 'master' into Develop  
						
						 
						
						... 
						
						
						
						# Conflicts:
#	cps/templates/list.html
#	cps/translations/cs/LC_MESSAGES/messages.po
#	cps/translations/de/LC_MESSAGES/messages.po
#	cps/translations/es/LC_MESSAGES/messages.po
#	cps/translations/fi/LC_MESSAGES/messages.po
#	cps/translations/fr/LC_MESSAGES/messages.po
#	cps/translations/hu/LC_MESSAGES/messages.po
#	cps/translations/it/LC_MESSAGES/messages.po
#	cps/translations/ja/LC_MESSAGES/messages.po
#	cps/translations/km/LC_MESSAGES/messages.po
#	cps/translations/nl/LC_MESSAGES/messages.po
#	cps/translations/pl/LC_MESSAGES/messages.po
#	cps/translations/ru/LC_MESSAGES/messages.po
#	cps/translations/sv/LC_MESSAGES/messages.po
#	cps/translations/uk/LC_MESSAGES/messages.po
#	cps/translations/zh_Hans_CN/LC_MESSAGES/messages.po
#	messages.pot 
						
					 
					
						2020-04-25 20:06:25 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							e29f17ac46 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'kobo/shelves' into Develop  
						
						 
						
						... 
						
						
						
						# Conflicts:
#	cps/kobo.py
#	cps/shelf.py 
						
					 
					
						2020-04-24 16:56:08 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							24c743d23d 
							
						 
					 
					
						
						
							
							Code cosmetics  
						
						 
						
						
						
					 
					
						2020-04-19 19:08:58 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								celogeek 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							d093fbb069 
							
						 
					 
					
						
						
							
							Keep previous search value and focus  
						
						 
						
						
						
					 
					
						2020-04-19 13:12:02 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								pthiben 
							
						 
					 
					
						
						
						
						
							
						
						
							a5fe08e84c 
							
						 
					 
					
						
						
							
							Fix button color that now matches HEAD on master  
						
						 
						
						... 
						
						
						
						Update name for HTML Series that changed with HEAD 
						
					 
					
						2020-04-18 23:32:15 -04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								pthiben 
							
						 
					 
					
						
						
						
						
							
						
						
							ea7058e896 
							
						 
					 
					
						
						
							
							Update button lables: it seems strange to click on 'Grid' to get the list view and vice versa  
						
						 
						
						
						
					 
					
						2020-04-18 23:23:56 -04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								pthiben 
							
						 
					 
					
						
						
						
						
							
						
						
							2d66da3cb9 
							
						 
					 
					
						
						
							
							restrict button for grid<->list switch to series lists  
						
						 
						
						
						
					 
					
						2020-04-18 23:23:56 -04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								pthiben 
							
						 
					 
					
						
						
						
						
							
						
						
							b7efbf9040 
							
						 
					 
					
						
						
							
							resynced grid view with list view  
						
						 
						
						... 
						
						
						
						Changed drop-down menu to button, with same style as the other buttons. I'll probably have to make a last sync with master for final approval 
						
					 
					
						2020-04-18 23:23:56 -04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								pthiben 
							
						 
					 
					
						
						
						
						
							
						
						
							1e3a948977 
							
						 
					 
					
						
						
							
							fix linter errors  
						
						 
						
						... 
						
						
						
						Fix the sorting
Save the sorting state
Remove unnecessary filter
Add support for grid view 
						
					 
					
						2020-04-18 23:22:51 -04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							902685a197 
							
						 
					 
					
						
						
							
							Fix text in user config section (random books in Detail View)  
						
						 
						
						
						
					 
					
						2020-04-18 21:30:28 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							c04b146486 
							
						 
					 
					
						
						
							
							Fix   #1309  (fix duplicate shelf names in book detail view)  
						
						 
						
						
						
					 
					
						2020-04-18 21:15:02 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							7bb5afa585 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'kobo/shelves' into Develop  
						
						 
						
						
						
					 
					
						2020-04-18 21:12:21 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							195845ab0c 
							
						 
					 
					
						
						
							
							Fix  
						
						 
						
						
						
					 
					
						2020-04-17 18:17:35 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							81a329f1e7 
							
						 
					 
					
						
						
							
							Fix for  #1087  ( Caliblur! Theme button alignment)  
						
						 
						
						
						
					 
					
						2020-04-17 18:16:28 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							9e159ed5ab 
							
						 
					 
					
						
						
							
							Merge branch 'master' into Develop  
						
						 
						
						... 
						
						
						
						# Conflicts:
#	cps/config_sql.py
#	cps/ub.py
#	cps/web.py 
						
					 
					
						2020-04-16 20:12:27 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							2c42972230 
							
						 
					 
					
						
						
							
							Fix for  #1307  (Oauth login not working)  
						
						 
						
						... 
						
						
						
						- Changed blueprint reference in Backend from name to id, users can now again be found
- Depending on version of flask-dance the resultcode of authorized is set different to prevent redirect loop with newer versions(>1.3)
- Redirect to login page in case no user is linked to current oauth account
- Flash messages upon successfull login, successsfull linked account 
						
					 
					
						2020-04-16 17:58:42 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							a784c6bd52 
							
						 
					 
					
						
						
							
							Fixes for oauth login after programming basic tests  
						
						 
						
						
						
					 
					
						2020-04-15 22:03:21 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							4749eccfa5 
							
						 
					 
					
						
						
							
							Added fix for python2 regex  
						
						 
						
						... 
						
						
						
						Fix for python2 attributeError instead of TypeError on login with wrong openLDAP setting
Added default empty string on LDAPCertificate
Fix ldap as scheme for tls connection
Enabled add user on LDAP Authentication
LDAP config port is now number input
Added header for user import config
Added python ldap version to about section
Fix: It's no longer possible to login via fallback password as long as LDAP server is available
Fix: TypeError on bind is now catched and transformed to error message
Update Readme
Fixes for ldap 
						
					 
					
						2020-04-14 10:58:32 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								xcffl 
							
						 
					 
					
						
						
						
						
							
						
						
							70c9dd1b95 
							
						 
					 
					
						
						
							
							Fix opds format errors & extend info  
						
						 
						
						
						
					 
					
						2020-04-11 00:06:50 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							a194216568 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/master'  
						
						 
						
						
						
					 
					
						2020-04-05 19:10:27 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							8bee424cc0 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'ldap/master'  
						
						 
						
						... 
						
						
						
						# Conflicts:
#	cps/admin.py
#	cps/templates/admin.html
#	cps/templates/config_edit.html
#	cps/web.py 
						
					 
					
						2020-04-05 17:31:41 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							5864637f1c 
							
						 
					 
					
						
						
							
							Merge branch 'master' into Develop  
						
						 
						
						
						
					 
					
						2020-04-04 06:22:17 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							e99f5bcced 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'english/master'  
						
						 
						
						
						
					 
					
						2020-04-03 19:46:26 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							4550333f1e 
							
						 
					 
					
						
						
							
							Added redirect after create shelf  
						
						 
						
						
						
					 
					
						2020-04-02 20:19:05 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							bab14a1fbf 
							
						 
					 
					
						
						
							
							Update shelfs handling, bugfix changed updater  
						
						 
						
						
						
					 
					
						2020-04-02 18:23:24 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							f6c04b9b84 
							
						 
					 
					
						
						
							
							Merge branch 'master' into Develop  
						
						 
						
						
						
					 
					
						2020-03-29 16:48:56 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Josh O'Brien 
							
						 
					 
					
						
						
						
						
							
						
						
							c870f6e87d 
							
						 
					 
					
						
						
							
							English Language V2  
						
						 
						
						
						
					 
					
						2020-03-19 13:10:10 +11:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							09e7d76c6f 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'kobo_book_delete' into Develop  
						
						 
						
						... 
						
						
						
						# Conflicts:
#	cps/kobo.py
#	cps/services/SyncToken.py
#	cps/templates/book_edit.html
#	cps/ub.py 
						
					 
					
						2020-03-12 20:43:39 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							8cbc345f36 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'identifier/develop/edit_identifiers' into Develop  
						
						 
						
						
						
					 
					
						2020-03-07 13:35:58 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							89927fd7e9 
							
						 
					 
					
						
						
							
							Merge ComicVine API  
						
						 
						
						
						
					 
					
						2020-03-07 13:33:35 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							18794831e0 
							
						 
					 
					
						
						
							
							Chang link to issue template  
						
						 
						
						
						
					 
					
						2020-03-07 11:27:50 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							d267338837 
							
						 
					 
					
						
						
							
							Fixes for Kobo sync  
						
						 
						
						... 
						
						
						
						Better output on upload cover
Fix for download after access to opds/fileformat
Fix osd search link
Added ratings to opds feed
Change for kobo sync for testing 
						
					 
					
						2020-03-07 11:07:43 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							fb83bfb363 
							
						 
					 
					
						
						
							
							Fix for  #1223  (pdf-reader isn't working on chrome, IE, Edge)  
						
						 
						
						
						
					 
					
						2020-02-29 09:55:54 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							df7d3d18b6 
							
						 
					 
					
						
						
							
							pdf reader  
						
						 
						
						
						
					 
					
						2020-02-29 08:33:09 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Wanoo 
							
						 
					 
					
						
						
						
						
							
						
						
							a0535aa3db 
							
						 
					 
					
						
						
							
							Add ComicVine Api  
						
						 
						
						... 
						
						
						
						Fetching Metadata for comicBook with ComicVine API 
						
					 
					
						2020-02-28 16:04:07 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							917132fe26 
							
						 
					 
					
						
						
							
							Update Translation (german and russian)  
						
						 
						
						... 
						
						
						
						Merge remote-tracking branch 'it/patch-8'
# Conflicts:
#	cps/translations/it/LC_MESSAGES/messages.po 
						
					 
					
						2020-02-24 19:38:12 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							fc4436f091 
							
						 
					 
					
						
						
							
							Update Translation  
						
						 
						
						
						
					 
					
						2020-02-23 20:07:21 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							9fc0c3b3de 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'English_texts/master'  
						
						 
						
						... 
						
						
						
						# Conflicts:
#	cps/templates/config_edit.html
#	cps/templates/config_view_edit.html
#	cps/templates/layout.html
#	cps/templates/search_form.html
#	cps/templates/user_edit.html 
						
					 
					
						2020-02-23 13:27:44 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							6893635251 
							
						 
					 
					
						
						
							
							Handle kobo auth request  
						
						 
						
						... 
						
						
						
						Handle access from localhost for kobo 
						
					 
					
						2020-02-18 20:36:32 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Michael Shavit 
							
						 
					 
					
						
						
						
						
							
						
						
							7d99e21d0d 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'original/Develop' into kobo_book_delete  
						
						 
						
						
						
					 
					
						2020-02-17 14:49:42 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							ba6b5f8fd1 
							
						 
					 
					
						
						
							
							Merge branch 'master' into Develop  
						
						 
						
						
						
					 
					
						2020-02-17 18:42:53 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Josh O'Brien 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							8f518993a4 
							
						 
					 
					
						
						
							
							Merge branch 'master' into master  
						
						 
						
						
						
					 
					
						2020-02-18 00:21:59 +11:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							16cd57fe55 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'cover_layout/fix-pull-left-cover-layout'  
						
						 
						
						
						
					 
					
						2020-02-16 19:19:10 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							e3ddc16657 
							
						 
					 
					
						
						
							
							Fix opds login not working anymore (due to kobo sync protocol)  
						
						 
						
						
						
					 
					
						2020-02-16 14:25:15 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							317e59df4b 
							
						 
					 
					
						
						
							
							Bugfixes from tests  
						
						 
						
						
						
					 
					
						2020-02-15 16:02:31 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							a9a6f5b97e 
							
						 
					 
					
						
						
							
							Renamed restrict -> deny  
						
						 
						
						
						
					 
					
						2020-02-15 10:21:45 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							8b1444ebc2 
							
						 
					 
					
						
						
							
							Improved testability  
						
						 
						
						... 
						
						
						
						Less content exposed with restricted content
Tornado restart and stop working with systemd 
						
					 
					
						2020-02-15 09:08:39 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kyos 
							
						 
					 
					
						
						
						
						
							
						
						
							509071949a 
							
						 
					 
					
						
						
							
							Moved style to css file  
						
						 
						
						
						
					 
					
						2020-02-13 21:05:24 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							726595e117 
							
						 
					 
					
						
						
							
							Update for testability  
						
						 
						
						
						
					 
					
						2020-02-10 18:34:10 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kyos 
							
						 
					 
					
						
						
						
						
							
						
						
							1666e32aaf 
							
						 
					 
					
						
						
							
							Fixes cover layouts in user edit page  
						
						 
						
						
						
					 
					
						2020-02-09 22:31:08 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kyos 
							
						 
					 
					
						
						
						
						
							
						
						
							6a69bbe4b5 
							
						 
					 
					
						
						
							
							Fixes cover layouts in user edit page  
						
						 
						
						
						
					 
					
						2020-02-09 22:20:52 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							814ad87a42 
							
						 
					 
					
						
						
							
							Updated pdf viewer to 2.2.228 ( #1184 )  
						
						 
						
						
						
					 
					
						2020-02-09 17:02:47 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							3e4b5e23fa 
							
						 
					 
					
						
						
							
							Updated pdf viewer to 2.2.228 ( #1184 )  
						
						 
						
						
						
					 
					
						2020-02-09 17:02:28 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							ab24ed8088 
							
						 
					 
					
						
						
							
							Handle sorting of hidden books  #1123  
						
						 
						
						... 
						
						
						
						Prevent downloading of covers from hidden books 
						
					 
					
						2020-02-09 14:31:42 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							50ba2e329a 
							
						 
					 
					
						
						
							
							Merge branch 'master' into Develop  
						
						 
						
						... 
						
						
						
						# Conflicts:
#	cps/shelf.py 
						
					 
					
						2020-02-09 07:00:04 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							6698773d81 
							
						 
					 
					
						
						
							
							Improved testability  
						
						 
						
						
						
					 
					
						2020-02-08 11:33:31 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Josh O'Brien 
							
						 
					 
					
						
						
						
						
							
						
						
							9b49125776 
							
						 
					 
					
						
						
							
							English Language Updates  
						
						 
						
						... 
						
						
						
						Changes to provide consistency for English language. 
						
					 
					
						2020-02-03 14:22:00 +11:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							e44494aad0 
							
						 
					 
					
						
						
							
							Kobo sync enable/disable working  
						
						 
						
						
						
					 
					
						2020-01-27 20:32:37 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Michael Shavit 
							
						 
					 
					
						
						
						
						
							
						
						
							f9dbc6bc78 
							
						 
					 
					
						
						
							
							Clean-up book from ArchivedBook on hard-delete.  
						
						 
						
						... 
						
						
						
						This change also adds a warning to the hard-delete prompt that deleted
books should first be archived if the Kobo Sync feature is enabled.
An alternative would be to keep a permanent record of hard-deleted
book. 
						
					 
					
						2020-01-26 16:20:10 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Michael Shavit 
							
						 
					 
					
						
						
						
						
							
						
						
							9804a98af8 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'original/Develop' into kobo_book_delete  
						
						 
						
						
						
					 
					
						2020-01-26 15:58:57 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							2eec329bdf 
							
						 
					 
					
						
						
							
							Merge branch 'master' into Develop  
						
						 
						
						... 
						
						
						
						# Conflicts:
#	cps/templates/user_edit.html
#	optional-requirements.txt 
						
					 
					
						2020-01-26 19:29:36 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							0411d4a8c9 
							
						 
					 
					
						
						
							
							Added 2 new kobo settings: Enable Kobo Sync (currently not working) and proxy Requests to Kobo  
						
						 
						
						... 
						
						
						
						Added fix for kobo reader generating requests without right port number, causing url_for not working correct 
						
					 
					
						2020-01-26 16:52:40 +01:00