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
							
						 
					 | 
					
						
						
						
						
							
						
						
							f8139f3198
							
						
					 | 
					
						
						
							
							Store last selected view for sidebar (not for categories, series, publishers, ..)
						
						
						
						
						
						
						
						Started making search paged 
						
					 | 
					
						2020-07-11 12:09:34 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Michael Knepher
							
						 
					 | 
					
						
						
						
						
							
						
						
							67dd4a72b0
							
						
					 | 
					
						
						
							
							Add series info to all book "meta" displays
						
						
						
						
						
					 | 
					
						2020-06-26 12:26:36 -07: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
							
						 
					 | 
					
						
						
						
						
							
						
						
							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 | 
					
					
						
						
							
							
							
						
					 |