Commit Graph

212 Commits (84ff6e289ea608207755b01bc648575a87ea55ba)

Author SHA1 Message Date
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
10 years ago
Adam Tauber c5599e3c7c Merge pull request #174 from pointhi/nojs_fix
add no javascript support to oscar-template
10 years ago
Thomas Pointhuber 5bfaabeb6b [enh] add nojs support into oscar-template 10 years ago
Cqoicebordel 08df681b48 Tweaks of color and theme 10 years ago
Cqoicebordel ceb650a01f Add lots of icons 10 years ago
Adam Tauber 410dbc573b [enh] static content generalization 10 years ago
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
Cqoicebordel b918cd2b8e Whitespace correction 10 years ago
Cqoicebordel 4a195e0b28 Integrated media in results + Deezer Engine
New "embedded" item for the results, allow to give an iframe to display the media directly in the results.
Note that the attributes src of the iframes are not set, but instead data-src is set, allowing to only load the iframe when clicked.

Deezer engine based on public API (no key).
10 years ago
Adam Tauber 20c4de8f06 [fix] filename strip 10 years ago
Adam Tauber 8151585918 [fix] static file paths 10 years ago
Adam Tauber 9f12605f7e [enh] themes static content refactor 10 years ago
Thomas Pointhuber 67698ad29a [enh] add new favicons to oscar template 10 years ago
Thomas Pointhuber a7adcacd04 [enh] add new marker-icons for map
fetched from https://github.com/pointhi/leaflet-color-markers
10 years ago
Thomas Pointhuber a0293d6196 [enh] move favicons into own directory 10 years ago
Thomas Pointhuber d810763107 [enh] remove repeating codeparts inside the oscar template 10 years ago
Thomas Pointhuber 7b44fd47a7 [enh] improve grunt-file for oscar_template 10 years ago
Thomas Pointhuber 7adb17452d [enh] add result_templates/code.html 10 years ago
Cqoicebordel 2fe3323449 Add double clic on categories
Allow to double clic on any category to activate or deactivate all categories.
10 years ago
Cqoicebordel 2ab621c0e3 Some more path issues 10 years ago
Cqoicebordel 06b59c7210 [fix] Show map on result in Oscar
Allow to find the leafleet js when searx is not installed at the root of the web server.
10 years ago
Thomas Pointhuber 7895e4f7a7 [enh][oscar_template] replace kickass icon 10 years ago
Cqoicebordel e623ee593a Add icons and badge for the themes
Add kickass in engine list
Add content for the result from kickass
10 years ago
Adam Tauber 45734ee5f4 Merge pull request #136 from pointhi/template_oscar_fix
[oscar_template] split up js-files, FIX #132
10 years ago
Thomas Pointhuber e687f5c290 [enh][oscar_template] split js-files and compile them together 10 years ago
Adam Tauber 91384c1f31 Merge pull request #130 from pointhi/template_oscar_fix
[fix][template_oscar] make overpass-api call over https and add better error-message
10 years ago
Thomas Pointhuber 08f4b7f506 [fix][template_oscar] make overpass-api call over https
and add better error message if ajax-call fail
10 years ago
Thomas LEBEAU 3ed43cf31a responsive theme courgette 10 years ago
Adam Tauber 075a5fe898 Merge pull request #127 from pointhi/template_oscar_map
Template oscar, add map support
10 years ago
Thomas Pointhuber 4b75d41f86 [enh][oscar_template] loading map informations from overpass-api 10 years ago
Adam Tauber 1a81c20d73 [fix] sidebar overflow 10 years ago
Adam Tauber 6b31f55c90 [fix] suggestions display 10 years ago
Adam Tauber b8efd1214f [enh] category select warning message 10 years ago
Adam Tauber cb15a21681 [fix] syggestions max width 10 years ago
Adam Tauber 0d80d5d3b4 Merge pull request #105 from pointhi/template_oscar
new template: oscar
10 years ago
Thomas Pointhuber 3b7b106684 [enh] template_oscar: add layer to leaflet map 10 years ago
Thomas Pointhuber c38917bb2a [enh] template_oscar: show addressdata if possible 10 years ago
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
10 years ago
Thomas Pointhuber b2c976a5a3 [enh] template_oscar: maxZoom if fitting bounds 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 Pointhuber 0e1035eac1 Merge https://github.com/asciimoo/searx into template_oscar
Conflicts:
	searx/translations/de/LC_MESSAGES/messages.po
	searx/translations/en/LC_MESSAGES/messages.po
	searx/translations/es/LC_MESSAGES/messages.po
	searx/translations/fr/LC_MESSAGES/messages.po
	searx/translations/hu/LC_MESSAGES/messages.po
	searx/translations/it/LC_MESSAGES/messages.po
	searx/translations/nl/LC_MESSAGES/messages.po
	searx/webapp.py
