searxng/searx
Adam Tauber 41e00e65a5 Merge branch 'oscar-cookies' of https://github.com/Cqoicebordel/searx into Cqoicebordel-oscar-cookies
Conflicts:
	searx/templates/oscar/preferences.html
2015-04-26 20:14:40 +02:00
..
engines Merge pull request #298 from dalf/ssl 2015-04-26 13:12:04 -04:00
plugins [mod] enable category select plugin by default 2015-04-26 18:57:03 +02:00
static Merge pull request #246 from Cqoicebordel/pix-arts 2015-04-25 12:52:07 -04:00
templates Merge branch 'oscar-cookies' of https://github.com/Cqoicebordel/searx into Cqoicebordel-oscar-cookies 2015-04-26 20:14:40 +02:00
tests Merge pull request #298 from dalf/ssl 2015-04-26 13:12:04 -04:00
translations [fix] russian translation syntax 2015-02-16 16:21:14 +01:00
__init__.py [mod] https rewrite pluginification 2015-04-13 00:30:12 +02:00
autocomplete.py [fix] timeout to autocompleters 2015-04-10 00:59:25 +02:00
languages.py add comments to languages.py 2014-09-13 18:32:28 +02:00
poolrequests.py [enh] basic support for http proxy (see #236) 2015-04-25 11:44:53 +02:00
query.py [enh] category specific engine deactivation - closes #205 2015-02-03 18:37:38 +01:00
search.py [mod] search return value 2015-03-08 23:30:31 +01:00
settings.yml Merge pull request #300 from dalf/patch-1 2015-04-26 12:34:01 -04:00
settings_robot.yml [fix] robot test config option update 2015-01-17 20:36:44 +01:00
testing.py fix: robot fw, entry points, some flake8, package searx egg 2014-01-20 01:06:29 +01:00
utils.py [fix] default blocked categories 2015-02-03 18:48:52 +01:00
version.py [enh] v0.7.0 2015-02-03 19:15:58 +01:00
webapp.py Merge pull request #298 from dalf/ssl 2015-04-26 13:12:04 -04:00