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

..

engines

Merge branch 'master' of https://github.com/asciimoo/searx into code_results

2015-01-09 21:30:09 +01:00

https_rules

[mod][fix] https rewrite refactor ++ fixes

2014-12-19 22:40:37 +01:00

static/themes

Merge branch 'master' of https://github.com/asciimoo/searx into code_results

2015-01-09 21:30:09 +01:00

templates

Merge branch 'master' of https://github.com/asciimoo/searx into code_results

2015-01-09 21:30:09 +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] wikipedia autocompleter url param

2014-11-04 19:53:42 +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

[fix] pep8 part II.

2014-10-19 12:41:04 +02:00

search.py

[enh] engine exception traceback

2015-01-09 04:30:55 +01:00

settings_robot.yml

update settings_robot.yml

2014-10-15 14:05:42 +02:00

settings.yml

Integrated media in results + Deezer Engine

2015-01-05 02:04:23 +01:00

testing.py

fix: robot fw, entry points, some flake8, package searx egg

2014-01-20 01:06:29 +01:00

utils.py

[enh] better result template handling

2015-01-01 18:59:53 +01:00

version.py

[enh] v0.6.0

2014-12-25 17:56:01 +01:00

webapp.py

Merge branch 'master' of https://github.com/asciimoo/searx into code_results

2015-01-09 21:30:09 +01:00