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  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									dalf 
								
							 
						 
						
							
							
							
							
								
							
							
								a71b326d9e 
								
							 
						 
						
							
							
								
								[mod] default template modifications  
							
							 
							
							... 
							
							
							
							- more smartphone friendly
- more text browser friendly
- next button always on the right
- in case of small screen supporting touch event, categories are displayed on one line with a scroll 
							
						 
						
							2014-10-26 11:14:05 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									dalf 
								
							 
						 
						
							
							
							
							
								
							
							
								be4d219ae7 
								
							 
						 
						
							
							
								
								[mod] use pngcrush to reduce the size of png files  
							
							 
							
							
							
						 
						
							2014-10-25 17:07:39 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									dalf 
								
							 
						 
						
							
							
							
							
								
							
							
								400279182e 
								
							 
						 
						
							
							
								
								[fix] no horizontal scrolling on small screen  
							
							 
							
							... 
							
							
							
							[fix] small images in the results aren't not "zoomed" 
							
						 
						
							2014-10-25 17:05:37 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Thomas Pointhuber 
								
							 
						 
						
							
							
							
							
								
							
							
								c36c935b03 
								
							 
						 
						
							
							
								
								oscar template: add infobox  
							
							 
							
							
							
						 
						
							2014-10-05 15:46:43 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Thomas Pointhuber 
								
							 
						 
						
							
							
							
							
								
							
							
								517e57b996 
								
							 
						 
						
							
							
								
								oscar template: improve result icons  
							
							 
							
							
							
						 
						
							2014-10-05 14:40:47 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Thomas Pointhuber 
								
							 
						 
						
							
							
							
							
								
							
							
								55b9b10d2e 
								
							 
						 
						
							
							
								
								oscar template: include typeahead.css into bootstrap.min.css  
							
							 
							
							
							
						 
						
							2014-10-05 14:40:47 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Thomas Pointhuber 
								
							 
						 
						
							
							
							
							
								
							
							
								f4457da0a1 
								
							 
						 
						
							
							
								
								oscar template: using less to generate oscar.min.css  
							
							 
							
							
							
						 
						
							2014-10-05 14:40:47 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Thomas Pointhuber 
								
							 
						 
						
							
							
							
							
								
							
							
								841f1eedfc 
								
							 
						 
						
							
							
								
								oscar template: generate bootstrap.min.css from source  
							
							 
							
							
							
						 
						
							2014-10-05 14:40:47 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Thomas Pointhuber 
								
							 
						 
						
							
							
							
							
								
							
							
								14b0604bc0 
								
							 
						 
						
							
							
								
								oscar template: implement autocompleter  
							
							 
							
							
							
						 
						
							2014-10-05 14:40:47 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Thomas Pointhuber 
								
							 
						 
						
							
							
							
							
								
							
							
								4b7164f04a 
								
							 
						 
						
							
							
								
								oscar template: remove unused css file  
							
							 
							
							
							
						 
						
							2014-10-05 14:40:46 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Thomas Pointhuber 
								
							 
						 
						
							
							
							
							
								
							
							
								dc2c136220 
								
							 
						 
						
							
							
								
								oscar template: little style improvements  
							
							 
							
							
							
						 
						
							2014-10-05 14:40:46 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Thomas Pointhuber 
								
							 
						 
						
							
							
							
							
								
							
							
								47d1caed61 
								
							 
						 
						
							
							
								
								oscar template: add forgoten github icon  
							
							 
							
							
							
						 
						
							2014-10-05 14:40:46 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Thomas Pointhuber 
								
							 
						 
						
							
							
							
							
								
							
							
								b91b77e335 
								
							 
						 
						
							
							
								
								oscar template: improve result page  
							
							 
							
							... 
							
							
							
							* add paging support
* add suggestion panel
* add links panel 
							
						 
						
							2014-10-05 14:40:46 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Thomas Pointhuber 
								
							 
						 
						
							
							
							
							
								
							
							
								f3b565e17e 
								
							 
						 
						
							
							
								
								oscar template: implement first version of results page  
							
							 
							
							... 
							
							
							
							* implement results page
