Adam Tauber
|
a04fafd419
|
Merge branch 'code_results' of https://github.com/pointhi/searx into pointhi-code_results
Conflicts:
searx/static/themes/default/css/style.css
searx/static/themes/oscar/css/oscar.min.css
searx/templates/oscar/result_templates/torrent.html
|
2015-01-15 18:26:00 +01:00 |
|
Thomas Pointhuber
|
525833bea7
|
[enh] disable js-based links if no js is available
|
2015-01-15 15:55:39 +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 |
|
Adam Tauber
|
e5a323b288
|
[fix] favicon paths
|
2015-01-01 19:52:05 +01:00 |
|
Thomas Pointhuber
|
d810763107
|
[enh] remove repeating codeparts inside the oscar template
|
2014-12-22 16:07:02 +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
|
002b812cc6
|
Use the new way of finding the favicon
|
2014-12-12 19:14:30 +01:00 |
|
Cqoicebordel
|
0b98f71ff0
|
HTML corrections
Add alt on favicons
Use right format for datetime
Remove pubdate tag
|
2014-12-08 01:19:05 +01:00 |
|
Thomas Pointhuber
|
4b75d41f86
|
[enh][oscar_template] loading map informations from overpass-api
|
2014-11-19 15:49:55 +01:00 |
|
Thomas Pointhuber
|
46dd502592
|
[fix][template][oscar] print ',' only if postcode is found
|
2014-11-04 12:58:12 +01:00 |
|
Thomas Pointhuber
|
c38917bb2a
|
[enh] template_oscar: show addressdata if possible
|
2014-11-03 18:46:58 +01:00 |
|
Thomas Pointhuber
|
2e7723a6c1
|
[enh] oscar_template: improve result visualisation
* highlight parts of result
* add link to archiv.to
* fix little bugs
* add little icons
* change style of "show map" button
|
2014-11-03 10:39:47 +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 |
|