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
							
						 
					 | 
					
						
						
						
						
							
						
						
							bacb6fb561
							
						
					 | 
					
						
						
							
							New updater with default setting -> only stable releases #653
						
						
						
						
						
					 | 
					
						2019-01-20 17:46:26 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzie Isaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							23633f1665
							
						
					 | 
					
						
						
							
							Exclude tests from release
						
						
						
						
						
					 | 
					
						2018-10-03 14:26:11 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzie Isaacs
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							0bb148e6e3
							
						
					 | 
					
						
						
							
							Update Format string generation
						
						
						
						
						
					 | 
					
						2018-09-14 21:23:32 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								janeczku
							
						 
					 | 
					
						
						
						
						
							
						
						
							13919a1d23
							
						
					 | 
					
						
						
							
							Move vendored css/js to libs folders to fix language stats
						
						
						
						
						
					 | 
					
						2017-02-07 19:21:14 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								OzzieIsaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							c45968a1ed
							
						
					 | 
					
						
						
							
							Bugfix Updater
						
						
						
						
						
					 | 
					
						2017-01-31 19:29:47 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								OzzieIsaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							296d2615fe
							
						
					 | 
					
						
						
							
							Code cosmetics
						
						
						
						
						
					 | 
					
						2017-01-30 19:52:32 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								OzzieIsaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							b1293c84bc
							
						
					 | 
					
						
						
							
							- Implemented autoupdater for testing
						
						
						
						
						
						
						
						- failed logins are logged
- no of backups for log-file increased to 2 
						
					 | 
					
						2017-01-30 18:58:36 +01:00 | 
					
					
						
						
							
							
							
						
					 |