Commit Graph

3 Commits (cb4a3fe598707fc42f86ea3f7bcf517dcd4db660)

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
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