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

2313 Commits

Author SHA1 Message Date
yujunqiang ed1c78d923 fix bug: TypeError: set(['bing', 'google']) is not JSON serializable, when curl 'http://127.0.0.1:8888/?q=xxxxxxxx&categories=general&format=json' 2017-11-15 21:31:27 +08:00
Adam Tauber 400e77b7fe [enh] update translations 2017-11-13 21:16:36 +01:00
pyrrh0n1c 4340c0b16c Fixed typos. 2017-11-07 14:14:20 +00:00
pyrrh0n1c 2231b02add Fixed the currency_convert engine. 2017-11-07 13:29:17 +00:00
Adam Tauber 00a7041daa
Merge pull request #1068 from Apply55gx/genius 
Continuation of PR #1004 (seems abandoned)
 2017-11-03 20:21:25 +01:00
Noémi Ványi 59c02e8e5f results: make engines of results set 
Previously, if a same result was returned from the
same engine, the name of the engine would be added
more than once. To eliminate engine name duplication
engine list was changed to set.
 2017-11-03 19:52:47 +01:00
Adam Tauber 7a9b18e9e9 [mod] add more error handling to json engine II. 2017-11-02 01:08:15 +01:00
Adam Tauber 181f1c6305 [mod] add more error handling to json engine 2017-11-02 00:43:29 +01:00
jibe-b b7eb80122e
[fix] update openairepublications 2017-11-02 00:10:08 +01:00
jibe-b 3e9cc1474f
[add] OpenAIRE publication engine 
and modifies OpenAIRE datasets engine
 2017-11-01 22:26:33 +01:00
Noémi Ványi 5954a8e16a minor fix of BASE engine 2017-11-01 17:02:38 +01:00
Noémi Ványi d20bba6dc7 minor fixes of pubmed engine 
Closes #1045
 2017-11-01 17:02:38 +01:00
jibe-b df0d915806 [add] pubmed engine 2017-11-01 17:02:38 +01:00
Noémi Ványi 1b10abfc92 minor fixes of doi resolver 
Closes #1047
 2017-11-01 17:02:38 +01:00
jibe-b 575159b194 [enh] oa_doi_rewrite plugin broadens doai_rewrite 2017-11-01 14:22:26 +01:00
Noémi Ványi 7de8b43eb2 add OpenAIRE engine as a json engine 
This is the continuation of #1048 created by @jibe-b.

Closes #1048
 2017-11-01 14:22:22 +01:00
Noémi Ványi 9c2b7a82f0 minor fixes of arxiv 
Closes #1050
 2017-11-01 14:22:22 +01:00
jibe-b e391b2d970 [fix] remove .encode for python3 compatibility 2017-11-01 11:54:55 +01:00
jibe-b 5278fa666c [enh] use format to concatenate strings 2017-11-01 11:54:38 +01:00
jibe-b 3e3672e079 [add] arxiv engine 2017-11-01 11:54:16 +01:00
Adam Tauber 6d28e9d694 [enh] update translations 2017-11-01 11:03:22 +01:00
Adam Tauber 8901b7bddb [fix] pep8 2017-10-26 00:10:57 +02:00
Adam Tauber 5f758b2d39 [mod] compress saved preferences in url 2017-10-26 00:06:03 +02:00
Apply55gx d800e3fcfa Merge pull request #1 from asciimoo/master 
-
 2017-10-25 10:44:28 +02:00
Apply55gx 18a4e7035f removed unused indicies array 2017-10-25 10:42:37 +02:00
Hypolite Petovan d506d87f60 Remove / in url_for parameter for simple theme 
Same change as with the oscar theme.
 2017-10-18 23:45:30 -04:00
Hypolite Petovan 904a8e7e3f Remove extra / in url_for parameter for oscar theme 
The `filename` parameter of the `url_for` function doesn't need a leading `/`, or else the resulting URL features a double-slash `//` that throws off searx 0.12.0 with Apache 2.4.25 on Debian, resulting in missing favicons.
 2017-10-18 23:44:11 -04:00
marc 44085e31d0 update engines_languages.json and languages.py 
Also, fix fetch_languages.py so it can run on python3.
 2017-10-10 16:53:28 -05:00
marc a524dbb823 [fix] language support for bing images and videos 2017-10-10 16:49:49 -05:00
Adam Tauber 1adc8d6e26 Merge pull request #1059 from kvch/preferences-support-intuitive 
preferences: make supported/not supported labels
 2017-10-07 19:14:16 +02: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
Adam Tauber e2afc1cdba [mod] disable yahoo by default 
closes #869
closes #1055
 2017-10-06 20:16:03 +02:00
Adam Tauber eddc162f2c [fix] remove duplicated german translation - closes #937 2017-09-27 00:20:16 +02:00
Adam Tauber bd48df289f Merge pull request #1035 from misnyo/voat 
[fix] voat.co search xpath and url fixed
 2017-09-26 23:25:01 +02:00
Noémi Ványi e73cb14889 fix hmac python3 compatibility 2017-09-08 21:33:11 +02:00
misnyo ae99f9070c [fix] static path fixed in templates and webapp, line endings fixed 2017-09-08 20:33:14 +02:00
misnyo 043143c898 [fix] voat.co search xpath and url fixed 2017-09-04 20:36:27 +02:00
misnyo 33fd938016 [mod] int_or_zero refactored to searx_utils 2017-09-04 20:05:04 +02:00
misnyo c3232b0e1a Merge branch 'master' into nyaa 2017-09-04 17:48:25 +02:00
Adam Tauber 688801076d Merge pull request #1017 from misnyo/geektimes 
[fix] geektimes.ru xpath fix
 2017-09-03 23:10:05 +02:00
Adam Tauber 234366b900 Merge pull request #1018 from misnyo/generalfile 
[mod]generalfile engine removed
 2017-09-03 23:09:49 +02:00
Adam Tauber c505c3c1ca Merge pull request #1019 from misnyo/gigablast 
[fix] gigablast api fix
 2017-09-03 23:09:33 +02:00
Adam Tauber 2040aac936 Merge pull request #1020 from misnyo/gitlab 
[fix] gitlab search fixed for proper api usage
 2017-09-03 23:08:55 +02:00
misnyo 9b6307a365 [fix] gitlab search fixed for proper api usage 2017-08-31 21:59:41 +02:00
misnyo b91772eff1 [fix] gigablast pep8 fix 2017-08-31 21:49:19 +02:00
misnyo 01330f71cd [fix] nyaa.si fixed 2017-08-31 21:32:30 +02:00
misnyo 1e2b60f380 [mod] tokyotoshokan dependecy to other engine removed 2017-08-31 21:31:40 +02:00
misnyo bf1ca2ccd3 [fix] habrahabr.ru xpath fix 2017-08-31 18:26:46 +02:00
misnyo 3182ba7069 [fix] google news dom xpath fix 2017-08-31 17:48:07 +02:00
misnyo 8849606e5f [fix] gigablast api fix 2017-08-31 16:57:57 +02:00
misnyo 2d66df0548 [mod]generalfile engine removed 2017-08-31 15:51:16 +02:00
misnyo 9711795876 [fix] geektimes.ru xpath fix 2017-08-31 15:41:08 +02:00
Adam Tauber e74aaa781e Merge pull request #1016 from misnyo/blekko 
[mod]blekko images removed
 2017-08-30 21:48:36 +02:00
Adam Tauber 610117d054 Merge pull request #1015 from misnyo/digg 
[fix] digg now requires cookie for search
 2017-08-30 21:35:12 +02:00
misnyo 6e92fb383a [fix] digg cookie characters created in module import 2017-08-30 21:14:12 +02:00
misnyo 20d2d4dab1 [fix] pep8 fix for faroo engine 2017-08-30 21:09:03 +02:00
misnyo 0607b167f8 [fix] faroo json api and image layout fixed 2017-08-30 21:09:03 +02:00
misnyo a49cc18f9c [fix] digg now requires cookie for search 2017-08-30 19:51:33 +02:00
misnyo f139f9cfdb [mod]blekko images removed 2017-08-30 16:47:56 +02:00
misnyo d14e2781b2 [fix]torrentz search engine fixed for new version 2017-08-25 00:52:35 +02:00
woorst 2434c29dc5 New engine: Genius (lyrics) 2017-08-19 19:05:17 -05:00
Alexandre Flament 57dc6b625f [fix] travis build : various fix about grunt builds 2017-08-13 13:41:59 +02:00
Alexandre Flament 14a8dd28c2 [fix] fix no_results.html template of the simple theme 2017-08-12 21:15:31 +02:00
Adam Tauber 6254d360a3 [fix] add missing no_results.html template to simple theme 2017-08-08 20:07:48 +02:00
Adam Tauber ac59f5e168 Merge branch 'master' into simple 2017-08-08 15:55:47 +02:00
Alexandre Flament 10a24bdc2c [enh] add simple theme (WIP) 2017-08-06 16:04:21 +02:00
marc 3ca9cad927 add bing videos engine 2017-08-05 20:35:57 -05: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 5f36e85b37 ensure all parameters are merged in results 2017-07-26 15:49:16 +02:00
marc 856dfc3018 add google videos 2017-07-26 15:49:16 +02:00
Adam Tauber 077d8efed8 [fix] use poolrequests in ddg engines 2017-07-21 16:23:20 +02:00
Adam Tauber 0f6612bb40 [mod] separate engine load and initialization 2017-07-21 14:27:25 +02:00
Adam Tauber f2b13a7de0 [enh] allow default empty values for normal and result proxies 2017-07-20 13:32:20 +02:00
Adam Tauber 1794f6a4d3 [enh] add "inactive" attribute to engines 
This modification allows us to deactivate engines in settings.yml
without commenting them out
 2017-07-20 13:32:20 +02:00
