ZaclysIndustries
/
searxngRebrandZaclys
forked from zaclys/searxng
2
0
Fork 0
Code Issues Pull Requests Activity
5,131 Commits 3 Branches 17 Tags 53 MiB
Commit Graph

456 Commits

Author SHA1 Message Date
GazoilKerozen 1b700738eb
[fix] fix the reset button in the oscar theme (#2306) 
Rely on javascript instead of type="clear"

Close #2009
 2020-11-30 16:30:21 +01:00
Noémi Ványi 4a36a3044d
Add recoll engine (#2325) 
recoll is a local search engine based on Xapian:
http://www.lesbonscomptes.com/recoll/

By itself recoll does not offer web or API access,
this can be achieved using recoll-webui:
https://framagit.org/medoc92/recollwebui.git

This engine uses a custom 'files' result template

set `base_url` to the location where recoll-webui can be reached
set `dl_prefix` to a location where the file hierarchy as indexed by recoll can be reached
set `search_dir` to the part of the indexed file hierarchy to be searched, use an empty string to search the entire search domain
 2020-11-30 08:35:15 +01:00
Marc Abonce Seguin 8d71420b45 [mod] separate index and search routes 
This makes it easier to separately handle search and index requests
from a web server or from a reverse proxy.

If a request to index contains a query, a permanent redirect HTTP response
is returned. This should give some level of backwards compatibility
for users that have set a searx instance in their browser's search bar.
 2020-11-02 20:04:03 -07:00
Alexandre Flament c23401e9fa [fix] simple theme: fix autocomplete 
AJAX requests send the X-Requested-With HTTP header,
so searx.webapp.autocompleter returns the results with the expected data format.

Related to #2127
Close #2203
 2020-09-19 10:13:05 +02:00
Marc Abonce Seguin 7e82817925 wait for img to load before hiding infobox toggle 2020-09-10 09:54:30 +02:00
Marc Abonce Seguin a2430154b9
fix selects in preferences so they look consistent (#2150) 2020-08-27 21:55:47 +02:00
Marc Abonce Seguin 0601f2bb48 add toggle to resize infobox 2020-08-10 00:12:45 -07:00
Marc Abonce Seguin 57bad502a6 add visually-hidden css class to pointhi style 2020-08-09 20:44:26 -07:00
Marc Abonce Seguin 74270a3fc2 add class for infobox's official url 2020-08-09 20:44:26 -07:00
Marc Abonce Seguin 001eb047cd set max-height on infobox's images 2020-08-09 20:44:26 -07:00
Noémi Ványi 74013c212a Revert "[enh] new plugin to open results on new browser tabs" 
This reverts commit ab6a7601cb.

Closes #2037
 2020-07-29 22:10:16 +02:00
Adam Tauber 164e4725f3 [mod] add dedicated directory to external plugins with gitignore file 2020-07-28 13:10:40 +02:00
Adam Tauber 3227695b0b [fix] indicate visually active tab programmatically on the page Preferences - #350 2020-07-06 13:07:45 +02:00
Noémi Ványi 223114c575 [fix] refine contrast ratios of texts and borders - #350 2020-07-02 16:24:58 +02:00
Markus Heiser f14a7add31 Merge branch 'master' of https://github.com/asciimoo/searx into csp-oscar-theme 2020-06-30 15:37:39 +02:00
Adam Tauber cc164abdfc [fix] make "Advanced settings" openable and usable with keyboard - #350 2020-06-25 19:50:26 +02:00
Adam Tauber a984afd6a3 [enh] make checkboxes in preferences accessible using keyboard - #350 2020-06-23 21:45:57 +02:00
Adam Tauber cc84566e0a [enh] add visually hidden but accessible css class - #350 2020-06-23 21:45:57 +02:00
Markus Heiser ca1c3bd15d
Merge branch 'master' into csp-oscar-theme 2020-06-19 04:51:02 +00:00
Noémi Ványi 4ec2fab583 Consider HTTP request when running search categories on select is enabled 
Closes #1138
 2020-06-18 23:06:09 +02:00
Markus Heiser cc721b5d86 Merge branch 'master' of https://github.com/asciimoo/searx into csp-oscar-theme 2020-06-16 10:17:03 +02:00
Adam Tauber 4ca0d8cb0f [enh] add translatable strings to javascript - closes #461 2020-06-15 18:31:14 +02:00
Markus Heiser e088b95e74 Merge branch 'master' of https://github.com/asciimoo/searx into csp-oscar-theme 2020-06-10 07:25:44 +02:00
Adam Tauber 43f7b84a59 [fix] do not stretch images - fixes #1262 2020-06-10 00:30:39 +02:00
Markus Heiser d065b9e4fb
Merge branch 'master' into csp-oscar-theme 2020-06-09 08:28:53 +00:00
Adam Tauber c6ca468df2 [fix] wrap long lines in infoboxes - fixes #1652 2020-06-04 23:22:44 +02:00
Markus Heiser 434e452d54 Merge branch 'master' of https://github.com/asciimoo/searx into csp-oscar-theme 2020-06-04 23:18:22 +02:00
Adam Tauber 08fdfc73fb [fix] do not autocomplete for pressing enter when mouse is on the completion list - fixes #340 2020-06-03 15:36:22 +02:00
Adam Tauber 47cddcab8b [mod] reduce the gap between results 2020-06-03 15:04:01 +02:00
Adam Tauber bab5efeac9 [enh] update npm dependency versions 2020-06-03 13:44:55 +02:00
Adam Tauber f47e6fc0f8 [enh] build css after less file changes 2020-06-03 13:44:40 +02:00
Adam Tauber ceedab6aed
Merge pull request #983 from ahangarha/patch-1 
Update results.less
 2020-06-03 13:35:21 +02:00
Markus Heiser a3431d59d3 Merge branch 'master' of https://github.com/asciimoo/searx into csp-oscar-theme 2020-06-01 09:18:51 +02:00
Noémi Ványi d7d89369cb add disable all and allow all engines button to Oscar preferences 2020-05-31 23:39:21 +02:00
Markus Heiser c9f9e7da52 [build] rebuild of the oscar theme, build from ad208378 
the CSS files has been build by:

    $ make themes.oscar

Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2020-05-15 10:23:21 +02:00
Markus Heiser ad208378bb [fix] oscar theme, remove inline style attributes (CSP compliants) 
Inline styles are blocked by default with Content Security Policy (CSP).  Move
the rest of inline styles to CSS and correct the HTML template of the oscar
preference page.

Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2020-05-15 10:16:49 +02:00
Markus Heiser 6846402d73 .gitignore: make package-lock.json visible 
Even if we do not versioning them right now.

Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2020-03-26 15:35:32 +01:00
Markus Heiser d471ec86dd Makefile: add target node.env - download & install npm dependencies 
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2020-03-25 16:38:52 +01:00
Markus Heiser 757ebb5d9f [fix] brands: add variables from build env to grunt process 
We have some variables in the build environment which are also needed in the
grunt process when building themes.  Theses variables are relavant if one
creates a fork with its own branding.  We treat these variables under the term
'brands'.

Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2020-03-25 14:09:47 +01:00
Adam Tauber 9a2f26d915 [enh] submit search on suggestion select - closes #807 2020-03-23 14:01:33 +01:00
Adam Tauber 65cae85735 [fix] load new page with infinite scroll if there is no scrollbar - fixes #759 2020-03-23 13:05:19 +01:00
Markus Heiser e64ff38217
Merge branch 'master' into fix-infinite-scroll 2020-01-28 10:59:03 +00:00
Nick Espig 0ae86cd168
Fix not jumping to results loaded by infinite scroll 
Infinite scroll adds a `hr` tag to split up the sections loaded by it.
The vim bindings `j` and `k`, which jump to the next and previous result
respectively, search for a **direct** sibling with the class `result`.
With the `hr` between results a direct sibling cannot be found. To fix
this we remove the restriction of it having to be a direct sibling.
 2019-12-16 19:31:29 +01:00
Dalf 0e7b6c9a03 [mod] infinite scroll: XHR requests are sent with the header "Accept: text/html". 
Fix https://github.com/searx/searx-docker/issues/16
 2019-12-11 14:34:25 +01:00
Markus Heiser 2a5c39e33c theme: oscar - tidy up trailing whitespaces and tab usage 
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2019-12-10 18:10:33 +01:00
Markus Heiser 56b7e05721 themes: remove CR from newlines 
Adding a CR in  some files and in others not,  is  a good starting point for a
DOS+Unix mess we all have already seen in many projects.

Patch fixes all files matching (even those comming from grunt's build)::

   find ./searx -exec file {} \; | grep CR

BTW: Same with mixing TAB and SPACE indent styles in one and the same file.  So
if sources are tuched here in this patch, its also fixed.

Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2019-12-08 15:33:46 +01:00
Noémi Ványi a6f20caf32 add initial support for offline engines && command engine 2019-10-16 15:52:48 +02:00
Dalf 6fbba63c83 oscar and simple themes: no inline script (allow A+ Content-Security-Policy) 2019-08-06 12:14:11 +02:00
Frank de Lange e4e8e6da4c Add image format and source information to display (#1567) 
Add image format and source information to display - needs changes to engines to actually display something. 

Displays result.source (website from which the image was taken) and result.img_format (image type and size).

Result is styled with result-format and result-source classes. See PR #1566 for an example of an engine which has the necessary changes.

Strip <span class="highlight">...</span> in the oscar image template.
 2019-08-06 09:31:24 +02:00
cy8aer 4dc792e1e2 [enh] add invidious engine. (#1657) 
closes #1372
 2019-08-02 13:25:25 +02:00
Nick Espig 06979fa082
Load next page shortly before hitting the bottom 
This improves the user experience by loading in the next entries shortly before him getting to the bottom. It makes the scrolling more smooth without a break in between.

It also fixes an error on my browser that scrolling never hits the defined number. When I debugged it I hit `.scrolltop` of 1092.5 and the `doc.height - win.height` of 1093, so the condition was never true.
 2019-06-04 18:22:02 +02:00
dalf 965eebd12b simple theme : remove unused files 2018-08-26 10:34:41 +02:00
Adam Tauber 666982bd35
Merge pull request #1244 from Venca24/master 
[UI] new youtube icon for oscar theme
 2018-08-19 13:20:54 +02:00
Alex 3ba0d0516e simple theme update 
- npm package update
- apply #1226
- implement vim help dialog
- display cookies and search URL with preferences
- allow to enable / disable Open Access DOI rewrite
- add a clear text button on the left of the search button
- implement #1011 : the HTML title page is not set when using POST
- remove searx/static/themes/simple/img/loader.gif
- use full width when only there are only images as result
 2018-08-14 17:21:30 +02:00
Author Name 7635ebb126 Min width 50 px to oscar theme category. #1158 2018-05-29 22:18:00 -04:00
rinpatch 7a036579b2 Hide buttons when infinite scrolling is enabled 2018-04-25 18:54:43 +03:00
Venca24 3867b9fba2 [UI] new youtube icon for oscar theme 2018-03-16 15:56:40 +01:00
Richard Nespithal 0314349b08
Fix Vim mode on Firefox 
Firefox automatically opens a built-in quick search when user
starts typing without selected input and the Vim shortcuts
are not triggered
 2018-03-05 13:41:37 +01:00
Adam Tauber 0fe6042cc9 [mod] add bottom margin to results - closes #1176 2018-02-07 22:17:31 +01:00
Adam Tauber a173c5b4e2 [enh] build oscar css 2018-01-31 18:13:59 +01:00
Matthew Olmsted c61e1a8165
Preserve image aspect ratio in results 
Noticed that images are often distorted in the results due to a hard minimum height.  This keeps the 4-per-row image results consistent in row height without distorting wider images.
 2018-01-24 10:40:42 -08:00
Noémi Ványi 0cb8a849da dark background for answers && no background for highlight 2017-12-20 17:10:52 +01:00
Adam Tauber df0b8ee527
Merge pull request #1109 from dalf/simple_magnet_svg 
simple theme : magnet.svg is replaced by a home made version
 2017-12-06 14:28:03 +01:00
Adam Tauber 46fb0d860e [enh] add dark version of oscar/logicodev 2017-12-05 22:05:19 +01:00
Alexandre Flament cc69b1cd87 simple theme : replace magnet.svg with a home made version 2017-12-05 21:58:17 +01:00
Noémi Ványi 31005f3121 use `change` function just like in case of language selection 
The previous version did not work in Chrome browser.

Closes #1102
 2017-11-30 22:33:54 +01:00
Dalf 9babe06a0e [mod] simple theme: add the license to different files. 2017-11-26 14:33:11 +01:00
Noémi Ványi 47ee15f5ce preferences: make supported/not supported labels 
Also, Time range support display was missing from RTL locales.
Now it is fixed.

Closes #558
 2017-10-06 22:08:24 +02:00
Alexandre Flament 57dc6b625f [fix] travis build : various fix about grunt builds 2017-08-13 13:41:59 +02:00
Alexandre Flament 10a24bdc2c [enh] add simple theme (WIP) 2017-08-06 16:04:21 +02:00
Mostafa Ahangarha b142e88391 Update results.less 
More gap between search results increase the readability. Currently, the result page is just filled with text.
 2017-07-31 04:41:53 +04:30
marc 80460be8f6 [fix] wrap suggestions inside suggestion box 
long suggestions now wrap around the box instead of going overboard.
 2017-06-25 22:20:35 +02:00
Alexandre Flament e4d46d21c7 [mod] oscar theme: use tinypng.com to reduce logos and favicon 2017-03-08 16:09:13 +01:00
Alexandre Flament e9785a69c7 [mod] reduce png and gif image sizes using optipng and gifsicle tools. 2017-03-08 16:09:13 +01:00
Adam Tauber ee1d44caf9 [mod] darker green url in logicodev 2017-01-27 13:55:52 +01:00
Adam Tauber 4906ac5192 [fix] add padding to pointhi theme's navbar - closes #841 2017-01-27 13:47:19 +01:00
Noémi Ványi d88950c25f [fix] darker green for result urls 2017-01-27 01:21:48 +01:00
Noémi Ványi d635b5fd4d [enh] make navbar smaller 2017-01-26 23:52:00 +01:00
Noémi Ványi 8354bd0c60 [enh] make result url green 2017-01-26 23:33:12 +01:00
Adam Tauber 30695265c2 [enh] search input design mods according to #226 2017-01-26 21:12:41 +01:00
jcherqui d98705bd06 Add 1337x icon 2017-01-15 16:13:23 +01:00
Noémi Ványi e8319fa2cb Revert "Merge pull request #793 from kvch/pics-modal" 
This reverts commit bff41987a4, reversing
changes made to d08108be62.
 2017-01-03 22:04:09 +01:00
Noémi Ványi 8af29d9797 Revert "Merge pull request #799 from kvch/modal-arrows" 
This reverts commit 79ceb13577, reversing
changes made to eaa0fb8102.
 2017-01-03 22:03:59 +01:00
Noémi Ványi d18d09a98b [fix] change modal glyphicon arrows to image icons 2016-12-30 14:59:46 +01:00
Noémi Ványi 1710043eb7 remove unnecessary media query && generated files 2016-12-29 23:40:23 +01:00
Noémi Ványi 420ef433ae add img pagination support of infinite scroll 2016-12-29 23:40:23 +01:00
Noémi Ványi 2ec6034c85 add modal window for pointhi style 2016-12-29 23:40:23 +01:00
Noémi Ványi 1157cefb1e add generated css of modal window 2016-12-29 23:40:23 +01:00
Noemi Vanyi 5fa6af648d add own pics modal window 2016-12-29 23:40:23 +01:00
marc a11230819f automatic search when language is selected 2016-12-13 19:32:00 -06:00
Adam Tauber 7986d4cf41 [fix] correct path for autoscroll on non-root urls 
closes #758
 2016-12-04 11:17:17 +01:00
Adam Tauber 142cd87095 [fix] menu style in pointhi oscar theme 2016-11-02 12:26:54 +01:00
Adam Tauber 9782633054 [fix] menu without js - closes #747 2016-11-01 23:12:46 +01:00
Adam Tauber bee7b497a3 [mod] rename "default" theme to "legacy" 2016-09-22 23:51:07 +02:00
Adam Tauber b816752719 [enh] more compact image results ++ fixed modal links 2016-09-06 00:26:32 +02:00
Adam Tauber 3a1b6fa818 [fix] replace modal-content class to prevent remote content load 
details: http://stackoverflow.com/questions/18378720/bootstrap-3-with-remote-modal
 2016-09-06 00:15:29 +02:00
Adam Tauber 94b5f2ca77 [fix] result url wrap - closes #652 2016-09-05 21:57:49 +02:00
Adam Tauber 959497e26b [fix] remove trailing whitespaces 2016-09-05 21:56:19 +02:00
David A Roberts 678b9e994a [enh] infinite scroll 
resolves #649
 2016-08-11 19:16:42 +10:00
Adam Tauber 975bd5beb5 [fix] oscar grunt css build 2016-08-10 14:50:36 +02:00
Noémi Ványi e7f93f4f12 set type of cursor to pointer in advanced search 2016-08-09 15:51:34 +02:00
Noemi Vanyi c59ef83353 redesign toggle button of engines && plugins 2016-08-07 23:25:27 +02:00
Adam Tauber bf92aa3fdd [fix] wrap categories on small screens ++ some code formatting - closes #647 2016-07-27 02:08:24 +02:00
Noemi Vanyi 90e74fbb28 search on filter select 2016-07-25 23:40:31 +02:00
Noemi Vanyi 713d30400b add advanced settings to pointhi style 2016-07-25 23:28:14 +02:00
Noemi Vanyi 074521fd8a follow up changes in search_category_on_select 2016-07-25 23:26:26 +02:00
Noemi Vanyi 2e8ab34d76 add advanced settings for logicodev style 2016-07-25 23:26:26 +02:00
Adam Tauber 3a9c3fbd68 Merge pull request #644 from dalf/logicodev_fix 
[fix] close #637 : the search box doesn't overlap the menu.
 2016-07-25 18:50:47 +02:00
Alexandre Flament e655e44133 [fix] close #637 : the search box doesn't overlap the menu. 2016-07-25 15:45:58 +02:00
Alexandre Flament 34835b77e2 [fix] Close #640 : remove MapQuest maps. Add in comment maps.wikimedia.org maps, see https://www.mediawiki.org/wiki/Maps 2016-07-25 15:28:25 +02:00
Noemi Vanyi c428f2d980 [fix] remove unecessary capitalize of name of instance 2016-07-02 16:48:58 +02:00
Adam Tauber 5924abd483 [fix] mobile navbar errors - closes #596 2016-06-28 21:17:33 +02:00
Adam Tauber 1ee2a3d25d [mod] more compact logicodev skin 2016-06-26 14:34:08 +02:00
Adam Tauber 7013c3dc0d [fix] logo responsivity ++ preferences button hover 2016-06-26 14:12:35 +02:00
Adam Tauber f496dc353d [enh] oscar theme redesign added 
The original code made by @logico-dev (#559)
 2016-06-26 01:57:43 +02:00
Kirill Isakov c12e41a80f Fix result selection for top & bottom scrolling 2016-04-24 21:18:27 +06:00
Kirill Isakov 7b48a66350 Add auto page scrolling to selected result 2016-04-24 21:04:53 +06:00
Kirill Isakov 0d6625e070 Add search result navigation support 2016-04-24 18:01:02 +06:00
Kirill Isakov 1faf1b645b Set vim-hotkeys help panels to same height 2016-04-24 03:02:33 +06:00
Kirill Isakov 3246541bdc [WIP] Add vim-hotkeys plugin 2016-04-23 22:26:02 +06:00
a01200356 4267b11a45 [fix] apply changes in infobox's styles 
changes were made for wolframalpha infobox:

    - wrap text inside infobox.
      for example, there's a hill in New Zealand called
      Taumatawhakatangihangakoauauotamateapokaiwhenuakitanatahu
      (don't blame me, blame the Kiwis)
      and now it doesn't break the infobox.

    - add an optional image field for infobox's attributes.
      (doesn't affect ddg infobox at all)

    - table is now always split in half.
      needed so that images stay inside infobox.
      (max-width doesn't work for inline elements, it's the table
      that has to set the width.

if you don't like how the table width looks now in ddg/wiki's infobox,
i can change that code so that the style only applies when using
wolframalpha.
 2016-02-27 19:19:04 -06:00
Adam Tauber 4e5af8d87b [mod] move plugin static files to static/plugins 2016-02-10 18:06:11 +01:00
Adam Tauber ab6a7601cb [enh] new plugin to open results on new browser tabs 2016-02-10 18:04:04 +01:00
Adam Tauber 5eabba2da1 [mod] list all engines of a result 2015-10-03 17:46:12 +02:00
Niklas Haas 7144c94e26
[fix] reduce server traffic by optimizing images 
Simply running ‘optipng’ on every PNG image reduces the overall size of
them by 10% on average.
 2015-06-22 01:49:07 +02:00
Adam Tauber e19eeeefa0 [fix] do not submit form if there is no search query - fixes #341 2015-05-27 23:26:24 +02:00
Adam Tauber f79f6713b0 [fix] do not use category select js if there is no search query field on the page 2015-05-27 22:43:49 +02:00
Adam Tauber 952473d297 Merge pull request #246 from Cqoicebordel/pix-arts 
New theme !
 2015-04-25 12:52:07 -04:00
Adam Tauber 973c97c85b [enh] new plugin: search on category select (currently only in oscar theme) 
TODO
purge mootools from default/courgette and integrate jquery ++ this theme
 2015-04-12 19:27:48 +02:00
Cqoicebordel 5c63f2a80a A bit of cleanup 2015-02-17 19:01:18 +01:00
Cqoicebordel af100afb98 Change font 2015-02-17 18:50:57 +01:00
Cqoicebordel e181041f11 Ajax loading + Tweaks of CSS 2015-02-17 01:07:14 +01:00
Cqoicebordel f7b052c354 Allow autocompleter to work in a sub folder of the domain name. 2015-02-16 14:45:42 +01:00
Cqoicebordel d740e7384a New Theme, Pix-art. 
First commit
 2015-02-15 19:09:17 +01:00
Cqoicebordel d4ba97d00d Engine table in preference page in Courgette text-aligned to the right in RTL 2015-02-11 22:00:13 +01:00
Adam Tauber df9cf9d09b Merge branch 'rtl' of github.com:Cqoicebordel/searx 2015-02-10 15:23:56 +01:00
Cqoicebordel 71ae75d73e Extract color 2015-01-19 22:04:53 +01:00
Cqoicebordel 9b2187b261 Change theme to allow the logo to be text instead of image 2015-01-19 21:24:46 +01:00
Thomas Pointhuber 9c94b1a00a [update] bootstrap.min.css 2015-01-18 13:55:45 +01:00
Thomas Pointhuber 1f00ce8527 Revert: [enh] add new bootstrap-themes to oscar-template 2015-01-18 13:54:24 +01:00
Thomas Pointhuber 7366a0e141 [fix] add wordwrap to fix style issues 2015-01-18 13:42:31 +01:00
Thomas Pointhuber 096ffd0659 [enh] add new bootstrap-themes to oscar-template 2015-01-18 12:00:38 +01:00
Cqoicebordel 14447a0761 Modify courgette theme and less it. 2015-01-16 00:55:28 +01:00
Cqoicebordel 4f14f6cd26 New icons for Courgette 2015-01-16 00:29:11 +01:00
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
Adam Tauber c5599e3c7c Merge pull request #174 from pointhi/nojs_fix 
add no javascript support to oscar-template
 2015-01-15 17:05:44 +01:00
Thomas Pointhuber 5bfaabeb6b [enh] add nojs support into oscar-template 2015-01-15 15:48:50 +01:00
Cqoicebordel 08df681b48 Tweaks of color and theme 2015-01-15 01:46:01 +01:00
Cqoicebordel ceb650a01f Add lots of icons 2015-01-15 01:00:48 +01:00
Adam Tauber 410dbc573b [enh] static content generalization 2015-01-12 14:54:16 +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
Cqoicebordel b918cd2b8e Whitespace correction 2015-01-05 02:09:11 +01:00
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).
 2015-01-05 02:04:23 +01:00
Adam Tauber 20c4de8f06 [fix] filename strip 2015-01-01 18:06:51 +01:00
Adam Tauber 8151585918 [fix] static file paths 2015-01-01 17:54:33 +01:00
Adam Tauber 9f12605f7e [enh] themes static content refactor 2015-01-01 17:48:12 +01:00
Thomas Pointhuber 67698ad29a [enh] add new favicons to oscar template 2014-12-28 15:46:03 +01:00
Thomas Pointhuber a7adcacd04 [enh] add new marker-icons for map 
fetched from https://github.com/pointhi/leaflet-color-markers
 2014-12-28 15:10:42 +01:00
Thomas Pointhuber a0293d6196 [enh] move favicons into own directory 2014-12-28 15:07:11 +01:00
Thomas Pointhuber d810763107 [enh] remove repeating codeparts inside the oscar template 2014-12-22 16:07:02 +01:00
Thomas Pointhuber 7b44fd47a7 [enh] improve grunt-file for oscar_template 2014-12-22 15:28:23 +01:00
Thomas Pointhuber 7adb17452d [enh] add result_templates/code.html 2014-12-20 23:33:03 +01:00
Cqoicebordel 2fe3323449 Add double clic on categories 
Allow to double clic on any category to activate or deactivate all categories.
 2014-12-19 06:11:46 +01:00
Cqoicebordel 2ab621c0e3 Some more path issues 2014-12-19 05:05:12 +01:00
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.
 2014-12-18 15:51:09 +01:00
Thomas Pointhuber 7895e4f7a7 [enh][oscar_template] replace kickass icon 2014-12-15 10:49:35 +01:00
Cqoicebordel e623ee593a Add icons and badge for the themes 
Add kickass in engine list
Add content for the result from kickass
 2014-12-14 23:27:27 +01:00
Adam Tauber 45734ee5f4 Merge pull request #136 from pointhi/template_oscar_fix 
[oscar_template] split up js-files, FIX #132
 2014-12-01 21:02:14 +01:00
Thomas Pointhuber e687f5c290 [enh][oscar_template] split js-files and compile them together 2014-11-30 13:21:58 +01:00
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
 2014-11-20 15:49:31 +01:00
Thomas Pointhuber 08f4b7f506 [fix][template_oscar] make overpass-api call over https 
and add better error message if ajax-call fail
 2014-11-20 15:31:00 +01:00
Thomas LEBEAU 3ed43cf31a responsive theme courgette 2014-11-20 15:14:03 +01:00
Adam Tauber 075a5fe898 Merge pull request #127 from pointhi/template_oscar_map 
Template oscar, add map support
 2014-11-19 16:19:03 +01:00
Thomas Pointhuber 4b75d41f86 [enh][oscar_template] loading map informations from overpass-api 2014-11-19 15:49:55 +01:00
Adam Tauber 1a81c20d73 [fix] sidebar overflow 2014-11-18 20:30:06 +01:00
Adam Tauber 6b31f55c90 [fix] suggestions display 2014-11-18 19:53:38 +01:00
Adam Tauber b8efd1214f [enh] category select warning message 2014-11-18 19:44:33 +01:00
Adam Tauber cb15a21681 [fix] syggestions max width 2014-11-18 19:03:52 +01:00
Adam Tauber 0d80d5d3b4 Merge pull request #105 from pointhi/template_oscar 
new template: oscar
 2014-11-11 09:36:39 +01:00
Thomas Pointhuber 3b7b106684 [enh] template_oscar: add layer to leaflet map 2014-11-03 18:47:18 +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 b2c976a5a3 [enh] template_oscar: maxZoom if fitting bounds 2014-11-02 22:35:06 +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 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
 2014-10-26 19:11:28 +01:00
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
 2014-10-26 11:14:05 +01:00
dalf be4d219ae7 [mod] use pngcrush to reduce the size of png files 2014-10-25 17:07:39 +02:00
dalf 400279182e [fix] no horizontal scrolling on small screen 
[fix] small images in the results aren't not "zoomed"
 2014-10-25 17:05:37 +02:00
Thomas Pointhuber c36c935b03 oscar template: add infobox 2014-10-05 15:46:43 +02:00
Thomas Pointhuber 517e57b996 oscar template: improve result icons 2014-10-05 14:40:47 +02:00
Thomas Pointhuber 55b9b10d2e oscar template: include typeahead.css into bootstrap.min.css 2014-10-05 14:40:47 +02:00
Thomas Pointhuber f4457da0a1 oscar template: using less to generate oscar.min.css 2014-10-05 14:40:47 +02:00
Thomas Pointhuber 841f1eedfc oscar template: generate bootstrap.min.css from source 2014-10-05 14:40:47 +02:00
Thomas Pointhuber 14b0604bc0 oscar template: implement autocompleter 2014-10-05 14:40:47 +02:00
Thomas Pointhuber 4b7164f04a oscar template: remove unused css file 2014-10-05 14:40:46 +02:00
Thomas Pointhuber dc2c136220 oscar template: little style improvements 2014-10-05 14:40:46 +02:00
Thomas Pointhuber 47d1caed61 oscar template: add forgoten github icon 2014-10-05 14:40:46 +02:00
Thomas Pointhuber b91b77e335 oscar template: improve result page 
* add paging support
* add suggestion panel
* add links panel
 2014-10-05 14:40:46 +02:00
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
 2014-10-05 14:40:46 +02:00
Thomas Pointhuber a538bed745 oscar template: implement search input, index page,... 2014-10-05 14:40:46 +02:00