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
..
messages	oscar template: add no result message	2014-10-05 14:40:47 +02:00
result_templates	Merge branch 'master' of https://github.com/asciimoo/searx into code_results	2015-01-09 21:30:09 +01:00
about.html	little enhancement of oscar template	2014-10-05 14:40:46 +02:00
base.html	[enh][oscar_template] split js-files and compile them together	2014-11-30 13:21:58 +01:00
categories.html	oscar template: make the categories clickable	2014-10-05 14:40:46 +02: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	[enh] add no-js support	2014-11-03 22:18:40 +01:00
results.html	[enh] better result template handling	2015-01-01 18:59:53 +01:00
search_full.html	[enh][oscar_template] split js-files and compile them together	2014-11-30 13:21:58 +01:00
search.html	oscar template: implement first version of results page	2014-10-05 14:40:46 +02:00
stats.html	oscar template: update messages	2014-10-05 14:40:46 +02:00