Noémi Ványi 80331cc8e6 add timeout errors in search_multiple_requests 2017-07-20 13:30:56 +02:00
Noémi Ványi 2242000bd4 change unresponsive_engines to a set to eliminate duplication of errors 2017-07-20 13:30:56 +02:00
Noémi Ványi bdd9528c6b show engine errors when no result is returned at all 2017-07-15 17:59:50 +02:00
Noémi Ványi 243d3e4298 show engine errors in infobox && add new error alert 2017-07-12 16:29:11 +02:00
Luke Bonham 3bd5ce6595 Italian localisation: corrected and fixed typos 2017-07-10 18:51:24 +02:00
marc 405e5c8f24 [fix] duckduckgo images doesn't fail with countryless language 2017-07-10 18:41:50 +02:00
Adam Tauber 38d6ba4066 [enh] generate search url of saved preferences 2017-07-10 12:50:13 +02:00
Adam Tauber 36af8f9d67 [fix] use py2/3 compatibility layer 2017-07-10 11:42:44 +02:00
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
potato 9b82cb1908 [fix] is_valid_lang fixed for new languages.py + dictzone engine encoding 2017-06-25 18:29:19 +02:00
vache asatryan 5835ebf955 fix github url 2017-06-18 21:53:10 +04:00
Noémi Ványi c361811cb5 [fix] fix xpath of google images 2017-06-13 19:47:56 +02:00
Adam Tauber 6d76d9b202 [fix] load engines if debug mode is enabled using uwsgi 2017-06-12 12:47:42 +02:00
Adam Tauber 343ac7197d [fix] pep8 2017-06-06 23:37:42 +02:00
Adam Tauber 78365ffb8a [enh] add init function to engines which loads parallel 2017-06-06 22:20:20 +02:00
Adam Tauber f82646f386 [enh] version 0.12.0 2017-06-04 13:19:15 +02:00
marc 3b950929b1 [fix] fix duckduckgo's offset 
First page now starts with 0 offset,
rather than starting on the 30th result.

DuckDuckGo returns 30 results on each page.
 2017-05-27 21:12:39 -05:00
marc c65a409f0d add duckduckgo images engine 2017-05-23 20:07:09 +02:00
Adam Tauber e60e98156f [enh] update translations - closes #930 2017-05-23 13:49:45 +02:00
Alexandre Flament 7ebe3a6f41 [mod] add category to each results, and change group criterias (template and existing image) 2017-05-22 22:20:35 +02:00
Alexandre Flament 87f673336f [fix] rss feed : the jinja template was not found when the rss feed returns an valid feed including an error. 2017-05-22 22:20:35 +02:00
Adam Tauber 1972a044a3 [fix] produce valid urls if scheme is missing 2017-05-22 15:48:37 +02:00
Adam Tauber 8db527c1d2 [fix] use raw response with etree.parsefromstring - Unicode strings with encoding declaration are not supported 2017-05-22 15:36:52 +02:00
Noémi Ványi b685e9753b [enh] update existing translations 2017-05-19 23:19:18 +02:00
Adam Tauber a4f7046b8f [fix] pep8 2017-05-18 22:19:44 +02:00
Noémi Ványi 2a9339f4b7 [fix] add more description on possible search tpyes 2017-05-18 22:04:31 +02:00
Noémi Ványi 87f117d50e [enh] add free software directory engine 2017-05-18 21:39:32 +02:00
Noémi Ványi 2db807368c [enh] make search type of mediawiki configurable 2017-05-18 21:34:54 +02:00
marc 9ee8e552da [fix] bing images 2017-05-17 15:45:55 +02:00
Alexandre Flament 9c91ab33f8 [mod] settings.yml can be /etc/searx/settings.yml 
The exact order is
* first from SEARX_SETTINGS_PATH,
* if not found then from searx code base,
* if not found then from /etc/searx/settings.yml
* if not found an exception stops searx loading
 2017-05-15 22:19:42 +02:00
