Ozzieisaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							bbe91f439a
							
						
					 | 
					
						
						
							
							Merge from master
						
						
						
						
						
					 | 
					
						2019-12-22 15:28:43 +01: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
							
						 
					 | 
					
						
						
						
						
							
						
						
							f79d549910
							
						
					 | 
					
						
						
							
							Fix duplicate user and email (now case insensitive #948)
						
						
						
						
						
						
						
						Fix sorting in comics (#950)
Fix log error on Calibre converter error (#953)
Fix long running tasks (#954) 
						
					 | 
					
						2019-07-06 14:35:12 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzieisaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							cd546eb6d4
							
						
					 | 
					
						
						
							
							Update comic reader js
						
						
						
						
						
					 | 
					
						2019-06-17 19:48:17 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzieisaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							26e45f1f57
							
						
					 | 
					
						
						
							
							Merge remote-tracking branch 'comic-reader/master'
						
						
						
						
						
					 | 
					
						2019-05-31 08:43:51 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								subdiox
							
						 
					 | 
					
						
						
						
						
							
						
						
							867aa2f0bd
							
						
					 | 
					
						
						
							
							Beautify bitjs
						
						
						
						
						
					 | 
					
						2019-05-14 04:28:06 +09:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								subdiox
							
						 
					 | 
					
						
						
						
						
							
						
						
							7982ed877c
							
						
					 | 
					
						
						
							
							Downgrade bitjs to es5 branch
						
						
						
						
						
					 | 
					
						2019-05-13 14:53:25 +09:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								subdiox
							
						 
					 | 
					
						
						
						
						
							
						
						
							c0d136ccd8
							
						
					 | 
					
						
						
							
							Fix slow loading
						
						
						
						
						
					 | 
					
						2019-05-10 08:16:03 +09:00 | 
					
					
						
						
							
							
							
						
					 |