Commit Graph

2190 Commits

Author SHA1 Message Date
Alexandre Flament 0af50e8505 Remove pyasn1-modules from dependencies
According to https://github.com/kennethreitz/requests/issues/749#issuecomment-19187417 there is no need to install pyasn1-modules.
2017-01-06 17:23:54 +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
Adam Tauber 025ce5a1d9 Merge pull request #813 from dalf/standalone2
[enh] standalone_seax.py is a command line interface to searx
2017-01-04 19:07:52 +01:00
Alexandre Flament 369ec017b7 [enh] standalone_seax.py is a command line interface to searx with JSON output. 2017-01-04 14:14:01 +01:00
Adam Tauber e8cdaf1170 Merge pull request #812 from kvch/revert-image-modal
Revert CSS image modal
2017-01-04 00:22:17 +01:00
Adam Tauber f81284476c Merge pull request #810 from dalf/standalone
[fix] fix standalone_search.py
2017-01-04 00:17:42 +01:00
Adam Tauber 02bba2abdc Merge pull request #811 from dalf/geckodriver
[mod] ./manage.sh can download geckodriver
2017-01-04 00:17:18 +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
Alexandre Flament 6db25fc5c2 [mod] ./manage.sh can download geckodriver and install it into the virtual environment 2017-01-03 19:25:04 +01:00
Alexandre Flament 7bcdc27a2e [fix] fix standalone_search.py 2017-01-03 19:15:55 +01:00
Adam Tauber 7b1daf254e [fix] autocomplete unicode issue - closes #808 2017-01-03 13:11:38 +01:00
Adam Tauber 74ed0ad89e Merge pull request #805 from dalf/requirements_upgrade
[mod] upgrade versions in requirements.txt
2017-01-02 20:26:10 +01:00
Alexandre Flament 20c94592e7 [mod] upgrade versions in requirements.txt 2017-01-02 14:11:48 +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
Adam Tauber 79ceb13577 Merge pull request #799 from kvch/modal-arrows
[fix] change modal glyphicon arrows to image icons
2016-12-30 15:21:08 +01:00
Noémi Ványi d18d09a98b [fix] change modal glyphicon arrows to image icons 2016-12-30 14:59:46 +01:00
Adam Tauber eaa0fb8102 Merge pull request #798 from dalf/searchpy4
[mod] add a search_one_request_safe function wrapper
2016-12-30 13:01:04 +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
Adam Tauber bff41987a4 Merge pull request #793 from kvch/pics-modal
CSS modal window for image results
2016-12-30 00:33:40 +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
Adam Tauber d08108be62 Merge pull request #794 from a01200356/languages
Changes in search language list (continuation of #748)
2016-12-29 10:41:14 +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 9743bde25e Merge pull request #748 from a01200356/languages
[mod] Allow users to search in most engine supported languages
2016-12-28 20:09:57 +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
Adam Tauber 383160e99a Merge pull request #788 from suchkultur/add_ccctv_to_settings
Add ccctv engine to settings.yml
2016-12-25 22:40:36 +01:00