Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							ff88e68904 
							
						 
					 
					
						
						
							
							Add missing locale files  
						
						 
						
						
						
					 
					
						2020-10-31 19:58:22 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							37a80b935d 
							
						 
					 
					
						
						
							
							Added greek translation  
						
						 
						
						
						
					 
					
						2020-10-31 19:20:00 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								celogeek 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							754b9832e9 
							
						 
					 
					
						
						
							
							fix height container  
						
						 
						
						
						
					 
					
						2020-10-17 13:30:19 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								celogeek 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							097ac879ea 
							
						 
					 
					
						
						
							
							render read  
						
						 
						
						
						
					 
					
						2020-10-17 13:24:46 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								cbartondock 
							
						 
					 
					
						
						
						
						
							
						
						
							da9dfd166d 
							
						 
					 
					
						
						
							
							fixed incorrect cover widths  
						
						 
						
						
						
					 
					
						2020-10-16 13:51:48 -04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								cbartondock 
							
						 
					 
					
						
						
						
						
							
						
						
							1be07a42df 
							
						 
					 
					
						
						
							
							Flex display to fix columns issue  
						
						 
						
						
						
					 
					
						2020-10-16 13:41:48 -04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ghighi 
							
						 
					 
					
						
						
						
						
							
						
						
							2ff286b672 
							
						 
					 
					
						
						
							
							natural solution, pagination is changing on new page  
						
						 
						
						
						
					 
					
						2020-10-16 00:43:57 +03:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ghighi Eftimie 
							
						 
					 
					
						
						
						
						
							
						
						
							9adcfa99f4 
							
						 
					 
					
						
						
							
							trigger infinite scroll script only on templates where .load-more class is present  
						
						 
						
						
						
					 
					
						2020-10-11 22:35:56 +03:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ghighi Eftimie 
							
						 
					 
					
						
						
						
						
							
						
						
							e723aaa5f6 
							
						 
					 
					
						
						
							
							fix for history state (+1 not needed)  
						
						 
						
						
						
					 
					
						2020-10-11 21:56:49 +03:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ghighi Eftimie 
							
						 
					 
					
						
						
						
						
							
						
						
							f574f8faf0 
							
						 
					 
					
						
						
							
							better js check  
						
						 
						
						
						
					 
					
						2020-10-10 18:34:55 +03: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 
							
						 
					 
					
						
						
						
						
							
						
						
							a58a2f5fe4 
							
						 
					 
					
						
						
							
							Added missing file for tr locale of datepicker  
						
						 
						
						
						
					 
					
						2020-10-10 11:53:15 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ghighi Eftimie 
							
						 
					 
					
						
						
						
						
							
						
						
							c33c6bbff0 
							
						 
					 
					
						
						
							
							fix for  #1594  
						
						 
						
						
						
					 
					
						2020-10-10 12:39:52 +03:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							20ffa325d3 
							
						 
					 
					
						
						
							
							Fix   #1642  
						
						 
						
						
						
					 
					
						2020-10-10 10:53:08 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							6e6f144b7a 
							
						 
					 
					
						
						
							
							Paginated search and advanced search  
						
						 
						
						... 
						
						
						
						Wraparound on books list deactivated 
						
					 
					
						2020-10-04 19:23:06 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							cc0b0196f4 
							
						 
					 
					
						
						
							
							Store UI settings in flask session for guest user  
						
						 
						
						
						
					 
					
						2020-09-27 19:12:10 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							497fbdcdfc 
							
						 
					 
					
						
						
							
							Save view settings  
						
						 
						
						
						
					 
					
						2020-09-27 12:37:41 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							861f1b2ca3 
							
						 
					 
					
						
						
							
							Merge branch 'master' into Develop  
						
						 
						
						... 
						
						
						
						# Conflicts:
