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
..
engines	Merge branch 'code_results' of https://github.com/pointhi/searx into pointhi-code_results	2015-01-15 18:26:00 +01:00
https_rules	[mod][fix] https rewrite refactor ++ fixes	2014-12-19 22:40:37 +01:00
static	Merge branch 'code_results' of https://github.com/pointhi/searx into pointhi-code_results	2015-01-15 18:26:00 +01:00
templates	Merge branch 'code_results' of https://github.com/pointhi/searx into pointhi-code_results	2015-01-15 18:26:00 +01:00
tests	[fix] static content paths	2015-01-01 19:24:47 +01:00
translations	Updated translations without fuzzy translations	2015-01-05 20:56:48 +01:00
__init__.py	[enh] logging added	2015-01-09 04:01:31 +01:00
autocomplete.py	[fix] little autocompleter fix	2015-01-10 19:55:21 +01:00
https_rewrite.py	[enh] using the logger	2015-01-09 04:13:05 +01:00
languages.py	add comments to languages.py	2014-09-13 18:32:28 +02:00
query.py	Merge pull request #166 from Cqoicebordel/non-exclusif-bang	2015-01-12 14:14:40 +01:00
search.py	[enh] add nojs support into oscar-template	2015-01-15 15:48:50 +01:00
settings.yml	Integrated media in results + Deezer Engine	2015-01-05 02:04:23 +01:00
settings_robot.yml	update settings_robot.yml	2014-10-15 14:05:42 +02:00
testing.py	fix: robot fw, entry points, some flake8, package searx egg	2014-01-20 01:06:29 +01:00
utils.py	[enh] date formatting by locale	2015-01-11 13:26:40 +01:00
version.py	[enh] v0.6.0	2014-12-25 17:56:01 +01:00
webapp.py	Merge branch 'code_results' of https://github.com/pointhi/searx into pointhi-code_results	2015-01-15 18:26:00 +01:00