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 
						 
				 
			
				
					
						
							
							
								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 
						 
				 
			
				
					
						
							
							
								Ozzieisaacs 
							
						 
					 
					
						
						
							
						
						e787f9dd9f 
					 
					
						
						
							
							Automatic username ( #1172 )  
						
						
						
						
					 
					
						2020-05-12 17:23:58 +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 
							
						 
					 
					
						
						
							
						
						ce6b689147 
					 
					
						
						
							
							Code cosmetics  
						
						
						
						
					 
					
						2020-04-27 20:22:55 +02:00 
						 
				 
			
				
					
						
							
							
								Ozzieisaacs 
							
						 
					 
					
						
						
							
						
						2d92818613 
					 
					
						
						
							
							Code cosmetics  
						
						
						
						
					 
					
						2020-04-27 20:01:13 +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 
							
						 
					 
					
						
						
							
						
						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 
							
						 
					 
					
						
						
							
						
						a194216568 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/master'  
						
						
						
						
					 
					
						2020-04-05 19:10:27 +02: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 
							
						 
					 
					
						
						
							
						
						661ed17d23 
					 
					
						
						
							
							Handle stream output in logviewer  
						
						... 
						
						
						
						Add migration of global matrue content settings to user based settings
Fix Caliblur Theme (Publisherslist)
Allow/deny list/edit/add/delete of tags and custom columns
Colored table background for tags restriction 
						
						
					 
					
						2020-01-07 20:26:59 +01:00 
						 
				 
			
				
					
						
							
							
								Ozzieisaacs 
							
						 
					 
					
						
						
							
						
						c659f28334 
					 
					
						
						
							
							Fix   #1128  
						
						
						
						
					 
					
						2020-01-06 11:52:59 +01:00 
						 
				 
			
				
					
						
							
							
								Ozzieisaacs 
							
						 
					 
					
						
						
							
						
						b586a32843 
					 
					
						
						
							
							Fix   #1115  (comic reader not working under iOS, maybe invalid issue)  
						
						... 
						
						
						
						Improvement for #925  (Next/Prev buttons are bigger) 
						
						
					 
					
						2019-12-22 15:24:22 +01:00 
						 
				 
			
				
					
						
							
							
								Kyos 
							
						 
					 
					
						
						
							
						
						c93dd32179 
					 
					
						
						
							
							Fixed typo and column size for LG screens  
						
						
						
						
					 
					
						2019-10-19 12:02:14 +02:00 
						 
				 
			
				
					
						
							
							
								Kyos 
							
						 
					 
					
						
						
							
						
						ada727a570 
					 
					
						
						
							
							Adds Authors, Series and Book Cover to the shelf order view  
						
						
						
						
					 
					
						2019-10-19 10:52:03 +02:00 
						 
				 
			
				
					
						
							
							
								Dmitriy Istomin 
							
						 
					 
					
						
						
							
						
						a65ad9483c 
					 
					
						
						
							
							update Bootstrap v3.4.0 -> 3.4.1  
						
						
						
						
					 
					
						2019-08-16 11:18:39 -04:00 
						 
				 
			
				
					
						
							
							
								Ozzieisaacs 
							
						 
					 
					
						
						
							
						
						b9c3a3fcea 
					 
					
						
						
							
							Fix   #652  
						
						
						
						
					 
					
						2019-07-21 18:19:07 +02:00 
						 
				 
			
				
					
						
							
							
								Ozzieisaacs 
							
						 
					 
					
						
						
							
						
						4708347c16 
					 
					
						
						
							
							Merge branch 'Develop'  
						
						... 
						
						
						
						# Conflicts:
#	MANIFEST.in
#	README.md
#	cps/helper.py
#	cps/static/js/archive/archive.js
#	cps/translations/nl/LC_MESSAGES/messages.mo
#	cps/translations/nl/LC_MESSAGES/messages.po
#	cps/ub.py
#	cps/updater.py
#	cps/web.py
#	cps/worker.py
#	optional-requirements.txt 
						
						
					 
					
						2019-07-13 20:54:21 +02:00 
						 
				 
			
				
					
						
							
							
								Ozzieisaacs 
							
						 
					 
					
						
						
							
						
						3f5c6c1fa5 
					 
					
						
						
							
							Fix   #937  
						
						
						
						
					 
					
						2019-06-13 20:01:37 +02:00