10 years ago
dalf a71b326d9e [mod] default template modifications
- more smartphone friendly
- more text browser friendly
- next button always on the right
- in case of small screen supporting touch event, categories are displayed on one line with a scroll
10 years ago
dalf be4d219ae7 [mod] use pngcrush to reduce the size of png files 10 years ago
dalf 400279182e [fix] no horizontal scrolling on small screen
[fix] small images in the results aren't not "zoomed"
10 years ago
Thomas Pointhuber c36c935b03 oscar template: add infobox 10 years ago
Thomas Pointhuber 517e57b996 oscar template: improve result icons 10 years ago
Thomas Pointhuber 55b9b10d2e oscar template: include typeahead.css into bootstrap.min.css 10 years ago
Thomas Pointhuber f4457da0a1 oscar template: using less to generate oscar.min.css 10 years ago
Thomas Pointhuber 841f1eedfc oscar template: generate bootstrap.min.css from source 10 years ago
Thomas Pointhuber 14b0604bc0 oscar template: implement autocompleter 10 years ago
Thomas Pointhuber 4b7164f04a oscar template: remove unused css file 10 years ago
Thomas Pointhuber dc2c136220 oscar template: little style improvements 10 years ago
Thomas Pointhuber 47d1caed61 oscar template: add forgoten github icon 10 years ago
Thomas Pointhuber b91b77e335 oscar template: improve result page
* add paging support
* add suggestion panel
* add links panel
10 years ago
Thomas Pointhuber f3b565e17e oscar template: implement first version of results page
* implement results page
* improve search form template
* implement all result_templates
* fix youtube engine
10 years ago
Thomas Pointhuber a538bed745 oscar template: implement search input, index page,... 10 years ago
Thomas Pointhuber 25919de608 oscar template: make the categories clickable 10 years ago
Thomas Pointhuber afcfa04e30 oscar template: improve style for check and uncheck of engines 10 years ago
Thomas Pointhuber c21a907cac initial commit of the new template 'oscar'
* base.html mostly implemented
* stats.html implemented
* about.html implemented
* most of preferences.html implemented
* using bootstrap.js
10 years ago
Adam Tauber c58e5a236a [fix] preferences button display 10 years ago
Adam Tauber 5d7b63223f [mod] sidebar positioning 10 years ago
Dalf 6bfd566353 [enh] add infoboxes and answers 10 years ago
Adam Tauber 00e5262834 [enh] archive.org link added to results 10 years ago
Thomas LEBEAU 75853bd0b5 [courgette_theme] add autocomplete theme 10 years ago
Thomas LEBEAU 195ff7522e optim img bg 10 years ago
Thomas LEBEAU 1188907c4f remove artichaut.css 10 years ago
Thomas LEBEAU a28cfd4887 [new] theme courgette 10 years ago
Adam Tauber 6fb9eb8e47 [mod] select autocomplete results with mouse click 10 years ago
Adam Tauber d290c1b9ac [enh] github ribbon to landingpage 10 years ago
Matej Cotman 08eaffe245 add multi theming support 10 years ago
Adam Tauber 66f87f8117 [mod] right sidebar 11 years ago
Adam Tauber 7c48b0f7da [fix] suggestions margin 11 years ago
Adam Tauber ead8d30ea0 [mod] inline suggestions 11 years ago
Adam Tauber c761d93dd6 [mod] search field width 11 years ago
Adam Tauber 5d9d04a16e [enh] better highlighting 11 years ago
Adam Tauber 58de2801ce [fix] padding 11 years ago
Adam Tauber 47d548d6a2 [enh][mod] results ui refactor 11 years ago
Adam Tauber 41dd4d9ba3 [enh] autocompleter server side part 11 years ago
Thomas Pointhuber c8cf95aa56 deactivate autocompleter by default 11 years ago
Thomas Pointhuber 360543dec4 add forgotten search.less 11 years ago
Thomas Pointhuber e181fd8f56 edit style of autcompleter 11 years ago
Thomas Pointhuber 8abf4ab993 adding initial code for backend-part of autocompleter
including test-code
11 years ago
Thomas Pointhuber b5c695c6f5 edit style of autocompleter 11 years ago
Thomas Pointhuber ecd293c8a9 add front-part of autocompleter function 11 years ago
Adam Tauber c14e8fe0a5 [fix] #38 11 years ago
Adam Tauber fa26da1187 Merge branch 'master' of github.com:asciimoo/searx 11 years ago
Adam Tauber 06b9238786 [fix] #38 11 years ago
Thomas Pointhuber f159fc718f fix little style bug 11 years ago
Thomas Pointhuber c54baf6301 Adding style for publish Date 11 years ago
Thomas Pointhuber c8a1e0bda4 move *.less files into seperate directory 11 years ago
Thomas Pointhuber 3b31c60f07 fix little style errors 11 years ago
Thomas Pointhuber a6c9a571ac rewrite wrong variable name 11 years ago
Thomas Pointhuber 425ec3b707 Using .less instead of .css
to generate the .css file from the .less file run: $make styles
11 years ago
Adam Tauber 6ff57dfbe1 [enh] linkable search url display 11 years ago
Adam Tauber 8c8d9d10cb [fix] visited link color change 11 years ago
asciimoo 239299d45e [enh] result css mods 11 years ago
asciimoo c0013edcdd [enh] engine customisation init 11 years ago
asciimoo 2a788c8f29 [enh] search language support init 11 years ago
asciimoo 90a9342286 [mod] search input mods 11 years ago
asciimoo 3cc62341c5 [enh] ui mods 11 years ago