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
2015-01-15 18:26:00 +01:00
Adam Tauber
410dbc573b
[enh] static content generalization
2015-01-12 14:54:16 +01:00
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
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