* improve search form template
* implement all result_templates
* fix youtube engine 
							
						 
						
							2014-10-05 14:40:46 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Thomas Pointhuber 
								
							 
						 
						
							
							
							
							
								
							
							
								a538bed745 
								
							 
						 
						
							
							
								
								oscar template: implement search input, index page,...  
							
							 
							
							
							
						 
						
							2014-10-05 14:40:46 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Thomas Pointhuber 
								
							 
						 
						
							
							
							
							
								
							
							
								25919de608 
								
							 
						 
						
							
							
								
								oscar template: make the categories clickable  
							
							 
							
							
							
						 
						
							2014-10-05 14:40:46 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Thomas Pointhuber 
								
							 
						 
						
							
							
							
							
								
							
							
								afcfa04e30 
								
							 
						 
						
							
							
								
								oscar template: improve style for check and uncheck of engines  
							
							 
							
							
							
						 
						
							2014-10-05 14:40:46 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Thomas Pointhuber 
								
							 
						 
						
							
							
							
							
								
							
							
								c21a907cac 
								
							 
						 
						
							
							
								
								initial commit of the new template 'oscar'  
							
							 
							
							... 
							
							
							
							* base.html mostly implemented
* stats.html implemented
* about.html implemented
* most of preferences.html implemented
* using bootstrap.js 
							
						 
						
							2014-10-05 14:40:46 +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  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Thomas LEBEAU 
								
							 
						 
						
							
							
							
							
								
							
							
								75853bd0b5 
								
							 
						 
						
							
							
								
								[courgette_theme] add autocomplete theme  
							
							 
							
							
							
						 
						
							2014-08-19 15:06:20 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Thomas LEBEAU 
								
							 
						 
						
							
							
							
							
								
							
							
								195ff7522e 
								
							 
						 
						
							
							
								
								optim img bg  
							
							 
							
							
							
						 
						
							2014-08-18 11:19:11 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Thomas LEBEAU 
								
							 
						 
						
							
							
							
							
								
							
							
								1188907c4f 
								
							 
						 
						
							
							
								
								remove artichaut.css  
							
							 
							
							
							
						 
						
							2014-08-18 10:56:16 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Thomas LEBEAU 
								
							 
						 
						
							
							
							
							
								
							
							
								a28cfd4887 
								
							 
						 
						
							
							
								
								[new] theme courgette  
							
							 
							
							
							
						 
						
							2014-08-18 10:45:05 +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  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Adam Tauber 
								
							 
						 
						
							
							
							
							
								
							
							
								66f87f8117 
								
							 
						 
						
							
							
								
								[mod] right sidebar  
							
							 
							
							
							
						 
						
							2014-05-10 06:42:33 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Adam Tauber 
								
							 
						 
						
							
							
							
							
								
							
							
								7c48b0f7da 
								
							 
						 
						
							
							
								
								[fix] suggestions margin  
							
							 
							
							
							
						 
						
							2014-05-10 06:40:56 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Adam Tauber 
								
							 
						 
						
							
							
							
							
								
							
							
								ead8d30ea0 
								
							 
						 
						
							
							
								
								[mod] inline suggestions  
							
							 
							
							
							
						 
						
							2014-05-10 06:39:07 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Adam Tauber 
								
							 
						 
						
							
							
							
							
								
							
							
								c761d93dd6 
								
							 
						 
						
							
							
								
								[mod] search field width  
							
							 
							
							
							
						 
						
							2014-05-09 11:49:11 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Adam Tauber 
								
							 
						 
						
							
							
							
							
								
							
							
								5d9d04a16e 
								
							 
						 
						
							
							
								
								[enh] better highlighting  
							
							 
							
							
							
						 
						
							2014-05-09 02:04:20 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Adam Tauber 
								
							 
						 
						
							
							
							
							
								
							
							
								58de2801ce 
								
							 
						 
						
							
							
								
								[fix] padding  
							
							 
							
							
							
						 
						
							2014-05-09 01:32:21 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Adam Tauber 
								
							 
						 
						
							
							
							
							
								
							
							
								47d548d6a2 
								
							 
						 
						
							
							
								
								[enh][mod] results ui refactor  
							
							 
							
							
							
						 
						
							2014-05-09 01:27:55 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Adam Tauber 
								
							 
						 
						
							
							
							
							
								
							
							
								41dd4d9ba3 
								
							 
						 
						
							
							
								
								[enh] autocompleter server side part  
							
							 
							
							
							
						 
						
							2014-03-29 16:29:19 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Thomas Pointhuber 
								
							 
						 
						
							
							
							
							
								
							
							
								c8cf95aa56 
								
							 
						 
						
							
							
								
								deactivate autocompleter by default  
							
							 
							
							
							
						 
						
							2014-03-21 11:11:31 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Thomas Pointhuber 
								
							 
						 
						
							
							
							
							
								
							
							
								360543dec4 
								
							 
						 
						
							
							
								
								add forgotten search.less  
							
							 
							
							
							
						 
						
							2014-03-20 13:16:58 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Thomas Pointhuber 
								
							 
						 
						
							
							
							
							
								
							
							
								e181fd8f56 
								
							 
						 
						
							
							
								
								edit style of autcompleter  
							
							 
							
							
							
						 
						
							2014-03-20 11:08:55 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Thomas Pointhuber 
								
							 
						 
						
							
							
							
							
								
							
							
								8abf4ab993 
								
							 
						 
						
							
							
								
								adding initial code for backend-part of autocompleter  
							
							 
							
							... 
							
							
							
							including test-code 
							
						 
						
							2014-03-20 10:28:24 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Thomas Pointhuber 
								
							 
						 
						
							
							
							
							
								
							
							
								b5c695c6f5 
								
							 
						 
						
							
							
								
								edit style of autocompleter  
							
							 
							
							
							
						 
						
							2014-03-19 20:26:08 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Thomas Pointhuber 
								
							 
						 
						
							
							
							
							
								
							
							
								ecd293c8a9 
								
							 
						 
						
							
							
								
								add front-part of autocompleter function  
							
							 
							
							
							
						 
						
							2014-03-19 20:19:44 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Adam Tauber 
								
							 
						 
						
							
							
							
							
								
							
							
								c14e8fe0a5 
								
							 
						 
						
							
							
								
								[fix]  #38  
							
							 
							
							
							
						 
						
							2014-03-18 09:38:23 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Adam Tauber 
								
							 
						 
						
							
							
							
							
								
							
							
								fa26da1187 
								
							 
						 
						
							
							
								
								Merge branch 'master' of github.com:asciimoo/searx  
							
							 
							
							
							
						 
						
							2014-03-17 18:30:53 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Adam Tauber 
								
							 
						 
						
							
							
							
							
								
							
							
								06b9238786 
								
							 
						 
						
							
							
								
								[fix]  #38  
							
							 
							
							
							
						 
						
							2014-03-17 18:30:08 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Thomas Pointhuber 
								
							 
						 
						
							
							
							
							
								
							
							
								f159fc718f 
								
							 
						 
						
							
							
								
								fix little style bug  
							
							 
							
							
							
						 
						
							2014-03-16 09:48:10 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Thomas Pointhuber 
								
							 
						 
						
							
							
							
							
								
							
							
								c54baf6301 
								
							 
						 
						
							
							
								
								Adding style for publish Date  
							
							 
							
							
							
						 
						
							2014-03-14 10:04:36 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Thomas Pointhuber 
								
							 
						 
						
							
							
							
							
								
							
							
								c8a1e0bda4 
								
							 
						 
						
							
							
								
								move *.less files into seperate directory  
							
							 
							
							
							
						 
						
							2014-03-13 16:51:15 +01:00