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 |
|
Adam Tauber
|
e5a323b288
|
[fix] favicon paths
|
2015-01-01 19:52:05 +01:00 |
|
Adam Tauber
|
798bef77f9
|
[fix] static content paths
|
2015-01-01 19:24:47 +01:00 |
|
Thomas Pointhuber
|
a0293d6196
|
[enh] move favicons into own directory
|
2014-12-28 15:07:11 +01:00 |
|
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
|
2014-12-24 20:34:08 +01:00 |
|
Thomas Pointhuber
|
7adb17452d
|
[enh] add result_templates/code.html
|
2014-12-20 23:33:03 +01:00 |
|
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
|
2014-12-18 16:26:32 +01:00 |
|
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>
|
2014-12-10 18:14:29 +01:00 |
|
Cqoicebordel
|
eef05c3ddc
|
Alt on favicon
|
2014-12-10 18:11:59 +01:00 |
|
Cqoicebordel
|
b043237c61
|
Correct alt and title
|
2014-12-10 18:11:20 +01:00 |
|
Cqoicebordel
|
74000c739d
|
Alt on favicon
|
2014-12-10 18:10:19 +01:00 |
|
Thomas Pointhuber
|
740594a4b7
|
[enh] oscar_template: initial osm-map support for map results
* TODO: remove leaflet.min.css if not required
|
2014-11-02 13:00:28 +01:00 |
|
Thomas LEBEAU
|
a28cfd4887
|
[new] theme courgette
|
2014-08-18 10:45:05 +02:00 |
|