Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							2fbb7466d3 
							
						 
					 
					
						
						
							
							Code cosmetics  
						
						 
						
						
						
					 
					
						2021-03-14 15:44:40 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							f29f94f45f 
							
						 
					 
					
						
						
							
							Code cosmetics  
						
						 
						
						
						
					 
					
						2021-03-14 15:41:36 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							cd973868fc 
							
						 
					 
					
						
						
							
							Code cosmetics  
						
						 
						
						
						
					 
					
						2021-03-14 15:29:34 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							3c35f02cac 
							
						 
					 
					
						
						
							
							Code cosmetics  
						
						 
						
						
						
					 
					
						2021-03-14 15:18:45 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							22c93e2389 
							
						 
					 
					
						
						
							
							Merge branch 'master' into development  
						
						 
						
						
						
					 
					
						2021-03-14 15:06:20 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							8c751eb532 
							
						 
					 
					
						
						
							
							Some code cosmetics  
						
						 
						
						
						
					 
					
						2021-03-14 15:06:09 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							f52fa41439 
							
						 
					 
					
						
						
							
							Fix restart server  
						
						 
						
						... 
						
						
						
						Some code cosmetics 
						
					 
					
						2021-03-14 14:29:40 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							f77d72fd86 
							
						 
					 
					
						
						
							
							Merge branch 'master' into development  
						
						 
						
						... 
						
						
						
						# Conflicts:
#	cps/static/css/style.css 
						
					 
					
						2021-03-14 14:06:33 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							9b80c84794 
							
						 
					 
					
						
						
							
							Some code cosmetics  
						
						 
						
						
						
					 
					
						2021-03-14 14:05:36 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							725fc658f8 
							
						 
					 
					
						
						
							
							Some code cosmetics  
						
						 
						
						
						
					 
					
						2021-03-14 13:28:52 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							b9c0c8d2dc 
							
						 
					 
					
						
						
							
							Update bootstrap table to 1.18.2  
						
						 
						
						
						
					 
					
						2021-02-20 20:03:39 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							eeb7974e05 
							
						 
					 
					
						
						
							
							User table:  
						
						 
						
						... 
						
						
						
						Added button for single user edit
Added delete-trash-icon (not working)
Roles are displayed correct per user
Guest user is not visible if anonymous browsing is disabled 
						
					 
					
						2021-01-31 14:54:45 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								mmonkey 
							
						 
					 
					
						
						
						
						
							
						
						
							bc8bdfe385 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'upstream/master' into master  
						
						 
						
						
						
					 
					
						2021-01-02 20:21:15 -06:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							7e0ed537b7 
							
						 
					 
					
						
						
							
							irst steps Advanced search with mulitselects  
						
						 
						
						
						
					 
					
						2020-12-27 19:12:27 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							1a83bddf8c 
							
						 
					 
					
						
						
							
							Merge bubble read status  
						
						 
						
						
						
					 
					
						2020-12-27 13:53:21 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							9a20faf640 
							
						 
					 
					
						
						
							
							Revert accidentally deleted lines in caliblur! theme  
						
						 
						
						
						
					 
					
						2020-12-17 19:10:02 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								mmonkey 
							
						 
					 
					
						
						
						
						
							
						
						
							2d498dd138 
							
						 
					 
					
						
						
							
							Preserve publisher links, and fix formatting in custom columns for CaliBlur theme.  
						
						 
						
						
						
					 
					
						2020-12-16 00:58:45 -06: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 
							
						 
					 
					
						
						
						
						
							
						
						
							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 
							
						 
					 
					
						
						
						
						
							
						
						
							eed2f0a430 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'comic/master' into master  
						
						 
						
						
						
					 
					
						2020-11-22 08:45:02 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							87d60308f2 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'caliblur/issue/caliblur-981' into master  
						
						 
						
						
						
					 
					
						2020-11-08 19:29:10 +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 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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ghighi Eftimie 
							
						 
					 
					
						
						
						
						
							
						
						
							c33c6bbff0 
							
						 
					 
					
						
						
							
							fix for  #1594  
						
						 
						
						
						
					 
					
						2020-10-10 12:39:52 +03: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 
							
						 
					 
					
						
						
						
						
							
						
						
							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 
							
						 
					 
					
						
						
						
						
							
						
						
							8dde6ba60f 
							
						 
					 
					
						
						
							
							UI improvements table buttons  
						
						 
						
						
						
					 
					
						2020-06-12 21:40:09 +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 
							
						 
					 
					
						
						
						
						
							
						
						
							0dd0605a1f 
							
						 
					 
					
						
						
							
							Book list for merging  
						
						 
						
						
						
					 
					
						2020-06-06 21:21:10 +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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								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 
							
						 
					 
					
						
						
						
						
							
						
						
							b3fef625a8 
							
						 
					 
					
						
						
							
							Fixed Calibur views: series, authors, publishers, ratings, file formats, detail view  
						
						 
						
						
						
					 
					
						2020-05-14 11:57:38 +02:00