Commit Graph

9 Commits (a2c94895c1fbba0b20a07ee13b1185ae741db2de)

Author SHA1 Message Date
Alexandre Flament 34835b77e2 [fix] Close #640 : remove MapQuest maps. Add in comment maps.wikimedia.org maps, see https://www.mediawiki.org/wiki/Maps 8 years ago
Cqoicebordel f7b052c354 Allow autocompleter to work in a sub folder of the domain name. 10 years ago
Adam Tauber a04fafd419 Merge branch 'code_results' of https://github.com/pointhi/searx into pointhi-code_results
Conflicts:
	searx/static/themes/default/css/style.css
	searx/static/themes/oscar/css/oscar.min.css
	searx/templates/oscar/result_templates/torrent.html
10 years ago
Adam Tauber 410dbc573b [enh] static content generalization 10 years ago
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
10 years ago
Cqoicebordel b918cd2b8e Whitespace correction 10 years ago
Cqoicebordel 4a195e0b28 Integrated media in results + Deezer Engine
New "embedded" item for the results, allow to give an iframe to display the media directly in the results.
Note that the attributes src of the iframes are not set, but instead data-src is set, allowing to only load the iframe when clicked.

Deezer engine based on public API (no key).
10 years ago
Adam Tauber 8151585918 [fix] static file paths 10 years ago
Adam Tauber 9f12605f7e [enh] themes static content refactor 10 years ago