searxngRebrandZaclys/searx
Adam Tauber ada01cb367 Merge branch 'Detect-favicons' of https://github.com/Cqoicebordel/searx into Cqoicebordel-Detect-favicons
Conflicts:
	searx/templates/courgette/result_templates/default.html
	searx/templates/courgette/result_templates/map.html
	searx/templates/courgette/result_templates/videos.html
	searx/templates/default/result_templates/default.html
	searx/templates/default/result_templates/map.html
	searx/templates/default/result_templates/videos.html
	searx/webapp.py
2014-12-24 20:34:08 +01:00
..
engines Merge pull request #161 from Cqoicebordel/SubtitleSeeker-engine 2014-12-24 20:21:38 +01:00
https_rules [mod][fix] https rewrite refactor ++ fixes 2014-12-19 22:40:37 +01:00
static Add double clic on categories 2014-12-19 06:11:46 +01:00
templates Merge branch 'Detect-favicons' of https://github.com/Cqoicebordel/searx into Cqoicebordel-Detect-favicons 2014-12-24 20:34:08 +01:00
tests Correct test case 2014-12-13 20:30:19 +01:00
translations [enh] translation update 2014-11-26 20:42:16 +01:00
__init__.py [fix] pep8 part II. 2014-10-19 12:41:04 +02:00
autocomplete.py [fix] wikipedia autocompleter url param 2014-11-04 19:53:42 +01:00
https_rewrite.py [mod][fix] https rewrite refactor ++ fixes 2014-12-19 22:40:37 +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 [mod] better search request exception handling 2014-12-19 20:01:01 +01:00
settings_robot.yml update settings_robot.yml 2014-10-15 14:05:42 +02:00
settings.yml Merge pull request #161 from Cqoicebordel/SubtitleSeeker-engine 2014-12-24 20:21:38 +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] user agent string update 2014-11-22 18:37:42 +01:00
version.py [enh] v0.5.0 2014-12-08 23:57:36 +01:00
webapp.py Merge branch 'Detect-favicons' of https://github.com/Cqoicebordel/searx into Cqoicebordel-Detect-favicons 2014-12-24 20:34:08 +01:00