Commit Graph

4011 Commits

Author SHA1 Message Date
Alexandre Flament cfcbc3a5c3
[mod] settings.yml: update comments about the morty key. (#1639)
Fix #1310
Since commit af77ec35d9bd28facdab645a3d57ae340d2b501c Morty accepts base64 encoded key.
2019-07-17 10:29:28 +02:00
rachmadani haryono ec88fb8a0f [fix] secret_key can be bytes instead of a string (#1602)
Fix #1600
In settings.yml, the secret_key can be written as string or as base64 encoded data using !!binary notation.
2019-07-17 10:09:09 +02:00
rachmadani haryono 8f44014627 [fix] preference query parameter decoding (#1599)
Fix issue #1598
2019-07-17 09:42:40 +02:00
Alexandre Flament 582f3bfcbc
Merge pull request #1638 from dalf/suggestions
Suggestions: use RawTextQuery to make the suggestions URLs.
2019-07-17 09:20:07 +02:00
Dalf c7220b40ea Suggestions: use RawTextQuery to make the suggestions URLs. Update all themes accordingly. 2019-07-17 09:05:29 +02:00
Alexandre Flament ddee4861ce
Merge pull request #1630 from MarcAbonce/bang_fixes
[fix] Small fixes with bangs in queries
2019-07-16 11:08:36 +02:00
Alexandre Flament 4d38b8bef7
Merge branch 'master' into bang_fixes 2019-07-16 11:03:52 +02:00
Alexandre Flament f750df8713
Merge pull request #1636 from MarcAbonce/babel_update
Add Interlingua translation (fix #978)
2019-07-16 10:48:41 +02:00
Marc Abonce Seguin a3368c07a7 [enh] Add Interlingua locale (requires requirements update) 2019-07-15 13:38:51 -05:00
Alexandre Flament 2b5a7169a3
Merge pull request #1635 from asciimoo/update-documentation
README.rst: installation: add searx/searx-docker
2019-07-13 17:56:17 +02:00
Alexandre Flament efc2a87e77 README.rst: installation: add searx/searx-docker 2019-07-13 17:28:05 +02:00
Alexandre Flament 5b50e116b8
Merge pull request #1629 from dalf/docker
Update Docker image
2019-07-13 16:37:39 +02:00
Dalf 45702b77ca embedded iframe (youtube, dailymotion, vimeo): use https 2019-07-13 15:49:59 +02:00
Dalf 609ac5795a .travis.yml: robot tests: remove the xvfb dependency 2019-07-13 15:49:59 +02:00
Dalf fbe40001d3 Update Docker image
See #1561 , use uwsgi and Alpine Linux

Volume:
/var/log/uwsgi contains error log for 2 days (file uwsgi.log)
/etc/searx contains the settings.yml and uwsgi.ini files.
The docker image creates them if they don't exist.
The two files can be modified after the first run. See below.

Environement variables:
MORTY_URL : external URL of Morty
MORTY_KEY : base64 encoded key
BASE_URL : external URL of Searx
BIND_ADDRESS : internal HTTP port to listen to

Labels : org.label-schema.schema.*

Parameters:
-h : display this help
-d : will update the settings and quit immediately (settings.yml and uwsgi.ini)
-f : always update the settings (previous version saved with suffix .old).
     without this parameter, the new settings are copied with suffix .new

When the Docker image contains newer settings:
- without -f parameter: the new versions are copied to /etc/searx/settings.yml.new and /etc/searx/uwsgi.ini.new.
- with -f parameter:  the old versions are renamed with .old suffix. The new version replaces /etc/searx/settings.yml and /etc/searx/uwsgi.ini

Build using "./manage.sh docker_build", add "push" as parameter also push the Docker image.
The script requires a git repository to work (it makes sure that the last git tag matches searx/version.py)
"git describe" is used to create a meaningful version.
Example : 0.15.0-90-49c5bcb4-dirty (dirty means that the docker image was made with uncommited changes).

Use "docker inspect -f {{.Config.Labels.version}} searx" to get the version of an existing image.

.dockerignore based on .gitignore

.travis.yml: include docker stage
2019-07-13 15:49:59 +02:00
Alexandre Flament 3b8b862d8c
Merge branch 'master' into bang_fixes 2019-07-06 18:48:03 +02:00
Alexandre Flament 3faaf34e25
Fix ./manage.sh robot_tests (#1633)
doi_resolvers / default_doi_resolver were missing in the settings_robots.yml file, so the test server was not able to start (crash). Since the output wasn't displayed, it was not obvious why the Selenium couldn't connect to searx.
2019-07-06 18:47:35 +02:00
Marc Abonce Seguin 6626f01365 [fix] preserve bangs in suggestions and corrections 2019-07-01 19:52:34 -05:00
Marc Abonce Seguin 40272b0044 [fix] never pass bangs to autocomplete suggestions 2019-07-01 17:16:02 -05:00
Noémi Ványi 69c8ad86f3
Merge pull request #1614 from Nachtalb/ne/improve-infinite-scroll
Improve infinite scroll (and with it fixing a bug)
2019-06-30 13:49:16 +02:00
Noémi Ványi 6c75052874
Merge branch 'master' into ne/improve-infinite-scroll 2019-06-30 13:45:09 +02:00
Noémi Ványi 4c768f9fe6
Merge pull request #1590 from rachmadaniHaryono/feature/fix-config
fix: dev: python3 dict keys jsonify
2019-06-24 23:16:41 +02:00
Noémi Ványi 1e30f19800
Merge branch 'master' into feature/fix-config 2019-06-24 23:10:22 +02:00
Noémi Ványi 48ccc6c39a
Merge pull request #1620 from nfk/addr_setup
Add addr setup via SEARX_BIND_ADDRESS
2019-06-24 22:56:45 +02:00
Nicolas Gelot 373a66be30 Fix locale and search language
Locale and search language was always defined with english value.

This patch inits the locale on `pre_request` in order to define the
default value of locale and language preferences.

Plus the `best_match` function provided by flask babel library did not
work as expected. So the function `match_language` provided
by searx is used to detect that the language from Accepted-Language
header can be used in searx project.
2019-06-17 23:19:15 +02:00
Nicolas Gelot a818d3241d Remove get local from request.args
args parameters are merged in form in pre_request, so
this patch removes that useless operation.
2019-06-17 23:13:04 +02:00
Nicolas Gelot db1dfa4a28 Add addr setup via SEARX_BIND_ADDRESS 2019-06-17 22:42:56 +02:00
rachmadani haryono 697102af78
Merge branch 'master' into feature/fix-config 2019-06-09 19:50:19 +08: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
Noémi Ványi 8189b0d192
Merge pull request #1588 from rachmadaniHaryono/feature/fix-nose-coverage
install coverage_plugin of nose2 instead of coverage-plugin
2019-06-03 20:30:05 +02:00
rachmadani haryono 45eb2688d0
Merge branch 'master' into feature/fix-config 2019-05-29 19:17:28 +08:00
rachmadani haryono 43568a76dc
Merge branch 'master' into feature/fix-nose-coverage 2019-05-29 19:17:13 +08:00
Emilien Devos cbd1ebdce8 [fix] Force Google old UI (#1597) 2019-05-29 10:05:57 +09:00
rachmadani haryono ac357b12e3
Merge branch 'master' into feature/fix-config 2019-05-28 19:16:58 +08:00
rachmadani haryono 914141292f
Merge branch 'master' into feature/fix-nose-coverage 2019-05-28 19:16:46 +08:00
Frank de Lange 4b7332286a Use string formatter to create source and img_format labels (#1566)
google_images :  use JSON embedded in HTML (engine expected pure JSON)
2019-05-28 12:33:31 +09:00
Alexandre Flament a255651671
Merge pull request #1562 from asciimoo/settings
Remove some engines : subtitleseeker, seedpeer, swisscows
2019-05-28 11:14:15 +09:00
Dalf ffe0972f91 Remove some engines : subtitleseeker, seedpeer, swisscows
http://www.subtitleseeker.com and http://www.seedpeer.eu don't exist anymore.
https://swisscows.ch/ has change : the engine needs to be updated
2019-05-28 04:06:35 +02:00
rachmadani haryono 7a127b4547
Merge branch 'master' into feature/fix-config 2019-05-28 06:55:20 +08:00
rachmadaniHaryono 22a35f0362 fix: dev: nose package 2019-05-28 06:52:39 +08:00
Alexandre Flament 6c95ebcff5
Merge pull request #1595 from Venca24/fix_seznam
[fix] seznam engine
2019-05-28 07:27:40 +09:00
Alexandre Flament 9318551890
Merge branch 'master' into fix_seznam 2019-05-28 07:23:06 +09:00
Adam Tauber b6ae5c340d
Merge pull request #1605 from dalf/requirements
requirements.txt : update dependencies
2019-05-28 00:16:14 +02:00
Dalf 1418361cbc requirements.txt : update dependencies 2019-05-26 04:31:58 +02:00
Venca24 c66a019478 [fix] seznam engine 2019-05-21 14:27:30 +02:00
rachmadaniHaryono 9afc1b1e83 new: dev: test for config api 2019-05-18 18:58:05 +08:00
rachmadaniHaryono 535fff109f fix: dev: python3 dict keys jsonify 2019-05-18 00:03:49 +08:00
Alexandre Flament a84caa22cf
Merge pull request #1558 from brunob/patch-1
simple theme : use instance_name for page title
2019-04-19 10:04:53 +02:00
Alexandre Flament 9012ad498c
Merge branch 'master' into patch-1 2019-04-19 09:59:04 +02:00
Alexandre Flament 629b36d442
Merge pull request #1563 from Nachtalb/ne/fix-google-image-search
Fix google image search engine
2019-04-14 14:11:05 +02:00