Markus Heiser 
							
						 
					 
					
						
						
						
						
							
						
						
							757ebb5d9f 
							
						 
					 
					
						
						
							
							[fix] brands: add variables from build env to grunt process  
						
						... 
						
						
						
						We have some variables in the build environment which are also needed in the
grunt process when building themes.  Theses variables are relavant if one
creates a fork with its own branding.  We treat these variables under the term
'brands'.
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de> 
						
					 
					
						2020-03-25 14:09:47 +01:00 
						 
				 
			
				
					
						
							
							
								Markus Heiser 
							
						 
					 
					
						
						
						
						
							
						
						
							2a5c39e33c 
							
						 
					 
					
						
						
							
							theme: oscar - tidy up trailing whitespaces and tab usage  
						
						... 
						
						
						
						Signed-off-by: Markus Heiser <markus.heiser@darmarit.de> 
						
					 
					
						2019-12-10 18:10:33 +01:00 
						 
				 
			
				
					
						
							
							
								Adam Tauber 
							
						 
					 
					
						
						
						
						
							
						
						
							46fb0d860e 
							
						 
					 
					
						
						
							
							[enh] add dark version of oscar/logicodev  
						
						
						
					 
					
						2017-12-05 22:05:19 +01:00 
						 
				 
			
				
					
						
							
							
								Alexandre Flament 
							
						 
					 
					
						
						
						
						
							
						
						
							57dc6b625f 
							
						 
					 
					
						
						
							
							[fix] travis build : various fix about grunt builds  
						
						
						
					 
					
						2017-08-13 13:41:59 +02:00 
						 
				 
			
				
					
						
							
							
								Adam Tauber 
							
						 
					 
					
						
						
						
						
							
						
						
							f496dc353d 
							
						 
					 
					
						
						
							
							[enh] oscar theme redesign added  
						
						... 
						
						
						
						The original code made by @logico-dev (#559 ) 
						
					 
					
						2016-06-26 01:57:43 +02:00 
						 
				 
			
				
					
						
							
							
								Thomas Pointhuber 
							
						 
					 
					
						
						
						
						
							
						
						
							400b54191c 
							
						 
					 
					
						
						
							
							Merge branch 'master' of  https://github.com/asciimoo/searx  into code_results  
						
						... 
						
						
						
						Conflicts:
	searx/engines/searchcode_code.py
	searx/engines/searchcode_doc.py
	searx/static/oscar/js/searx.min.js
	searx/templates/oscar/result_templates/default.html
	searx/templates/oscar/result_templates/images.html
	searx/templates/oscar/result_templates/map.html
	searx/templates/oscar/result_templates/torrent.html
	searx/templates/oscar/result_templates/videos.html 
						
					 
					
						2015-01-09 21:30:09 +01:00 
						 
				 
			
				
					
						
							
							
								Adam Tauber 
							
						 
					 
					
						
						
						
						
							
						
						
							9f12605f7e 
							
						 
					 
					
						
						
							
							[enh] themes static content refactor  
						
						
						
					 
					
						2015-01-01 17:48:12 +01:00