Thomas Pointhuber
							
						 
					 | 
					
						
						
						
						
							
						
						
							0e1035eac1
							
						
					 | 
					
						
						
							
							Merge https://github.com/asciimoo/searx into template_oscar
						
						
						
						
						
						
						
						Conflicts:
	searx/translations/de/LC_MESSAGES/messages.po
	searx/translations/en/LC_MESSAGES/messages.po
	searx/translations/es/LC_MESSAGES/messages.po
	searx/translations/fr/LC_MESSAGES/messages.po
	searx/translations/hu/LC_MESSAGES/messages.po
	searx/translations/it/LC_MESSAGES/messages.po
	searx/translations/nl/LC_MESSAGES/messages.po
	searx/webapp.py 
						
					 | 
					
						2014-10-26 19:11:28 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Thomas Pointhuber
							
						 
					 | 
					
						
						
						
						
							
						
						
							517e57b996
							
						
					 | 
					
						
						
							
							oscar template: improve result icons
						
						
						
						
						
					 | 
					
						2014-10-05 14:40:47 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Adam Tauber
							
						 
					 | 
					
						
						
						
						
							
						
						
							c58e5a236a
							
						
					 | 
					
						
						
							
							[fix] preferences button display
						
						
						
						
						
					 | 
					
						2014-10-05 13:37:26 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Adam Tauber
							
						 
					 | 
					
						
						
						
						
							
						
						
							5d7b63223f
							
						
					 | 
					
						
						
							
							[mod] sidebar positioning
						
						
						
						
						
					 | 
					
						2014-10-04 23:13:21 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dalf
							
						 
					 | 
					
						
						
						
						
							
						
						
							6bfd566353
							
						
					 | 
					
						
						
							
							[enh] add infoboxes and answers
						
						
						
						
						
					 | 
					
						2014-09-28 16:51:41 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Adam Tauber
							
						 
					 | 
					
						
						
						
						
							
						
						
							00e5262834
							
						
					 | 
					
						
						
							
							[enh] archive.org link added to results
						
						
						
						
						
					 | 
					
						2014-09-08 00:52:15 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Adam Tauber
							
						 
					 | 
					
						
						
						
						
							
						
						
							6fb9eb8e47
							
						
					 | 
					
						
						
							
							[mod] select autocomplete results with mouse click
						
						
						
						
						
					 | 
					
						2014-07-15 17:02:58 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Adam Tauber
							
						 
					 | 
					
						
						
						
						
							
						
						
							d290c1b9ac
							
						
					 | 
					
						
						
							
							[enh] github ribbon to landingpage
						
						
						
						
						
					 | 
					
						2014-07-07 14:29:12 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Matej Cotman
							
						 
					 | 
					
						
						
						
						
							
						
						
							08eaffe245
							
						
					 | 
					
						
						
							
							add multi theming support
						
						
						
						
						
					 | 
					
						2014-06-05 13:18:22 +02:00 | 
					
					
						
						
							
							
							
						
					 |