Commit Graph

13 Commits (14447a0761220ec352c889c9bc3d4ba22ee3494e)

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
Adam Tauber e5a323b288 [fix] favicon paths 10 years ago
Adam Tauber 798bef77f9 [fix] static content paths 10 years ago
Thomas Pointhuber a0293d6196 [enh] move favicons into own directory 10 years ago
Adam Tauber ada01cb367 Merge branch 'Detect-favicons' of https://github.com/Cqoicebordel/searx into Cqoicebordel-Detect-favicons
Conflicts:
	searx/templates/courgette/result_templates/default.html
	searx/templates/courgette/result_templates/map.html
	searx/templates/courgette/result_templates/videos.html
	searx/templates/default/result_templates/default.html
	searx/templates/default/result_templates/map.html
	searx/templates/default/result_templates/videos.html
	searx/webapp.py
10 years ago
Thomas Pointhuber 7adb17452d [enh] add result_templates/code.html 10 years ago
Cqoicebordel 83d6f36659 Final commit on favicons
Definitely remove engine array
Change every themes to accomodate that change
Tweak of video template of oscar to add link on video thumbnail
10 years ago
Cqoicebordel a809fd1bbb Multiple HTML corrections
Alt on favicon
Width of image should be 400 and not 400px
Correct alt+title on image
No <p> contains <p>
10 years ago
Cqoicebordel eef05c3ddc Alt on favicon 10 years ago
Cqoicebordel b043237c61 Correct alt and title 10 years ago
Cqoicebordel 74000c739d Alt on favicon 10 years ago
Thomas Pointhuber 740594a4b7 [enh] oscar_template: initial osm-map support for map results
* TODO: remove leaflet.min.css if not required
10 years ago
Thomas LEBEAU a28cfd4887 [new] theme courgette 10 years ago