summaryrefslogtreecommitdiff
path: root/searx/templates/oscar/macros.html
AgeCommit message (Collapse)Author
2015-01-21Revert some wrong merge to allow torrents links to be visibleCqoicebordel
2015-01-09Merge branch 'master' of https://github.com/asciimoo/searx into code_resultsThomas Pointhuber
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
2014-12-22[enh] remove repeating codeparts inside the oscar templateThomas Pointhuber
2014-10-05oscar template: implement search input, index page,...Thomas Pointhuber