#	test/Calibre-Web TestSummary_Linux.html 
						
					 
					
						2020-09-27 08:54:32 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ryan Long 
							
						 
					 
					
						
						
						
						
							
						
						
							a6002a2c6c 
							
						 
					 
					
						
						
							
							1622_updated_css  
						
						 
						
						
						
					 
					
						2020-09-20 23:41:20 -04: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 
							
						 
					 
					
						
						
						
						
							
						
						
							98494c610a 
							
						 
					 
					
						
						
							
							Merge branch 'master' into Develop  
						
						 
						
						
						
					 
					
						2020-08-30 08:31:35 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								OzzieIsaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							28733179d2 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'caliblur/editMetaFix' into Develop  
						
						 
						
						
						
					 
					
						2020-08-30 08:25:17 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								blitzmann 
							
						 
					 
					
						
						
						
						
							
						
						
							3e378bd665 
							
						 
					 
					
						
						
							
							Some more clean up  
						
						 
						
						
						
					 
					
						2020-08-29 21:04:49 -04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								blitzmann 
							
						 
					 
					
						
						
						
						
							
						
						
							c120138f26 
							
						 
					 
					
						
						
							
							Fixes for pagination ugliness for caliBlur! style  
						
						 
						
						
						
					 
					
						2020-08-29 20:58:30 -04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								blitzmann 
							
						 
					 
					
						
						
						
						
							
						
						
							31b20362ec 
							
						 
					 
					
						
						
							
							caliBlur! style: Fixes issue with edit metadata button not getting styled correctly  
						
						 
						
						
						
					 
					
						2020-08-29 18:45:23 -04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								OzzieIsaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							4c38b0ab10 
							
						 
					 
					
						
						
							
							Prepare for save name sort order  
						
						 
						
						
						
					 
					
						2020-08-23 10:56:00 +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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ren Wei 
							
						 
					 
					
						
						
						
						
							
						
						
							4c6f5096be 
							
						 
					 
					
						
						
							
							get metadata, typo, if no result from google, it will display the  noresult msg, regardless of the others results.  
						
						 
						
						
						
					 
					
						2020-08-01 15:12:20 +08: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 
							
						 
					 
					
						
						
						
						
							
						
						
							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 
							
						 
					 
					
						
						
						
						
							
						
						
							7b4306b1d6 
							
						 
					 
					
						
						
							
							UI improvements (same colors of buttons, etc.)  
						
						 
						
						... 
						
						
						
						Changed Editable default value 
						
					 
					
						2020-06-09 20:46:02 +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 
							
						 
					 
					
						
						
						
						
							
						
						
							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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Michael Knepher 
							
						 
					 
					
						
						
						
						
							
						
						
							54cf3652b0 
							
						 
					 
					
						
						
							
							Add series name and index to book cover info  
						
						 
						
						
						
					 
					
						2020-05-27 21:57:59 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							b852fb0e26 
							
						 
					 
					
						
						
							
							Merge branch 'Develop'  
						
						 
						
						
						
					 
					
						2020-05-25 21:30:21 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Knepherbird 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							5cceeb6ef2 
							
						 
					 
					
						
						
							
							Fix: correct property typo  
						
						 
						
						... 
						
						
						
						Correcting 'box-sizeing' to 'box-sizing' 
						
					 
					
						2020-05-19 13:10:25 -07: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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								h1f0x 
							
						 
					 
					
						
						
						
						
							
						
						
							e325c3dbf6 
							
						 
					 
					
						
						
							
							fixed div selection in caliBlur.js  
						
						 
						
						
						
					 
					
						2020-05-14 12:29:52 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								h1f0x 
							
						 
					 
					
						
						
						
						
							
						
						
							b3fef625a8 
							
						 
					 
					
						
						
							
							Fixed Calibur views: series, authors, publishers, ratings, file formats, detail view  
						
						 
						
						
						
					 
					
						2020-05-14 11:57:38 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							e787f9dd9f 
							
						 
					 
					
						
						
							
							Automatic username ( #1172 )  
						
						 
						
						
						
					 
					
						2020-05-12 17:23:58 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							f5e12328dc 
							
						 
					 
					
						
						
							
							Fix for  #1382  (Restrictions with "&" in it can't be deleted)  
						
						 
						
						
						
					 
					
						2020-05-11 18:41:34 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							486c0f2937 
							
						 
					 
					
						
						
							
							Fix for  #1382  (Restrictions with "&" in it can't be deleted)  
						
						 
						
						
						
					 
					
						2020-05-11 18:41:16 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							16a3deec2c 
							
						 
					 
					
						
						
							
							Merge branch 'master' into Develop  
						
						 
						
						... 
						
						
						
						# Conflicts:
#	cps/helper.py 
						
					 
					
						2020-05-10 19:24:55 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								OzzieIsaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							fe88010a72 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'sec_fixes/minor_fix_caliblur'  
						
						 
						
						
						
					 
					
						2020-05-10 14:57:19 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								OzzieIsaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							99ae4be2c2 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'sec_fixes/bump_jquery'  
						
						 
						
						
						
					 
					
						2020-05-10 10:43:20 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								jvoisin 
							
						 
					 
					
						
						
						
						
							
						
						
							30c9aa3df9 
							
						 
					 
					
						
						
							
							Minor fixes to caliBlur.js  
						
						 
						
						... 
						
						
						
						- Add alt attributes to images
- Fix a broken tag 
						
					 
					
						2020-05-09 17:07:22 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								jvoisin 
							
						 
					 
					
						
						
						
						
							
						
						
							688184e255 
							
						 
					 
					
						
						
							
							Bump jquery  
						
						 
						
						
						
					 
					
						2020-05-09 17:00:03 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								jvoisin 
							
						 
					 
					
						
						
						
						
							
						
						
							264b4b669e 
							
						 
					 
					
						
						
							
							Bump underscorejs version from 1.9.1 to 1.12.2  
						
						 
						
						
						
					 
					
						2020-05-09 16:54:21 +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 
							
						 
					 
					
						
						
						
						
							
						
						
							fcefd8031a 
							
						 
					 
					
						
						
							
							Fix   #985  (png and webp are extracted as cover files from comic files)  
						
						 
						
						
						
					 
					
						2020-05-02 11:24:30 +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 
							
						 
					 
					
						
						
						
						
							
						
						
							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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								jvoisin 
							
						 
					 
					
						
						
						
						
							
						
						
							806a5f209f 
							
						 
					 
					
						
						
							
							Fix two minor xss  
						
						 
						
						
						
					 
					
						2020-04-29 11:33:33 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							ce6b689147 
							
						 
					 
					
						
						
							
							Code cosmetics  
						
						 
						
						
						
					 
					
						2020-04-27 20:22:55 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							2d92818613 
							
						 
					 
					
						
						
							
							Code cosmetics  
						
						 
						
						
						
					 
					
						2020-04-27 20:01:13 +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 
							
						 
					 
					
						
						
						
						
							
						
						
							063ee5e855 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'remove_usage_local_var_undeclared'  
						
						 
						
						... 
						
						
						
						Code cosmetics 
						
					 
					
						2020-04-24 21:05:56 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								jvoisin 
							
						 
					 
					
						
						
						
						
							
						
						
							d8bf540db2 
							
						 
					 
					
						
						
							
							Remove an undeclared and useless local variable  
						
						 
						
						
						
					 
					
						2020-04-24 18:04:27 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								pthiben 
							
						 
					 
					
						
						
						
						
							
						
						
							b90048d72e 
							
						 
					 
					
						
						
							
							fix badge color on grid view to match list view  
						
						 
						
						
						
					 
					
						2020-04-18 23:41:01 -04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								pthiben 
							
						 
					 
					
						
						
						
						
							
						
						
							38bb10d36b 
							
						 
					 
					
						
						
							
							apply suggestion from @OzzieIsaacs that fixes sorting with caliblur theme.  
						
						 
						
						... 
						
						
						
						@OzzieIsaacs : I have no idea what the consequences are about this CSS style change. I played around in caliblur and did not notice anything weird, but I'm no calibre-web hardcore user 
						
					 
					
						2020-04-18 23:23:56 -04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								pthiben 
							
						 
					 
					
						
						
						
						
							
						
						
							58943bb156 
							
						 
					 
					
						
						
							
							update filtering so that it also uses isotope everywhere.  
						
						 
						
						... 
						
						
						
						Fix asc/desc that did not match list view 
						
					 
					
						2020-04-18 23:23:56 -04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								pthiben 
							
						 
					 
					
						
						
						
						
							
						
						
							5222e157cb 
							
						 
					 
					
						
						
							
							fix standard theme badges so that they stand on top left corner instead of top right: each element's width  in the list seems to be double the size of the image, so right alignment gets tricky.  https://github.com/janeczku/calibre-web/pull/986#issuecomment-517999218  suggests top-left alignment which does make a lot of sense. Using this for now. Maintainer might have a better idea to fix it  
						
						 
						
						
						
					 
					
						2020-04-18 23:23:55 -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 
							
						 
					 
					
						
						
						
						
							
						
						
							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 
							
						 
					 
					
						
						
						
						
							
						
						
							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 
							
						 
					 
					
						
						
						
						
							
						
						
							587174b771 
							
						 
					 
					
						
						
							
							Fix   #1272  
						
						 
						
						
						
					 
					
						2020-04-04 08:53:22 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							5864637f1c 
							
						 
					 
					
						
						
							
							Merge branch 'master' into Develop  
						
						 
						
						
						
					 
					
						2020-04-04 06:22:17 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								hexeth 
							
						 
					 
					
						
						
						
						
							
						
						
							da42c51af2 
							
						 
					 
					
						
						
							
							Updated to exclude new modules  
						
						 
						
						
						
					 
					
						2020-03-31 08:42:08 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							f6c04b9b84 
							
						 
					 
					
						
						
							
							Merge branch 'master' into Develop  
						
						 
						
						
						
					 
					
						2020-03-29 16:48:56 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							4eacb21259 
							
						 
					 
					
						
						
							
							Update updater  
						
						 
						
						... 
						
						
						
						Update change logfile
code cosmetics js files 
						
					 
					
						2020-03-29 16:44:24 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							f243515261 
							
						 
					 
					
						
						
							
							Fix   #950  (sorting order in comics)  
						
						 
						
						
						
					 
					
						2020-03-14 07:15:15 +01: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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Wanoo 
							
						 
					 
					
						
						
						
						
							
						
						
							a0535aa3db 
							
						 
					 
					
						
						
							
							Add ComicVine Api  
						
						 
						
						... 
						
						
						
						Fetching Metadata for comicBook with ComicVine API 
						
					 
					
						2020-02-28 16:04:07 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							146068c936 
							
						 
					 
					
						
						
							
							Merge branch 'Develop'  
						
						 
						
						... 
						
						
						
						# Conflicts:
#	cps/db.py
#	cps/templates/user_edit.html 
						
					 
					
						2020-02-23 13:15:30 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							3b8c5ef21a 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'get_metadata/patch-1'  
						
						 
						
						... 
						
						
						
						Fix  #1210  Load multiple authors correct via get metadata 
						
					 
					
						2020-02-23 13:14:12 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							7c89f0b5b9 
							
						 
					 
					
						
						
							
							Merge with branch develop  
						
						 
						
						... 
						
						
						
						Release version 
						
					 
					
						2020-02-23 09:08:01 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								OzzieIsaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							371097eb4d 
							
						 
					 
					
						
						
							
							Update Updater  
						
						 
						
						
						
					 
					
						2020-02-23 07:54:58 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Johnny A. dos Santos 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							29cb8bfec4 
							
						 
					 
					
						
						
							
							Fix   #1210  
						
						 
						
						
						
					 
					
						2020-02-21 18:25:02 -03: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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							16cd57fe55 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'cover_layout/fix-pull-left-cover-layout'  
						
						 
						
						
						
					 
					
						2020-02-16 19:19:10 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kyos 
							
						 
					 
					
						
						
						
						
							
						
						
							509071949a 
							
						 
					 
					
						
						
							
							Moved style to css file  
						
						 
						
						
						
					 
					
						2020-02-13 21:05:24 +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 
							
						 
					 
					
						
						
						
						
							
						
						
							50ba2e329a 
							
						 
					 
					
						
						
							
							Merge branch 'master' into Develop  
						
						 
						
						... 
						
						
						
						# Conflicts:
#	cps/shelf.py 
						
					 
					
						2020-02-09 07:00:04 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							b33a2ac90d 
							
						 
					 
					
						
						
							
							Fix   #1170  Auth-digest Header no longer crashs calibre-web  
						
						 
						
						... 
						
						
						
						Fix  #1161  Shelfs are reordering again
Update Sortable.js to 2.10.1
Code cosmetics 
						
					 
					
						2020-02-02 07:47:27 +01:00