5 Commits

Author	SHA1	Message	Date
Adam Tauber	df9cf9d09b	Merge branch 'rtl' of github.com:Cqoicebordel/searx	2015-02-10 15:23:56 +01:00
Cqoicebordel	032f9bb1c9	Revert some wrong merge to allow torrents links to be visible	2015-01-21 18:03:11 +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
Thomas Pointhuber	d810763107	[enh] remove repeating codeparts inside the oscar template	2014-12-22 16:07:02 +01:00
Thomas Pointhuber	a538bed745	oscar template: implement search input, index page,...	2014-10-05 14:40:46 +02:00