Commit Graph

4 Commits (0f81aa8410623e790f4ad01b32e2b37f6258356a)

Author SHA1 Message Date
Cqoicebordel 032f9bb1c9 Revert some wrong merge to allow torrents links to be visible 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
Thomas Pointhuber d810763107 [enh] remove repeating codeparts inside the oscar template 10 years ago
Thomas Pointhuber a538bed745 oscar template: implement search input, index page,... 10 years ago