searxng/searx
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
..
engines Merge https://github.com/asciimoo/searx into template_oscar 2014-10-26 19:11:28 +01:00
https_rules import basic https rules from https-everywhere repository 2014-10-15 14:52:27 +02:00
static Merge https://github.com/asciimoo/searx into template_oscar 2014-10-26 19:11:28 +01:00
templates oscar template: add infobox 2014-10-05 15:46:43 +02:00
tests [fix] infoboxes and answers : pass all tests 2014-10-01 22:46:31 +02:00
translations Merge https://github.com/asciimoo/searx into template_oscar 2014-10-26 19:11:28 +01:00
__init__.py [fix] pep8 part II. 2014-10-19 12:41:04 +02:00
autocomplete.py update comments in autocomplete.py 2014-09-13 18:47:28 +02:00
https_rewrite.py print error if https rewrite directory is not found, #116 2014-10-19 21:39:30 +02: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 [fix] pep8 part II. 2014-10-19 12:41:04 +02:00
settings.yml Merge pull request #115 from pointhi/engine_faroo 2014-10-19 12:07:02 +02: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 [fix] pep8 part II. 2014-10-19 12:41:04 +02:00
webapp.py Merge https://github.com/asciimoo/searx into template_oscar 2014-10-26 19:11:28 +01:00