Alexandre Flament ee080feaed [mod] the static and templates directories can be defined in the settings.yml 2017-05-15 21:23:13 +02:00
Dalf c233bf0df9 [fix] framalibre : remove result['thumbnail'] (not used) 2017-05-15 17:28:21 +02:00
Alexandre Flament f5128c7cb9 [mod] add/modify image fetching for bing_news, qwant and twitter engines 2017-05-15 17:28:21 +02:00
Adam Tauber 52e615dede [enh] py3 compatibility 2017-05-15 12:02:30 +02:00
Adam Tauber 46a2c63f8e [fix] yahoo news date parsing 2017-04-08 19:45:04 +02:00
Alexandre Flament 12d91c1d67 [mod] searx doesn't crash at startup when an engine can't be loaded (see #884) 2017-04-08 17:38:46 +02:00
Adam Tauber 92ca80ba5a [fix] build french translation to be identical with the .po source 2017-03-24 11:58:49 +01:00
Alexandre Flament 181c12ae04 [mod] upgrade requirements.txt 2017-03-23 21:26:51 +01:00
François Revol 45d15bd6f0 Add framalibre engine 
framalibre.org is a catalogue of Free Software, edited by Framasoft.

For now we pass the thumbnail as img_src as it doesn't seem to be used
for IT...
 2017-03-22 00:18:23 +01:00
Noémi Ványi 4a4975d7fc [enh] update translation files 
New languages: German (Germany), Finnish, Slovak, Ukrainian
Updated: Bulgarian, German, Esperanto, Italian, Japanese, Dutch,
Portuguese (Brazil), Russian, Swedish
 2017-03-18 23:49:00 +01:00
marc fd65c12921 make search language handling less strict 
languages.py can change, so users may query on a language that is not
on the list anymore, even if it is still recognized by a few engines.

also made no and nb the same because they seem to return the same,
though most engines will only support one or the other.
 2017-03-18 23:44:21 +01:00
marc 805fb02ed1 add language support for qwant 
closes issue #863
 2017-03-18 23:44:21 +01: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
Noémi Ványi 247534be76 [fix] pageno param of search reqs in form 2017-02-10 19:43:27 +01:00
Adam Tauber 0e7ac3797d Merge pull request #848 from maxigas/master 
add library genesis engine
 2017-02-05 16:55:06 +01:00
maxigas 4ebde2b2af add library genesis engine 2017-02-05 16:32:28 +01:00
Noémi Ványi 742e4dfdcc [fix] fix paging of duckduckgo 2017-02-01 20:54:13 +01:00
Alexandre Flament e67dfaaac7 Merge branch 'master' into flask_perimeter 2017-01-27 13:47:59 +00: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
Adam Tauber b3974fc880 [fix] do not show glyph icons if noscript is enabled - #838 2017-01-27 01:19:49 +01:00
Adam Tauber 52d1087202 [enh] add result number parsing to google engine 2017-01-27 00:18:46 +01:00
Noémi Ványi d635b5fd4d [enh] make navbar smaller 2017-01-26 23:52:00 +01:00
Noémi Ványi 508d0f063e [enh] make number of results less prominent 2017-01-26 23:44:21 +01:00
Noémi Ványi 8354bd0c60 [enh] make result url green 2017-01-26 23:33:12 +01:00
Adam Tauber 04306bad89 [fix] whitespace 2017-01-26 21:18:10 +01:00
Adam Tauber 30695265c2 [enh] search input design mods according to #226 2017-01-26 21:12:41 +01:00
Adam Tauber e7aa98902f [fix] correct search parameter check 2017-01-21 20:21:32 +01:00
Adam Tauber 2522254fb2 [fix] search time range value check 2017-01-21 20:13:55 +01:00
Adam Tauber fa26afafd8 [fix] handle missing mapsettings 2017-01-21 20:08:08 +01:00
Alexandre Flament 15eef0ebdb [enh] validate input and raise an exception inside search.py. The exception message is output in json and rss format. 2017-01-20 18:52:47 +01:00
Alexandre Flament 7fdfeca3a4 [mod] add a __common__ template that can't be selected but that provides a common place for shared templates. 
What has been moved into this template :
* opensearch*.xml is always the same whatever the themes.
* the text inside */about.html
 2017-01-20 15:40:38 +01:00
Adam Tauber 57149661e4 Merge pull request #830 from davidar/se 
Semantic Scholar
 2017-01-18 23:50:11 +01:00
Adam Tauber b1d49bacb0 Merge pull request #827 from davidar/spell 
[enh] show spelling corrections
 2017-01-18 23:49:01 +01:00
David A Roberts 7814d4b796 Semantic Scholar 2017-01-17 21:15:53 +10:00
David A Roberts 7492997c51 [fix] allow empty content 2017-01-17 21:14:33 +10:00
David A Roberts 1d30141c20 [enh] show spelling corrections 2017-01-16 13:31:16 +10:00
Alexandre Flament 7a16aca346 Merge branch 'master' into flask_perimeter 2017-01-15 22:18:20 +01:00
jcherqui d98705bd06 Add 1337x icon 2017-01-15 16:13:23 +01:00
jcherqui 39a97825d9 Add torrent infos 2017-01-15 16:13:23 +01:00
jcherqui 4776abd1ac Remove categories 2017-01-15 16:13:23 +01:00
jcherqui a320328dda Fix test 2017-01-15 16:13:23 +01:00
jcherqui 0549fb40d2 Add 1337x.to engine 2017-01-15 16:13:23 +01:00
Alexandre Flament 448903cd4a [fix] searching for "!google_images text" doesn't work (bang with underscore) 2017-01-12 16:17:29 +01:00
Adam Tauber d6cbc6b78b [enh] 0.11.0 version bump 2017-01-10 21:09:04 +01:00
Adam Tauber 108392f8da [fix] skip non-complete google news results 2017-01-10 11:03:05 +01:00
Dalf 06bea82935 [mod] /config API : add language_support, paging, safesearch, supported_languages, time_range_support, timeout fields. 2017-01-07 14:42:55 +01:00
Adam Tauber 0d4da30c7f [enh] add instant answers to google engine 2017-01-05 17:20:12 +01:00
Adam Tauber fc14fb0a67 [fix] french translation template var name 2017-01-05 15:47:54 +01:00
Adam Tauber 261015002e [enh] update translations 2017-01-05 15:24:45 +01:00
Adam Tauber 14b96b8824 [enh] propagate all search properties to the results page's components 2017-01-05 15:24:45 +01:00
Adam Tauber 627962ce40 Merge branch 'master' into flask_perimeter 2017-01-04 19:09:12 +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
Adam Tauber 7b1daf254e [fix] autocomplete unicode issue - closes #808 2017-01-03 13:11:38 +01:00
Adam Tauber 525e5d275c Merge pull request #801 from dalf/extract_text 
[fix] extract_text: use html.tostring instead html_to_text.
 2017-01-02 12:36:50 +01:00
Alexandre Flament 84a2c97a65 [mod] searx uses flask framework only in webapp.py. Make migration to another framework easier. 2017-01-02 12:06:04 +01:00
Alexandre Flament 90e1db3e5c [fix] extract_text: use html.tostring instead html_to_text. Fix #711 2016-12-31 13:56:09 +01:00
Adam Tauber 3d8c9bab96 Merge pull request #800 from dalf/searchpy5 
search.py : Fix and some minor modifications
 2016-12-30 19:51:12 +01:00
Adam Tauber 6bf9c398a7 [fix] use english as default language in bing 
If no language is specified, bing returns results with multiple languages
for one query which isn't really useful. Setting english as default
insted if nothing.
 2016-12-30 18:17:14 +01:00
Alexandre Flament 5a9551925d [fix] fix bugs introduced by commit 0a2fde19d0 from dalf/searchpy4 2016-12-30 18:10:14 +01:00
Alexandre Flament 28d51fd063 [mod] timeout in log are readable (the timeouts are compare to the start_time of the request). 2016-12-30 17:37:46 +01:00
Alexandre Flament 3a8ab5880a [mod] result_container.extend sets result['engine'] = engine_name for each result 2016-12-30 17:18:02 +01:00
Noémi Ványi d18d09a98b [fix] change modal glyphicon arrows to image icons 2016-12-30 14:59:46 +01:00
Alexandre Flament 0a2fde19d0 [mod] add a search_one_request_safe function wrapper to call search_one_request. All exceptions are catched in this wrapper. 2016-12-30 11:51:49 +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 d82f64238f fix opening of result on new tab 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 896c0c3734 revert language support column in preferences 2016-12-29 01:56:04 -06:00
marc 1175b3906f change language list to only include languages with a minimum of engines 
that support them.
users can still query lesser supported through the :lang_code bang.
 2016-12-29 01:55:30 -06:00
Adam Tauber 7388067f15 [fix] load engines with uwsgi too 2016-12-28 21:17:51 +01:00
Adam Tauber 116521192e [mod] display supported languages in preferences engine view 2016-12-28 21:01:19 +01:00
Adam Tauber 8bff42f049 Merge branch 'master' into languages 2016-12-28 20:00:53 +01:00
Adam Tauber ea034fafa9 [fix] proper engine init 2016-12-27 17:55:44 +01:00
Adam Tauber 68cbf0448f [fix] do not reload engines twice if started with debug mode 2016-12-27 17:31:14 +01:00
Adam Tauber a605377c40 [enh] explicit engine init 2016-12-27 17:31:14 +01:00
Adam Tauber 14f58bdaec [fix] robot tests ++ set default value for server http protocol version 2016-12-25 23:31:51 +01:00
Adam Tauber a98bbefbcf [enh] configurable listening http protocol version 2016-12-25 23:05:01 +01:00
Stefan Antoni 89914e52e3 Update settings.yml 2016-12-25 22:04:45 +01:00
Stefan Antoni e6d69b082f Merge branch 'master' into add_ccctv_to_settings 2016-12-25 14:59:52 +01:00
Adam Tauber 07448e15e4 [fix] disable etymonline by default - closes #789 2016-12-25 09:34:17 +01:00
Adam Tauber b6fc154616 [enh] add searx engine 2016-12-24 22:23:36 +01:00
Stefan Antoni 96c8d36e7b Add ccctv engine to settings.yml 2016-12-24 16:44:12 +01:00
Adam Tauber 0171db5c3f [fix] handle missing images in google news 2016-12-23 12:59:52 +01:00
Adam Tauber 4b225eb7ef Merge pull request #661 from davidar/et 
Online Etymology Dictionary
 2016-12-23 12:54:02 +01:00
marc f30d5e8793 [fix] supported languages column in preferences page 2016-12-16 22:17:41 -06:00
marc 7fba3d1179 Merge branch 'master' into languages 2016-12-16 22:14:36 -06:00
marc 4a1ff56389 minor fixes in utils/fetch_languages.py 2016-12-16 22:14:14 -06:00
Adam Tauber 19cd2bf3b5 [fix] re-enable ssl verification for searchcode 
closes #784
 2016-12-16 15:21:27 +01:00
Adam Tauber cf5c7d050a [fix] engine setting if no categories specified 2016-12-15 11:59:21 +01:00
marc af35eee10b tests for _fetch_supported_languages in engines 
and refactor method to make it testable without making requests
 2016-12-15 00:40:21 -06:00
marc e0c270bd72 tests for language support in engines 2016-12-13 23:51:15 -06:00
marc 1b46ecd21a [fix] broken language selector 2016-12-13 21:36:40 -06:00
marc 93233c786a Refactor search language preference. 2016-12-13 20:59:31 -06:00
marc f62ce21f50 [mod] fetch supported languages for several engines 
utils/fetch_languages.py gets languages supported by each engine and
generates engines_languages.json with each engine's supported language.
 2016-12-13 19:58:10 -06:00
marc 92c6e88ad3 small fixes 2016-12-13 19:56:59 -06:00
marc 727c287856 [fix] backwards compatibility with old language cookies 2016-12-13 19:56:58 -06:00
marc 922d51bf0c Add country names in language list. 2016-12-13 19:32:43 -06:00
marc a11948c71b Add language support for more engines. 2016-12-13 19:32:43 -06:00
marc a11230819f automatic search when language is selected 2016-12-13 19:32:00 -06:00
marc c677aee58a filter langauges 2016-12-13 19:32:00 -06:00
marc 149802c569 [enh] add supported_languages on engines and auto-generate languages.py 2016-12-13 19:32:00 -06:00
Noémi Ványi b034356825 add year filter to engines with time range support && tests 
Following engines does not support "Last year":
 * Bing News
 * DeviantArt
 * DuckDuckGo
 * Yahoo
 * YouTube (noapi)
 2016-12-11 16:58:31 +01:00
Noémi Ványi c59c76e6ee add year to time range to engines which support "Last year" 
Engines:
 * Bing images
 * Flickr (noapi)
 * Google
 * Google Images
 * Google News
 2016-12-11 16:58:31 +01:00
Noémi Ványi 2fc1091b7f add "Last year" option to time range selection 2016-12-11 16:58:31 +01:00
Thomas Renard 16c40ffefd htmlize yacy contents 2016-12-11 14:05:07 +01:00
Noémi Ványi 9c8ec209e1 [mod] add timeout to gigablast 2016-12-11 11:58:49 +01:00
Noémi Ványi 553f3a3a1a fix xpath of yandex 2016-12-11 11:58:49 +01:00
Noémi Ványi 85f363774c fix habrahabr xpath 2016-12-11 11:58:49 +01:00
Noémi Ványi c6ed0dae6c fix google play movies xpath 2016-12-11 11:58:49 +01:00
Adam Tauber 4676e1dcde [fix] remove result escaping from engine 2016-12-11 03:24:26 +01:00
Adam Tauber 1a82ed6f54 [mod] 500px rewrite 2016-12-11 03:22:42 +01:00
Adam Tauber f6e9c074bb [fix] vimeo engine change follow-up 2016-12-11 02:33:04 +01:00
Adam Tauber a2c94895c1 [fix] google news engine change follow-up 2016-12-11 01:03:52 +01:00
Adam Tauber a764ebb4b1 [enh] extend json response with suggestions, infoboxes and answers 2016-12-10 21:38:34 +01:00
Adam Tauber c3dcebb778 [fix] remove html tags from qwant results 2016-12-10 21:31:05 +01:00
Adam Tauber be6ae81cb2 Merge pull request #776 from asciimoo/voat-engine 
add voat.co engine
 2016-12-10 00:49:16 +01:00
Adam Tauber e12a137a2f [fix] unicode response in deezer and spotify 2016-12-10 00:30:34 +01:00
Adam Tauber 75aa46a6b3 [fix] remove unused variable 2016-12-10 00:15:53 +01:00
Adam Tauber 0205838f25 [enh] handle engine response crashes 2016-12-10 00:15:33 +01:00
Alexandre Flament e48f07a367 Merge branch 'master' into searchpy2 2016-12-09 23:11:45 +01:00
Adam Tauber d80fb2c8e8 [enh] central handling of empty result titles 2016-12-09 19:57:28 +01:00
Adam Tauber 72a217f983 [mod] return empty string on missing osm title 
Sometimes openstreetmap returns with None as title. In these cases use an empty
string instead.
 2016-12-09 19:53:54 +01:00
Adam Tauber fdf63940e8 [fix] tests ++ flickr error 2016-12-09 19:11:22 +01:00
Adam Tauber ef2ef7974a [enh] central html escaping of results 2016-12-09 19:10:33 +01:00
Adam Tauber 7e1f27e459 [enh] add author to image result content 2016-12-09 18:59:24 +01:00
Adam Tauber 39f5035e13 [fix] query escaping in rss/opensearch output 2016-12-09 18:59:24 +01:00
Adam Tauber 16bdc0baf4 [mod] do not escape html content in engines 2016-12-09 18:59:19 +01:00
Adam Tauber 28f12ef5a0 [fix] proper escaping of the search query in templates 2016-12-04 23:07:46 +01:00
Adam Tauber 7986d4cf41 [fix] correct path for autoscroll on non-root urls 
closes #758
 2016-12-04 11:17:17 +01:00
Noémi Ványi 3007e4e451 add voat.co engine 2016-12-02 20:34:00 +01:00
Adam Tauber 0724bd8168 [fix] pep8 2016-11-19 21:18:12 +01:00
Adam Tauber 7eed8a5dd9 [enh] add statistics answerer 2016-11-19 21:03:27 +01:00
Adam Tauber 971ed0abd1 [enh] add quick answer functionality with an example answerer 2016-11-19 20:53:51 +01:00
Adam Tauber 55dc538398 [mod] move load_module function to utils 2016-11-19 17:51:19 +01:00
Adam Tauber 827f9e41ca [fix] gettext requires request.preferences 2016-11-15 09:56:18 +01:00
Noémi Ványi 299c882304 search: make language configurable from settings.yml 2016-11-14 23:32:19 +01:00
Noémi Ványi 12c369e858 preferences: refactor to check consistently input values 2016-11-14 22:29:27 +01:00
Adam Tauber a757c2f005 [fix] remove unused imports 2016-11-14 22:15:03 +01:00
Adam Tauber 832cf37a97 [enh] display errors 
also tried flask's flash feature but flask creates session cookies if it
isn't flushed. Avoiding session cookies to preserve privacy
 2016-11-14 22:07:23 +01:00
Adam Tauber 88dfee858e [fix] rewrite missing variable 2016-11-14 17:25:21 +01:00
Adam Tauber 96f182d75d [fix] allow empty autocomplete setting 
closes #756
closes #761
 2016-11-14 16:17:11 +01:00
Adam Tauber 43ddbc60da [fix] pep8 2016-11-14 16:09:16 +01:00
Adam Tauber 16f2e346b3 [fix] bing unicode issue part III. 2016-11-14 15:52:29 +01:00
Adam Tauber 94196c4b6c [enh] show traceback of search errors 2016-11-14 15:49:06 +01:00
Adam Tauber 1176505fa4 [fix] bing character encoding - closes #760 2016-11-14 15:47:42 +01:00
Adam Tauber 17b08d096c [fix] unicode search expression for bing 2016-11-07 22:33:17 +01:00
Adam Tauber 16ff8d06c7 [fix] bing paging and language support 
see https://msdn.microsoft.com/en-us/library/ff795620.aspx for bing
specific search operators

closes #755
 2016-11-07 22:30:20 +01:00
Alexandre Flament 219f047bf3 Merge branch 'master' into searchpy2 2016-11-06 09:44:07 +01:00
Adam Tauber 7d26b3f8f8 [fix] suspend end time check 2016-11-06 02:53:09 +01:00
Noémi Ványi c7906555a0 add lobste.rs xpath engine 2016-11-06 01:17:30 +01:00
Alexandre Flament 01e2648e93 Simplify search.py, basically updated PR #518 
The timeouts in settings.yml is about the total time (not only the HTTP request but also the prepare the request and parsing the response)
It was more or less the case before since the threaded_requests function ignores the thread after the timeout even the HTTP request is ended.

New / changed stats :
* page_load_time : record the HTTP request time
* page_load_count: the number of HTTP request
* engine_time : the execution total time of an engine
* engine_time_count : the number of "engine_time" measure

The avg response times in the preferences are the engine response time (engine_load_time / engine_load_count)

To sum up :
* Search.search() filters the engines that can't process the request
* Search.search() call search_multiple_requests function
* search_multiple_requests creates one thread per engine, each thread runs the search_one_request function
* search_one_request calls the request function, make the HTTP request, calls the response function, extends the result_container
* search_multiple_requests waits for the the thread to finish (or timeout)
 2016-11-05 13:45:20 +01:00
Alexandre Flament 58a6c045c8 [mod] replace references request.request_data (GET or POST parameters) by request.form (based on merge of POST and GET parameters) 2016-11-02 14:52:22 +01:00
dalf fbb080f358 Change plugin API : 
- pre_search(request, search)
- post_search(request, search)
- on_result(request, search, result)

with
- request is the Flask request
- search a searx.Search instance
- result a searx result as usual
 2016-11-02 14:22:16 +01:00
dalf 67e11c42b9 Clean up the architecture 
Purposes :
- isolate the plugins calls
- distinction between parsing the web request and running the search (Search class). To be able to test code easily, to run searx code outside a web server, to filter the search query parameters with plugins more easily, etc...

Details :
- request.request_data contains request.form or request.args (initialize inside pre_request() function)
- Query class is renamed RawTextQuery
- SearchQuery class defines all search parameters
- get_search_query_from_webapp create a SearchQuery instance (basically the previous Search.__init__ code)
- Search class and SearchWithPlugins class takes a SearchQuery instance as class constructor parameter
- SearchWithPlugins class inherites from Search class, and run plugins
- A dedicated function search_with_plugins executes plugins to have a well define locals() (which is used by the plugins code).
- All plugins code is executed inside the try...except block (webapp.py, index function)
- advanced_search HTTP parameter value stays in webapp.py (it is only part of UI)
- multiple calls to result_container.get_ordered_results() doesn't compute the order multiple time (note : this method was call only once before)
- paging value is stored in the result_container class (compute in the extend method)
- test about engine.suspend_end_time is done during search method call (instead of __init__)
- check that the format parameter value is one of these : html, rss, json, rss (before the html value was assumed but some text formatting wasn't not done)
 2016-11-02 14:22:16 +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
Noémi Ványi 1490d6bc93 add time range search for flickr 2016-11-01 17:58:29 +01:00
Noémi Ványi 5c02b9ef31 add time range support for bing images 2016-11-01 17:58:29 +01:00
Noémi Ványi d2e0cbafb2 add time range search for youtube noapi 2016-11-01 17:58:29 +01:00
Noémi Ványi f70d405202 add time range search for bing news 2016-11-01 17:58:29 +01:00
Noémi Ványi e3d748ded4 show time range support in preferences 2016-11-01 17:57:58 +01:00
Adam Tauber 6243639f01 [mod] do not proxify images if image proxy is not set 2016-10-30 21:15:46 +01:00
Noémi Ványi 6334fca11c add version info to config endpoint 2016-10-30 15:58:34 +01:00
Adam Tauber 1b9045ed89 [enh] use morty proxy for image proxification too if it is configured 2016-10-29 23:21:07 +02:00
Adam Tauber a67a4bf2c0 [enh] allow morty proxy without hmac key 2016-10-29 23:21:07 +02:00
Adam Tauber 574d9d40d2 Merge pull request #697 from Eig8phei/http1.1 
serve pages with HTTP/1.1
 2016-10-29 17:46:57 +02:00
dalf 3e7554422b [mod] the environment variable SEARX_DEBUG can override the general.debug value in settings.yml 2016-10-22 21:36:13 +02:00
Adam Tauber e249698b26 Merge pull request #737 from dalf/ixquick 
[fix] ixquick : fetch results from ixquick.eu instead of ixquick.com
 2016-10-22 21:33:25 +02:00
dalf 972f32d973 [fix] ixquick : fetch results from ixquick.eu instead of ixquick.com, close #727 2016-10-22 20:56:18 +02:00
Noémi Ványi db8c2ebc3f [fix] images modal with infinite scroll 2016-10-22 20:05:05 +02:00
Adam Tauber 760cb3c5af Merge pull request #734 from dalf/seeks_url 
[fix] seeks URLS, close #731
 2016-10-22 14:48:39 +02:00
Alexandre Flament a88768efd8 Merge branch 'master' into http1.1 2016-10-22 14:25:50 +02:00
Noémi Ványi 53c9fde992 fix kickass torrents engine 2016-10-22 05:27:18 +02:00
Adam Tauber 218857999e Merge pull request #726 from mmuman/opensearch_shortname 
[fix] set the title on the opensearch link tag
 2016-10-22 05:10:49 +02:00
Adam Tauber d5c0dcd18a [fix] unicode url proxiing 2016-10-17 01:32:31 +02:00
Adam Tauber 1be6e72d51 [enh] add result proxy support - #707 2016-10-17 00:23:15 +02:00
Adam Tauber 19a6ca0b68 [enh] use HMAC for image proxy url verification 2016-10-16 23:41:33 +02:00
Alexandre Flament 5b21a7fb65 Merge branch 'master' into opensearch_shortname 2016-10-16 20:03:14 +02:00
dalf cae84e71a5 [fix] seeks URLS, close #731 2016-10-15 18:43:03 +02:00
Alexander Minges 3c5883408c initial commit of pdbe engine 
Adds support for queries to the Protein Data Bank Europe (PDBe).
 2016-10-13 00:40:38 +02:00
François Revol 96cfdc77d2 [fix] set the title on the opensearch link tag 
Firefox uses the title attributes instead of the ShortName from the xml file
as set in 0fbd7052 which closed #405
 2016-10-09 01:12:56 +02:00
Pydo beff8c6007 Merge branch 'master' of https://github.com/asciimoo/searx into feature/seedpeer-engine-integration 2016-10-01 19:26:51 -04:00
Pydo 01844b6f04 Set default categories for seedpeer provider 2016-10-01 19:22:36 -04:00
Adam Tauber dceb903114 [mod] disallow search results for robots 2016-10-01 20:22:52 +02:00
Pydo 55a5b686ed Merge branch 'master' of https://github.com/asciimoo/searx into feature/seedpeer-engine-integration 
Resolved conflict searx/settings.yml
 2016-10-01 10:46:18 -04:00
Pydo 6f87bf2a1c Disabled seepeer.eu by default since it does not support https 2016-10-01 10:28:01 -04:00
Adam Tauber 812ade82b1 [fix] robot test engine names 2016-09-28 22:49:29 +02:00
Adam Tauber 86daef2063 [fix] do not allow underscore in engine names - closes #708 2016-09-28 22:30:05 +02:00
Adam Tauber bee7b497a3 [mod] rename "default" theme to "legacy" 2016-09-22 23:51:07 +02:00
marc d1d4ed4376 [fix] results with digbit don't truncate anymore 2016-09-20 16:11:33 -05:00
Eig8phei f90eb428c6 serve pages with HTTP/1.1 2016-09-15 14:47:09 +03:00
Lorenzo J. Lucchini 2bc42b378d Remove unrelated change that mistakenly ended up into this branch 2016-09-10 17:44:22 -04:00
firebovine e145fdb86d #607 - noapi fix 2016-09-10 17:43:12 -04:00
Lorenzo J. Lucchini 05206f86e3 Adding Urban Dictionary xpath engine 2016-09-10 17:42:19 -04:00
Lorenzo J. Lucchini a8907224a1 Improving Wolfram Alpha search hit content 
Making WA search hits contain
- the (parsed) input inside the "title" instead of just "Wolfram|Alpha", to better match other hit titles and to confirm correct parsing of input to the user
- the first output field that contains any text (skipping ones that are only pictures; this is usually the most meaningful "result" field) instead of the raw input as the "content", making it additionally possible to obtain WA computations from JSON API calls
 2016-09-10 17:42:19 -04:00
marc 09ee2aa69d [fix] Result text in Wolfram|Alpha (#607) 2016-09-10 17:42:04 -04:00
firebovine baeb3ff911 fix xpath expressions for urban dictionary 2016-09-10 17:08:34 -04:00
Adam Tauber 8d4dd3c515 [fix] 404 HTTP status on not found pages - closes #681 2016-09-07 08:32:01 +02:00
Adam Tauber ce371f766a [enh] version 0.10.0 
closes #659
 2016-09-06 18:31:25 +02:00
Adam Tauber ea19e19ff2 [enh] translation updates 2016-09-06 18:12:01 +02:00
Adam Tauber 3144ec1d59 [fix] unicode urls 2016-09-06 17:17:42 +02:00
potato 983415bc38 [enh] is_valid_lang moved to utils 2016-09-06 16:43:48 +02:00
potato b7d578ae80 [enh] engine header comments 2016-09-06 16:36:04 +02:00
potato 5ed9846bbf [fix] revert the port change 2016-09-06 16:35:12 +02:00
potato 8c72a22757 [enh] api_key usage, disable the engine by default 2016-09-06 16:12:34 +02:00
potato c051e6a2c3 [fix] pep8 2016-09-06 15:44:05 +02:00
potato ab471fd13b [enh] mymemory translated engine added for multi-word translations 2016-09-06 15:40:07 +02:00
potato 22bd39fd42 [fix] only 1-word search triggers the engine 2016-09-06 15:07:47 +02:00
potato 7bf1013c15 [enh] removed missing params; [fix] pep8 2016-09-06 14:24:08 +02:00
potato bc806bfab1 [fix] no lambda anymore, cgi.escape 2016-09-06 14:12:46 +02:00
potato 5416f0f248 [enh] dictionary engine renamed to dictzone 2016-09-06 12:50:56 +02:00
potato 84ff6e289e [enh] filter non-existing language code/name containing requests 2016-09-06 12:46:18 +02:00
potato b808a2e266 [fix] don't merge with suggestions 2016-09-06 12:37:26 +02:00
potato 3f4cc2146c [enh] return results instead of answers 2016-09-06 12:34:20 +02:00
potato 9d08c81f47 Merge branch 'master' of https://github.com/asciimoo/searx 2016-09-06 11:47:34 +02:00
potato f4525880ed [enh] dictionary engine added 2016-09-06 11:47:27 +02:00
Adam Tauber 55abf07a4f [fix] thread safe threaded_requests() function 2016-09-06 00:36:33 +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 fa5bc3a563 [fix] use threading to recover after incomplete request crashes - closes #651 #662 2016-09-05 22:46:25 +02:00
Adam Tauber b27f07af23 [enh] socks proxy support 2016-09-05 22:35:54 +02:00
Adam Tauber da4f1c2512 [mod] truncate result content in html - closes #224 2016-09-05 22:22:25 +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
Pydo 41ce76e9c9 Merge branch 'master' of https://github.com/asciimoo/searx into feature/seedpeer-engine-integration 2016-09-05 14:56:53 -04:00
Pydo 2c2123b2e8 Added seepeer to config and added seepeer search parser 2016-09-05 14:51:02 -04:00
Adam Tauber 465d47283f [fix] 404 page localization #2 2016-09-04 19:07:07 +02:00
Adam Tauber c2f4d4449d [fix] 404 page localization 2016-09-04 18:38:25 +02:00
Adam Tauber b4b0231617 [fix] links in new tabs without js ++ noopener bug fix - closes #674 2016-09-04 15:57:43 +02:00
Adam Tauber 7591c8bfe3 Merge pull request #672 from kvch/self-info-paging 
Self information on later pages
 2016-08-27 22:10:33 +02:00
Adam Tauber 3043c404e4 Merge pull request #671 from kvch/custom-404 
Custom 404 message - fixes #317
 2016-08-27 22:08:58 +02:00
Noemi Vanyi aa227180e2 remove self info answers from pages after first one 2016-08-27 16:45:25 +02:00
Noemi Vanyi 0056c4035e add custom 404 page 2016-08-24 19:53:09 +02:00
Adam Tauber b72aec0a9b [fix] remove btdigg - see https://torrentfreak.com/btdigg-shut-down-due-to-torrent-spam-for-now-160711/ 2016-08-16 13:52:55 +02:00
Adam Tauber 32604be790 [fix] piratebay engine - using pirateproxy.red - see https://proxybay.tv/ 2016-08-16 10:44:00 +02:00
Adam Tauber f693a54ad7 Merge pull request #664 from kvch/uncapitalize-searx 
uncapitalize searx in templates
 2016-08-16 10:38:13 +02:00
Adam Tauber 13bed1f872 Merge pull request #639 from kvch/digbt-engine 
add digbt engine - fixes #638
 2016-08-16 10:37:17 +02:00
Noémi Ványi 4bd44cd98f uncapitalize searx in templates 2016-08-15 17:12:43 +02:00
David A Roberts 45120bc711 Add Hoogle search engine 2016-08-14 22:10:25 +10:00
David A Roberts 1e9dab08e6 [fix] behaviour for page_size>1 and first_page_num>0 
eg. pageno=1,21,41,... instead of 20,40,60,...
 2016-08-14 22:10:25 +10:00
David A Roberts 413e143707 [fix] don't merge results with distinct fragments 2016-08-14 22:09:29 +10:00
David A Roberts ee320d4e5b Online Etymology Dictionary 2016-08-14 19:25:29 +10:00
Noémi Ványi d320dd0efc diable digbt engine in settings.yml 2016-08-14 01:05:21 +02:00
Noemi Vanyi 3a1c5876b1 add digbt engine 
Unfortunately, it is quite slow so it is disabled.
Furthermore, the display of number of files is wrong
on digbt.org, so it is not displayed on searx.
 2016-08-13 16:19:00 +02:00
Adam Tauber 104cdb7d03 [fix] remove unused imports ++ int token timestamp by default 2016-08-13 01:13:41 +02:00
Adam Tauber eb57481450 [fix] google images paging - closes #571 2016-08-13 01:13:41 +02:00
David A Roberts 61fe5daf30 Add Microsoft Academic search engine 2016-08-12 20:19:10 +10:00
Adam Tauber 31866d9f33 Merge pull request #629 from stepshal/E305 
Add missing blank lines after class or function definition.
 2016-08-11 13:33:59 +02:00
stepshal 7e16c9d360 Add missing blank lines after class or function definition. 2016-08-11 17:18:12 +07:00
Adam Tauber 827aba4599 Merge pull request #658 from davidar/scroll 
[enh] infinite scroll
 2016-08-11 11:38:43 +02:00
David A Roberts 678b9e994a [enh] infinite scroll 
resolves #649
 2016-08-11 19:16:42 +10:00
Adam Tauber 4fae62cd88 Merge pull request #656 from cy8aer/openrepos 
openrepos: Meego/Sailfish application repository
 2016-08-11 11:04:55 +02:00
Adam Tauber 975bd5beb5 [fix] oscar grunt css build 2016-08-10 14:50:36 +02:00
David A Roberts 4ffe18b4bb [fix] delete trailing quote 2016-08-10 21:33:05 +10:00
David A Roberts 117d36b66e Add Crossref search engine and DOAI rewrite plugin 2016-08-10 11:15:30 +10:00
Noémi Ványi e7f93f4f12 set type of cursor to pointer in advanced search 2016-08-09 15:51:34 +02:00
Thomas Renard 9c18abfe5a openrepos: Meego/Sailfish application repository 2016-08-09 12:01:18 +02:00
Adam Tauber f1262ffa9e Merge pull request #588 from a01200356/wikidata 
[enh] More data from Wikidata
 2016-08-09 10:14:32 +02:00
Noemi Vanyi c59ef83353 redesign toggle button of engines && plugins 2016-08-07 23:25:27 +02:00
marc ad58b14be7 [fix] merge infoboxes based on weight 
also minor changes in attributes and images from wikidata
 2016-08-05 23:51:04 -05:00
marc c2e4014287 [fix] urls merge in infobox (#593) 
TODO:
    merge attributes
 2016-08-05 23:51:04 -05:00
marc a0a1284998 wikidata refactor and more attributes (see issue #560) 2016-08-05 23:51:04 -05:00
marc a4c77f88d0 [fix] exception if locale doesn't have a date format 
occitan, for example
 2016-08-05 23:51:04 -05:00
a01200356 93ef11adc0 [enh] multilingual wikidata 
disambiguation and tags are in local language

TOFIX:
    needs to query the api every time to know each label's name
 2016-08-05 23:51:04 -05:00
Adam Tauber c553523f5b Merge pull request #645 from dalf/remove_kickass 
[mod] remove the kickass engine from settings.yml
 2016-08-01 22:09:33 +02:00
Adam Tauber ffbee4bb82 [fix] collect garbage after searches to reduce memory footprint 2016-07-31 23:39:58 +02:00
Adam Tauber bf92aa3fdd [fix] wrap categories on small screens ++ some code formatting - closes #647 2016-07-27 02:08:24 +02:00
Adam Tauber 350a84520d [fix] time range detection 2016-07-26 00:28:48 +02:00
Adam Tauber 3a8d193d1f [mod] disable ddg by default - it just proxies yahoo/bing results: https://duck.co/help/company/yahoo-partnership 2016-07-26 00:08:42 +02:00
Adam Tauber 7d9c898170 Merge pull request #634 from kvch/advanced-search 
support time range search
 2016-07-26 00:06:16 +02:00
Noemi Vanyi 90e74fbb28 search on filter select 2016-07-25 23:40:31 +02:00
Adam Tauber 54d987636e [fix] do not load engines which cannot be initialized - closes #585 2016-07-25 23:36:52 +02:00
Noemi Vanyi 16a8641649 advanced-search: panel is visible when checked before 2016-07-25 23:30:48 +02:00
Noemi Vanyi 128b5245ab time range selection as dropdown 2016-07-25 23:30:48 +02:00
Noemi Vanyi e046c0d7ae add time range strings to be translated 2016-07-25 23:28:14 +02:00
Noemi Vanyi cddc9d3792 add 'Advanced settings' to strings to be translated 2016-07-25 23:28:14 +02:00
Noemi Vanyi a7c8d5882c fix pep8 2016-07-25 23:28:14 +02:00
Noemi Vanyi e7baf24ec1 add time range search for deviantart 2016-07-25 23:28:14 +02:00
Noemi Vanyi e9a78f1434 add time range search for google images 2016-07-25 23:28:14 +02:00
Noemi Vanyi f13b9fa36a add time range search for duckduckgo 2016-07-25 23:28:14 +02:00
Noemi Vanyi 2e5839503f add time range search for google 2016-07-25 23:28:14 +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
Noemi Vanyi 93c0c49e9a add time range search with yahoo 2016-07-25 23:19:46 +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
Harry Wood cd072676e9 moving a comma 2016-07-25 16:16:16 +01:00
Alexandre Flament bd4d904002 [mod] remove the kickass engine from settings.yml 2016-07-25 16:00:05 +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 ba590de7f1 [fix] deviantart engine xpaths 2016-07-19 09:37:02 +02:00
Adam Tauber aa09f963eb Merge pull request #621 from stepshal/anomalous-backslash-in-string 
Fix anomalous backslash in string
 2016-07-18 22:27:17 +02:00
Adam Tauber 21c5fb1c45 [fix] pep8 2016-07-17 00:03:22 +02:00
Adam Tauber a7260ac497 [fix] do not replace image href urls - closes #594 
These lines were added to fix a js image load issue (#535) what i cannot reproduce.
Hopefully we don't see it again
 2016-07-16 23:37:02 +02:00
Adam Tauber 5b5478bbd9 [fix] compute the order of results only once per search 2016-07-16 21:44:28 +02:00
Adam Tauber 485da54961 [mod][fix] use the average of results number ++ do not display smaller result number than the actual result count - closes #600 2016-07-16 21:44:17 +02:00
David A Roberts 144b7be70d Add Google Scholar search engine 2016-07-16 11:52:27 +10:00
Adam Tauber f7a3e9771d Merge pull request #615 from mmuman/scanr 
Add ScanR structures search engine
 2016-07-15 13:02:29 +02:00
marc aac4ed6971 [fix] guess country code if not specified in duckduckgo engine 2016-07-14 16:36:52 -05:00
a01200356 8fc4b8156a [fix] multilingual duckduckgo 
only works if both country and language are set
 2016-07-12 23:44:39 -05:00
François Revol 1dba6dcbac Add ScanR structures search engine 
In theory ScanR should also search for projects but the API is different,
so we'd need another engine.
 2016-07-12 15:47:04 +02:00
stepshal b3ab221b98 Fix anomalous backslash in string 2016-07-11 23:53:13 +07:00
stepshal cd9b494cb5 Fix quantity of blank lines after code object. 2016-07-10 21:44:27 +07:00
François Revol b538de568a Add INA search engine 2016-07-09 22:09:54 +02:00
Adam Tauber fbbb307f2e [enh] add engine shortcut to config api 2016-07-07 09:27:34 +02:00
Adam Tauber 9f64fd6745 [enh] update useragent versions 2016-07-04 23:12:44 +02:00
Adam Tauber 257e52954a [enh][fix] update to latest dependencies ++ fix tests & travis test runner 
WARNING: dependency changes
 2016-07-04 22:46:43 +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 8ee32d5372 [fix] hide number of results if 0 2016-06-28 00:21:18 +02:00
Adam Tauber 2f7752b410 [enh] display number of results 2016-06-28 00:06:50 +02:00
Adam Tauber 36c8977390 [fix] rtl result template 2016-06-27 23:52:24 +02:00
Adam Tauber 1ee2a3d25d [mod] more compact logicodev skin 2016-06-26 14:34:08 +02:00
Adam Tauber 0c9c063141 [fix] result url block selection 2016-06-26 14:13:03 +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
Adam Tauber 237d251d14 [fix] save unknown preferences parameters to cookies 
Without this courgette color selector can not work
 2016-06-26 01:44:42 +02:00
Adam Tauber 5dd2340bc6 [fix] gigablast redirect - closes #575 2016-06-12 00:07:54 +02:00
Adam Tauber 71d57df9d5 [fix] geektimes xpath - #575 2016-06-12 00:07:54 +02:00
Noemi Vanyi d43d9727a3 [enh] add server_settings call - closes #566 2016-06-11 00:20:09 +02:00
Noemi Vanyi 465fcfb9bd add archive.is xpath engine 2016-06-08 23:23:36 +02:00
Adam Tauber 27218b85fa [fix] missing import 2016-06-07 21:43:24 +02:00
Adam Tauber 2caf0d4c9a [enh] version 0.9.0 - #529 2016-05-24 13:35:52 +02:00
Adam Tauber bd361e60d8 Revert "use ngettext for plurals" 2016-05-24 12:49:21 +02:00
Adam Tauber ebc0bcb612 Merge pull request #551 from mikhirev/master 
use ngettext for plurals
 2016-05-19 15:52:23 +02:00
Adam Tauber bf1eebb17f Merge pull request #549 from guyou/feature-pool-fine-tuning 
Use new settings to fine tune the connection pool
 2016-05-19 15:51:14 +02:00
Dmitry Mikhirev 242c9ba756 3 plural forms in Russian 2016-05-11 01:59:36 +03:00
YuLun Shih 7364455d1f Fix 'set' object does not support indexing 2016-05-04 22:14:04 +08:00
Maxqia 56e53c9297 [fix] currency_convert: make unit tests pass 
also make regex more efficent and normalize 's'es
 2016-05-03 18:59:30 -07:00
Guilhem Bonnefille d571a9d204 Preset new values with defaulting values from code 2016-05-02 19:36:55 +02:00
Guilhem Bonnefille 3f395304f9 Fix pep8 2016-05-02 19:25:09 +02:00
Dmitry Mikhirev 921720563c update .po files 2016-05-02 12:58:34 +03:00
Dmitry Mikhirev 6d1d8a8f8d use ngettext 2016-05-02 12:36:54 +03:00
Maxqia fe2ce83e41 [enh] currency_convert: allow strings like google's "convert 1 euro to dollars" 2016-04-30 20:48:15 -07:00
Guilhem Bonnefille f18a3a77ef Use new settings to fine tune the connection pool 
In some circumstances, it is necessary to increase size of pool.
 2016-04-28 14:05:01 +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
Thomas Pointhuber 1833a8b1b8 [fix] use old system if there is no img_src 2016-04-21 15:13:26 +02:00
Thomas Pointhuber 63d68c8e0f [enh] add img_src to default result template 2016-04-21 15:10:08 +02:00
a01200356 a44faa7716 [fix] compile regex in ddg_definitions 2016-04-19 12:46:15 -05:00
a01200356 6dca14e95d [enh] multilingual duckduckgo_definitions 2016-04-17 16:34:46 -05:00
a01200356 8d335dbdae [enh] wikipedia infobox 
creates simple multilingual infobox using wikipedia's api
 2016-04-17 16:22:19 -05:00
Kirill Isakov 4eeb5fb76b [fix] incorrect URLs in Reddit results - closes #538 2016-04-16 16:22:31 +06:00
Adam Tauber 2661c3ab21 [mod] disable nyaa anime engine by default 2016-04-14 11:13:51 +02:00
Adam Tauber 85c0351dca Merge pull request #526 from ukwt/anime 
Add a few search engines
 2016-04-14 10:59:31 +02:00
Kirill Isakov 90c51cb449 Fix a few typos in Google search engine 2016-04-13 23:04:53 +06:00
Kirill Isakov d54e82dfb9 Revert to using random UA in Reddit search engine 2016-04-13 22:06:00 +06:00
Adam Tauber 5544fdb756 Merge pull request #531 from guyou/add-doku-engine 
Add doku engine
 2016-04-12 13:54:12 +02:00
Adam Tauber 11c2262055 Merge pull request #536 from kvch/general-minor-refactors 
General minor refactors
 2016-04-12 13:53:31 +02:00
Adam Tauber d27f7a1b07 [fix] clear image link if javascript enabled - closes #535 2016-04-10 02:24:00 +02:00
Guilhem Bonnefille 51cb832601 Comment out ubuntu-fr as it is not a general search engine 2016-04-09 22:21:25 +02:00
Noemi Vanyi adb1169fa3 add description to a var that seems to be unused 2016-04-09 19:49:59 +02:00
Noemi Vanyi 7daf98933d follow up blocked_engines renaming in templates 2016-04-09 19:49:59 +02:00
Noemi Vanyi 5867e97966 more follow ups in new preferences 2016-04-09 19:49:59 +02:00
Noemi Vanyi 8c4db08443 rename blocked engines to diabled engines 2016-04-09 19:49:59 +02:00
Noemi Vanyi 006841c4ff minor grammar fix in error message 2016-04-09 18:02:12 +02:00
Noemi Vanyi 1805cfd20a sort languages properly 2016-04-09 18:02:12 +02:00
Adam Tauber bb6dae1e42 [fix] user data check 2016-04-09 17:43:00 +02:00
Noemi Vanyi fe691a0988 new preferences handling 
Preferences class was introduced in order to handle user preferences. Right now
it parses cookies and the form in preferences. Also it can retrieve settings
based on the name of the setting.

ATTENTION
Please note that engine preferences are handled differently from now on. So it
introduces incompatible changes. Every user who has saved preferences should reset and
save his/her settings again.

This change was needed, because everytime a default disabled engine was
added saved user preferences would broke. Now engine setting tracking is
fixed.
 2016-04-09 01:08:44 +02:00
Adam Tauber 9331fc28a8 [fix] broken google images parsing 2016-04-07 08:07:17 +02:00
Guilhem Bonnefille 2733a92383 Fix query encoding 2016-04-05 13:31:49 +02:00
Guilhem Bonnefille f26f0dab2e Fix pep8 E302 
Cf. http://legacy.python.org/dev/peps/pep-0008/#blank-lines
 2016-04-04 13:38:22 +02:00
Guilhem Bonnefille f2d1a530fb Add ubuntu-fr wiki with new doku engine 2016-04-03 22:05:03 +02:00
Guilhem Bonnefille cf09b500f3 Add support for dokuwiki engine 2016-04-03 22:03:41 +02:00
Adam Tauber 5cbe4c5332 [fix] try to decode url - closes #527 2016-03-30 15:47:49 +02:00
Kirill Isakov d0001f10e6 Add searx user agent to Reddit engine request to comply with API usage terms 2016-03-30 17:30:46 +06:00
Adam Tauber fff9460238 Merge pull request #522 from jibe-b/master 
add BASE engine in category "Science"
 2016-03-30 11:09:22 +02:00
a01200356 94cb3a7f11 [enh] multilingual autocomplete 
implemented for wikipedia, qwant and google
 2016-03-29 19:10:13 -06:00
jibe-b 0b90cd42e2 minor update 2016-03-29 16:18:46 +02:00
jibe-b 092e15cc1d [enh] Add BASE engine in category Science. Basic and advanced search. 2016-03-29 16:17:17 +02:00
Kirill Isakov 0bfbdff234 Add Habrahabr & Geektimes search engines 2016-03-28 22:33:56 +06:00
Kirill Isakov 5b3c9f06eb Add BitBucket & GitLab search engines 2016-03-28 20:08:34 +06:00
Kirill Isakov bacc9a3df1 Add paging support to XPath & Erowid engines 2016-03-28 19:15:03 +06:00
Kirill Isakov e202c6fbec Fix PEP8 warnings for Nyaa.py 2016-03-27 05:23:17 +06:00
Kirill Isakov a8832574fa Shorten content field for very long Reddit search results 2016-03-27 05:09:04 +06:00
Kirill Isakov 80813c3e05 Add Erowid search engine 2016-03-27 04:29:23 +06:00
Kirill Isakov c1d456b136 Add F-Droid search engine 2016-03-27 03:50:44 +06:00
Kirill Isakov 547b8a8765 Add Tokyo Toshokan search engine 2016-03-27 00:49:57 +06:00
Adam Tauber 71de593a5b [fix] bing images page change 2016-03-26 02:07:52 +01:00
Kirill Isakov 7fbc12ee4e Add Torrentz.eu search engine 2016-03-26 05:28:58 +06:00
Adam Tauber 6d55642ab4 [fix] no more redirect ++ explicitly specify search language to avoid googles ip based heuristics 2016-03-25 18:38:02 +01:00
Kirill Isakov d026a97e42 Add Reddit search engine 2016-03-25 19:30:32 +06:00
Kirill Isakov 8b7dc2acb9 Remove content field from ArchWiki results; reformat code in archlinux.py 
Content field in Arch Wiki search results is of no real use, more often
than not it contains no usable information and includes too many markup
tags which make the text unreadable. It is safe to remove it.
 2016-03-25 00:38:48 +06:00
Kirill Isakov e5677ae6b6 Add Nyaa.se search engine 2016-03-25 00:24:37 +06:00
Kirill Isakov d748b8419a Add Arch Linux Wiki search engine 2016-03-24 01:57:27 +06:00
a01200356 751c9a346e [fix] duckduckgo's xpaths changed 
test_duckduckgo modified to reflect changes in duckduckgo's html
 2016-03-21 20:19:13 -06:00
Adam Tauber 0f518e489e [fix] csv results filename encoding 2016-03-16 10:43:28 +01:00
Adam Tauber e893d94185 [fix] docs url mod to prevent http redirect 2016-03-04 14:55:06 +01:00
Adam Tauber 6130f9a59f Merge pull request #473 from GreenLunar/patch-2 
Update link to documentation page
 2016-03-04 14:52:23 +01:00
Adam Tauber 667f7fde39 Merge pull request #516 from pointhi/translation-fix 
Translation fix
 2016-03-02 17:21:22 +01:00
Thomas Pointhuber 9a94b36593 [fix] translate plugin name and description in template 2016-03-02 17:16:46 +01:00
Thomas Pointhuber b8d1081756 [enh] reorder locales by alphabet, add english lanuage name in brackets 2016-03-02 16:41:56 +01:00
Thomas Pointhuber 2a1ddede5d [enh] update translation and add new languages 
add new languages:
* bg
* el_GR
* eo
* pt_BR
 2016-03-02 14:52:15 +01:00
Alexandre Flament 6ab91515df [enh] autocompletion : add qwant 2016-03-02 19:54:06 +08:00
Adam Tauber bc81eda64b [fix] opensearch image issue - closes #507 2016-03-02 11:52:11 +01:00
a01200356 8f3b33de23 [fix] remove unnecesary async calls in wolframalpha_noapi 
setting async to false in the request did the job, lol.
 2016-02-28 02:05:52 -06:00
a01200356 4cea71e3bb [fix] merge with 79705450df 2016-02-28 01:04:29 -06:00
a01200356 4d8996eb4d [enh] unit tests for wolframalpha 2016-02-28 00:47:36 -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
a01200356 78d3f3d6b1 [enh] infobox for wolframalpha 
TODO:
    - infobox styles
    - unit tests

ISSUES:
    - no_api version needs to re-call server for additional pods, such
      as plots. therefore, it's even slower than before. comment out the
part that calls get_async_pod if requests reach timeout or increase
timeout in settings.yml.
 2016-02-27 19:06:44 -06:00
Adam Tauber 45b5073f3e [fix] pep8 2016-02-27 19:07:53 +01:00
Adam Tauber 472a409022 [fix] robot tests 2016-02-27 19:01:55 +01:00
Adam Tauber 0fbd705259 [enh] settings option to change instance name - closes #450 2016-02-27 18:23:55 +01:00
Luc Didry fea2c5a713 Fix results with no scheme 
Related to #428, which was fixed in e3df22b but broken in a refactoring
(b6c3cb0)
 2016-02-26 12:05:11 +01:00
Adam Tauber 79705450df [fix] wolframalpha unicode inputs 2016-02-25 14:55:26 +01:00
Adam Tauber 10947536aa [enh] suspend engines after error 
The duration is based on the number of continuous errors, but maximized in one minute
 2016-02-20 00:21:56 +01:00
Adam Tauber 17b0c9f74a [mod] engine load refactor 2016-02-19 15:13:01 +01:00
Adam Tauber db72fc6449 [fix] encapsulate wolframalpha token fetching errors 2016-02-17 17:21:54 +01:00
Adam Tauber d06178139f [fix] wolframalpha page changes 
related issues: #508 #509
 2016-02-17 17:11:51 +01: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 b5061b5f0f [fix] restrict wikipedia queries to the titles to avoid irrelevant results 2016-02-09 21:21:59 +01:00
Adam Tauber 909424e1e5 [fix] real support of non wikipedia style mediawikis 2016-02-08 21:52:26 +01:00
Adam Tauber 2b0605d723 [enh] add occitan search language - example query: ":oc !wp south" - closes #445 2016-02-06 09:29:52 +01:00
Noemi Vanyi 3034c85163 fix pep8 errors 2016-02-04 21:01:44 +01:00
Noemi Vanyi 33fa3da2e8 add Frinkiac engine & tests 2016-02-04 20:27:36 +01:00
Adam Tauber ebbf33343a [fix] bing images changes 2016-02-01 21:40:28 +01:00
Adam Tauber 37035b7a40 [fix] gigablast params ++ json response format 2016-01-31 13:29:36 +01:00
Adam Tauber e061c6e059 [fix] swisscow and yandex escaping - fixes #499 2016-01-23 15:20:36 +01:00
Thomas Pointhuber 8bc0f04f4b [fix] typo 2016-01-21 15:57:02 +01:00
Adam Tauber 85151ab051 [mod] enable wolframalpha by default 2016-01-21 10:49:46 +01:00
Adam Tauber fab698003f [mod] move wolframalpha to "science" category 2016-01-21 10:45:34 +01:00
a01200356 30bfbf2e07 [fix] pep8 2016-01-18 11:34:38 -06:00
a01200356 51278ee0be Merge branch 'master' of https://github.com/asciimoo/searx 2016-01-18 11:29:45 -06:00
Adam Tauber 09b7673fbd [fix] temporary disable googles inner links - #491 2016-01-18 13:10:21 +01:00
Adam Tauber bd22e9a336 [fix] pep8 compatibilty 2016-01-18 12:47:31 +01:00
a01200356 c2e034f52a move two tests 2016-01-10 19:51:40 -06:00
a01200356 4130b3dfd6 Merge branch 'master' of https://github.com/asciimoo/searx 
Conflicts:
	searx/tests/test_engines.py
 2016-01-10 19:29:05 -06:00
Adam Tauber 39d2e0427f [fix] robot tests and pep8 check 2016-01-10 19:23:10 +01:00
Adam Tauber 53979a7bf7 [mod] remove buildout/makefile infrastructure 2016-01-10 19:23:10 +01:00
Adam Tauber 66f48c2bf5 [fix] google markup change - closes #489 2016-01-10 18:49:50 +01:00
a01200356 3bbdb23fd8 Merge branch 'master' of https://github.com/asciimoo/searx 2016-01-08 11:15:50 -06:00
misnyo f86e212dba [fix]#485 AttributeError: 'module' object has no attribute 'old_where' 2016-01-06 19:37:20 +01:00
a01200356 8ca5744814 append link to result in wolframalpha_api (and the tests to validate that) 2016-01-05 21:47:31 -06:00
a01200356 2a15944b58 [fix] test in wolframalpha_noapi 2016-01-03 22:03:33 -06:00
a01200356 d997265e55 add tests for unicode strings in wolframalpha 2016-01-03 19:57:37 -06:00
a01200356 e5d51a0e98 Merge branch 'master' into wolframalpha 2016-01-03 16:00:05 -06:00