Adam Tauber a04fafd419 Merge branch 'code_results' of https://github.com/pointhi/searx into pointhi-code_results ... Conflicts: searx/static/themes/default/css/style.css searx/static/themes/oscar/css/oscar.min.css searx/templates/oscar/result_templates/torrent.html		2015-01-15 18:26:00 +01:00
..
messages	oscar template: add no result message	2014-10-05 14:40:47 +02:00
result_templates	Merge branch 'code_results' of https://github.com/pointhi/searx into pointhi-code_results	2015-01-15 18:26:00 +01:00
about.html	little enhancement of oscar template	2014-10-05 14:40:46 +02:00
base.html	[enh] show text "Start search" instead of icon, if javascript is disabled	2015-01-15 16:03:30 +01:00
categories.html	[enh] add nojs support into oscar-template	2015-01-15 15:48:50 +01:00
index.html	oscar template: implement first version of results page	2014-10-05 14:40:46 +02:00
infobox.html	Add alt for img	2014-12-08 01:03:28 +01:00
macros.html	Merge branch 'master' of https://github.com/asciimoo/searx into code_results	2015-01-09 21:30:09 +01:00
navbar.html	oscar template: update translation files	2014-10-05 14:40:47 +02:00
opensearch_response_rss.xml	initial commit of the new template 'oscar'	2014-10-05 14:40:46 +02:00
opensearch.xml	initial commit of the new template 'oscar'	2014-10-05 14:40:46 +02:00
preferences.html	W3C fix	2015-01-11 19:45:17 +01:00
results.html	Fix RSS link	2015-01-11 19:34:50 +01:00
search_full.html	[enh] show text "Start search" instead of icon, if javascript is disabled	2015-01-15 16:03:30 +01:00
search.html	[enh] show text "Start search" instead of icon, if javascript is disabled	2015-01-15 16:03:30 +01:00
stats.html	oscar template: update messages	2014-10-05 14:40:46 +02:00