Ozzieisaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							26a7d9ef30
							
						
					 | 
					
						
						
							
							Merge branch 'Develop'
						
						
						
						
						
						
						
						# Conflicts:
#	cps/__init__.py
#	cps/about.py
#	cps/admin.py
#	cps/cli.py
#	cps/config_sql.py
#	cps/constants.py
#	cps/converter.py
#	cps/db.py
#	cps/editbooks.py
#	cps/gdriveutils.py
#	cps/helper.py
#	cps/logger.py
#	cps/oauth.py
#	cps/server.py
#	cps/services/simpleldap.py
#	cps/ub.py
#	cps/web.py
#	cps/worker.py
#	optional-requirements.txt
#	setup.cfg
#	setup.py 
						
					 | 
					
						2019-07-17 19:07:05 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Pavel
							
						 
					 | 
					
						
						
						
						
							
						
						
							99c6247baf
							
						
					 | 
					
						
						
							
							use the standard socket library to validate the ip address argument
						
						
						
						
						
					 | 
					
						2019-07-14 22:06:40 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzieisaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							8bfcdffeb6
							
						
					 | 
					
						
						
							
							Fix feature support
						
						
						
						
						
					 | 
					
						2019-07-14 13:20:40 +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
							
						 
					 | 
					
						
						
						
						
							
						
						
							405a3909b0
							
						
					 | 
					
						
						
							
							Fix for opds with LDAP authentication
						
						
						
						
						
					 | 
					
						2019-07-13 17:51:25 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Pavel
							
						 
					 | 
					
						
						
						
						
							
						
						
							006e596c72
							
						
					 | 
					
						
						
							
							Moved config class into separate file.
						
						
						
						
						
						
						
						Moved Goodreads and LDAP services into separate package. 
						
					 | 
					
						2019-07-07 16:05:51 +03:00 | 
					
					
						
						
							
							
							
						
					 |