zaclys
/
searxng
mirror of https://github.com/searxng/searxng.git
1
0
Fork 1
Code Issues Packages Projects Releases Wiki Activity
7,413 Commits 5 Branches 17 Tags 71 MiB
Commit Graph

506 Commits

Author SHA1 Message Date
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
Cqoicebordel b918cd2b8e Whitespace correction 2015-01-05 02:09:11 +01:00
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).
 2015-01-05 02:04:23 +01:00
Adam Tauber 20c4de8f06 [fix] filename strip 2015-01-01 18:06:51 +01:00
Adam Tauber 8151585918 [fix] static file paths 2015-01-01 17:54:33 +01:00
Adam Tauber 9f12605f7e [enh] themes static content refactor 2015-01-01 17:48:12 +01:00