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

..

__init__.py

[enh] using the logger

2015-01-09 04:13:05 +01:00

500px.py

Flake8 and Twitter corrections

2014-12-29 21:31:04 +01:00

bing_images.py

[fix] pep8 : engines (errors E121, E127, E128 and E501 still exist)

2014-12-07 16:37:56 +01:00

bing_news.py

[fix] pep8

2014-12-16 17:26:16 +01:00

bing.py

[fix] pep8 : engines (errors E121, E127, E128 and E501 still exist)

2014-12-07 16:37:56 +01:00

currency_convert.py

[fix] pep8 : engines (errors E121, E127, E128 and E501 still exist)

2014-12-07 16:37:56 +01:00

dailymotion.py

Integrated media in results + Deezer Engine

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

deezer.py

Remove print

2015-01-05 20:24:33 +01:00

deviantart.py

[fix] pep8 : engines (errors E121, E127, E128 and E501 still exist)

2014-12-07 16:37:56 +01:00

digg.py

Digg correction

2015-01-03 23:54:02 +01:00

duckduckgo_definitions.py

[mod] purge local html_to_text

2015-01-01 14:14:56 +01:00

duckduckgo.py

[fix] pep8 : engines (errors E121, E127, E128 and E501 still exist)

2014-12-07 16:37:56 +01:00

dummy.py

[fix] pep8 : engines (errors E121, E127, E128 and E501 still exist)

2014-12-07 16:37:56 +01:00

faroo.py

[fix] pep8

2014-12-16 17:26:16 +01:00

filecrop.py

[enh] paging support for filecrop

2014-01-30 01:14:08 +01:00

flickr-noapi.py

[fix] pep8

2015-01-02 12:33:40 +01:00

flickr.py

Flake8 and Twitter corrections

2014-12-29 21:31:04 +01:00

generalfile.py

[fix] pep8 : engines (errors E121, E127, E128 and E501 still exist)

2014-12-07 16:37:56 +01:00

github.py

[fix] pep8 : engines (errors E121, E127, E128 and E501 still exist)

2014-12-07 16:37:56 +01:00

google_images.py

[fix] pep8

2014-12-16 17:26:16 +01:00

google_news.py

[fix] pep8 : engines (errors E121, E127, E128 and E501 still exist)

2014-12-07 16:37:56 +01:00

google.py

[mod] image results removed from google engine

2014-12-09 00:53:09 +01:00

json_engine.py

[mod] len() removed from conditions

2014-02-11 13:13:51 +01:00

kickass.py

Flake8 and Twitter corrections

2014-12-29 21:31:04 +01:00

mediawiki.py

[fix] pep8

2014-12-16 17:10:20 +01:00

openstreetmap.py

[fix] pep8

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

photon.py

[fix] fix language support in photon engine

2014-12-20 10:25:53 +01:00

piratebay.py

[fix] piratebay url

2014-12-11 15:28:04 +01:00

searchcode_code.py

Flake8 and Twitter corrections

2014-12-29 21:31:04 +01:00

searchcode_doc.py

Flake8 and Twitter corrections

2014-12-29 21:31:04 +01:00

soundcloud.py

Integrated media in results + Deezer Engine

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

stackoverflow.py

[fix] pep8 : engines (errors E121, E127, E128 and E501 still exist)

2014-12-07 16:37:56 +01:00

startpage.py

[mod] ignore startpage unicode errors

2015-01-09 11:21:46 +01:00

subtitleseeker.py

[fix] pep8

2015-01-02 12:33:40 +01:00

twitter.py

Flake8 and Twitter corrections

2014-12-29 21:31:04 +01:00

vimeo.py

Merge branch 'integrated-videos' of https://github.com/Cqoicebordel/searx into Cqoicebordel-integrated-videos

2015-01-07 11:48:36 +01:00

wikidata.py

[fix] pep8

2015-01-02 12:33:40 +01:00

xpath.py

[fix] error when xpath_results in extraxt_text is _ElementUnicodeResult instead of _ElementStringResult

2014-03-04 19:43:41 +01:00

yacy.py

[fix] pep8

2014-12-16 17:10:20 +01:00

yahoo_news.py

[fix] pep8 compatibility

2014-10-19 12:18:21 +02:00

yahoo.py

[fix] pep8

2014-12-16 17:26:16 +01:00

youtube.py

Integrated media in results + Deezer Engine

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