Adam Tauber 
							
						 
					 
					
						
						
						
						
							
						
						
							45734ee5f4 
							
						 
					 
					
						
						
							
							Merge pull request  #136  from pointhi/template_oscar_fix  
						
						... 
						
						
						
						[oscar_template] split up js-files, FIX  #132  
						
					 
					
						2014-12-01 21:02:14 +01:00 
						 
				 
			
				
					
						
							
							
								Thomas Pointhuber 
							
						 
					 
					
						
						
						
						
							
						
						
							e687f5c290 
							
						 
					 
					
						
						
							
							[enh][oscar_template] split js-files and compile them together  
						
						
						
					 
					
						2014-11-30 13:21:58 +01:00 
						 
				 
			
				
					
						
							
							
								Adam Tauber 
							
						 
					 
					
						
						
						
						
							
						
						
							91384c1f31 
							
						 
					 
					
						
						
							
							Merge pull request  #130  from pointhi/template_oscar_fix  
						
						... 
						
						
						
						[fix][template_oscar] make overpass-api call over https and add better error-message 
						
					 
					
						2014-11-20 15:49:31 +01:00 
						 
				 
			
				
					
						
							
							
								Thomas Pointhuber 
							
						 
					 
					
						
						
						
						
							
						
						
							08f4b7f506 
							
						 
					 
					
						
						
							
							[fix][template_oscar] make overpass-api call over https  
						
						... 
						
						
						
						and add better error message if ajax-call fail 
						
					 
					
						2014-11-20 15:31:00 +01:00 
						 
				 
			
				
					
						
							
							
								Thomas LEBEAU 
							
						 
					 
					
						
						
						
						
							
						
						
							3ed43cf31a 
							
						 
					 
					
						
						
							
							responsive theme courgette  
						
						
						
					 
					
						2014-11-20 15:14:03 +01:00 
						 
				 
			
				
					
						
							
							
								Adam Tauber 
							
						 
					 
					
						
						
						
						
							
						
						
							075a5fe898 
							
						 
					 
					
						
						
							
							Merge pull request  #127  from pointhi/template_oscar_map  
						
						... 
						
						
						
						Template oscar, add map support 
						
					 
					
						2014-11-19 16:19:03 +01:00 
						 
				 
			
				
					
						
							
							
								Thomas Pointhuber 
							
						 
					 
					
						
						
						
						
							
						
						
							4b75d41f86 
							
						 
					 
					
						
						
							
							[enh][oscar_template] loading map informations from overpass-api  
						
						
						
					 
					
						2014-11-19 15:49:55 +01:00 
						 
				 
			
				
					
						
							
							
								Adam Tauber 
							
						 
					 
					
						
						
						
						
							
						
						
							1a81c20d73 
							
						 
					 
					
						
						
							
							[fix] sidebar overflow  
						
						
						
					 
					
						2014-11-18 20:30:06 +01:00 
						 
				 
			
				
					
						
							
							
								Adam Tauber 
							
						 
					 
					
						
						
						
						
							
						
						
							6b31f55c90 
							
						 
					 
					
						
						
							
							[fix] suggestions display  
						
						
						
					 
					
						2014-11-18 19:53:38 +01:00 
						 
				 
			
				
					
						
							
							
								Adam Tauber 
							
						 
					 
					
						
						
						
						
							
						
						
							b8efd1214f 
							
						 
					 
					
						
						
							
							[enh] category select warning message  
						
						
						
					 
					
						2014-11-18 19:44:33 +01:00 
						 
				 
			
				
					
						
							
							
								Adam Tauber 
							
						 
					 
					
						
						
						
						
							
						
						
							cb15a21681 
							
						 
					 
					
						
						
							
							[fix] syggestions max width  
						
						
						
					 
					
						2014-11-18 19:03:52 +01:00 
						 
				 
			
				
					
						
							
							
								Adam Tauber 
							
						 
					 
					
						
						
						
						
							
						
						
							0d80d5d3b4 
							
						 
					 
					
						
						
							
							Merge pull request  #105  from pointhi/template_oscar  
						
						... 
						
						
						
						new template: oscar 
						
					 
					
						2014-11-11 09:36:39 +01:00 
						 
				 
			
				
					
						
							
							
								Thomas Pointhuber 
							
						 
					 
					
						
						
						
						
							
						
						
							3b7b106684 
							
						 
					 
					
						
						
							
							[enh] template_oscar: add layer to leaflet map  
						
						
						
					 
					
						2014-11-03 18:47:18 +01:00 
						 
				 
			
				
					
						
							
							
								Thomas Pointhuber 
							
						 
					 
					
						
						
						
						
							
						
						
							c38917bb2a 
							
						 
					 
					
						
						
							
							[enh] template_oscar: show addressdata if possible  
						
						
						
					 
					
						2014-11-03 18:46:58 +01:00 
						 
				 
			
				
					
						
							
							
								Thomas Pointhuber 
							
						 
					 
					
						
						
						
						
							
						
						
							2e7723a6c1 
							
						 
					 
					
						
						
							
							[enh] oscar_template: improve result visualisation  
						
						... 
						
						
						
						* highlight parts of result
* add link to archiv.to
* fix little bugs
* add little icons
* change style of "show map" button 
						
					 
					
						2014-11-03 10:39:47 +01:00 
						 
				 
			
				
					
						
							
							
								Thomas Pointhuber 
							
						 
					 
					
						
						
						
						
							
						
						
							b2c976a5a3 
							
						 
					 
					
						
						
							
							[enh] template_oscar: maxZoom if fitting bounds  
						
						
						
					 
					
						2014-11-02 22:35:06 +01:00 
						 
				 
			
				
					
						
							
							
								Thomas Pointhuber 
							
						 
					 
					
						
						
						
						
							
						
						
							740594a4b7 
							
						 
					 
					
						
						
							
							[enh] oscar_template: initial osm-map support for map results  
						
						... 
						
						
						
						* TODO: remove leaflet.min.css if not required 
						
					 
					
						2014-11-02 13:00:28 +01:00 
						 
				 
			
				
					
						
							
							
								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