Commit Graph

2688 Commits

Author SHA1 Message Date
Noémi Ványi 25367cfba1
Merge branch 'master' into setup-no-tests 2019-01-15 22:11:26 +01:00
d-tux f1814079f0
Merge branch 'master' into engines/unsplash 2019-01-14 13:40:57 +01:00
pelag0s 2061c59ca1 Define http proxy variables in Dockerfile before using them 2019-01-14 09:24:57 +01:00
pelag0s c1af891707 docker: allow configuring http proxy via env variables 2019-01-12 11:10:00 +01:00
Noémi Ványi 383e3cc554
Merge pull request #1483 from MarcAbonce/wolframalpha_api_fix
[fix] Unicode error with WolframAlpha API engine (fixes #1480)
2019-01-11 20:45:48 +01:00
Marc Abonce Seguin 626a8e9ac9 [fix] unicode error with WolframAlpha API engine 2019-01-08 21:02:23 -06:00
d-tux 329172f66e
Merge branch 'master' into engines/unsplash 2019-01-08 09:24:45 +01:00
Noémi Ványi 2438b3c77a
Merge pull request #1475 from kvch/add-all-language-option-again
Revert "remove 'all' option from search languages"
2019-01-07 21:35:40 +01:00
Noémi Ványi 97351a2c72 fix after rebase 2019-01-07 21:28:58 +01:00
Noémi Ványi b63d645a52 Revert "remove 'all' option from search languages"
This reverts commit 4d1770398a.
2019-01-07 21:19:00 +01:00
Noémi Ványi 491792c1a5
Merge pull request #1446 from MarcAbonce/language_aliases_fix
[fix] Fix queries in Hebrew and Norwegian so they give results in the right language
2019-01-07 20:38:05 +01:00
Noémi Ványi 1a850cf171
Merge branch 'master' into language_aliases_fix 2019-01-07 20:33:31 +01:00
Noémi Ványi 35d82ed660
Merge pull request #1478 from milouse/fix/simple_theme
Fix simple theme
2019-01-07 18:41:54 +01:00
Étienne Deparis 89deb4fbcc [fix] Remove markup errors in simple template preferences file 2019-01-07 10:48:25 +01:00
Étienne Deparis 21beb64a72 Remove forgotten white spaces in templates/simple/preferences.html 2019-01-07 10:48:20 +01:00
Étienne Deparis 0d4d58f794 [enh] Add preference section to two upstream plugins for simple theme integration 2019-01-07 10:48:14 +01:00
Marc Abonce Seguin 0169b63e84 [fix] fetch google's supported languages 2019-01-06 21:31:45 -06:00
Marc Abonce Seguin 51111c2594 [fix] always set langauge_aliases even if it's empty 2019-01-06 20:49:56 -06:00
Marc Abonce Seguin 5568f24d6c [fix] check language aliases when setting search language 2019-01-06 20:31:57 -06:00
Adam Tauber 3c95d64ff8
Merge pull request #1477 from kvch/master
Release v0.15.0
2019-01-06 22:29:18 +01:00
Noémi Ványi 29d146dde6 update changelog and version.py 2019-01-06 21:59:59 +01:00
Noémi Ványi f9ccc9f656 update AUTHORS.rst with new contributors 2019-01-06 21:49:42 +01:00
Noémi Ványi 62690f623d pull translations from Transifex 2019-01-06 21:49:42 +01:00
Noémi Ványi 62cc1dcc52
Merge pull request #1474 from Venca24/devel_mojeek
[add] mojeek engine
2019-01-06 11:33:35 +01:00
Venca24 8567cc7433 [add] mojeek engine 2019-01-06 10:47:09 +01:00
Noémi Ványi abcbcec0b5
Merge pull request #1444 from Venca24/devel_google_videos
[fix] google videos engine
2019-01-05 18:08:05 +01:00
Venca24 2456b8f571 [mod] google videos 2019-01-05 12:12:09 +01:00
Noémi Ványi 1ea56576dc
Merge branch 'master' into devel_google_videos 2019-01-04 22:27:05 +01:00
Noémi Ványi 899ba5d6de
Merge pull request #1461 from dimqua/master
Remove Ixquick engine
2019-01-04 22:20:37 +01:00
Noémi Ványi aeb6dab187
Merge branch 'master' into master 2019-01-04 22:14:40 +01:00
Noémi Ványi 82bf9c6b29
Merge pull request #1464 from miicha/bugfix_startpage
restore startpage search results
2019-01-04 22:10:38 +01:00
Noémi Ványi 5b81f7c2cc
Merge branch 'master' into bugfix_startpage 2019-01-04 22:03:00 +01:00
Venca24 0e493db2fb [fix] google videos test 2019-01-04 16:04:05 +01:00
Venca24 cf26aba93b [FIX] google videos thumbnails 2019-01-04 15:48:22 +01:00
Noémi Ványi cf8e224601
Merge pull request #1469 from bourrel/fix_bing_images
Fix bing image thumbnail path
2019-01-01 21:45:39 +01:00
Léo Bourrel 73ec2ba74e Update bing image engine with new image json format 2018-12-19 11:12:25 +01:00
Michael Pfitzner 83a06d276d change rest of test_startpage.py 2018-12-14 22:29:57 +01:00
Michael Pfitzner 5a20d9ecd1 change the html in test_startpage.py to look more like the actual startpage site 2018-12-14 22:18:21 +01:00
Michael Pfitzner 44ce51f0c5 restore startpage search results 2018-12-14 21:38:48 +01:00
d-tux 4a127b19de
Merge branch 'master' into engines/unsplash 2018-12-14 07:06:19 +01:00
dimqua 0d86ed9c7e update startpage.py 2018-12-11 21:45:47 +03:00
dimqua 0823b13ae1 remove Ixquick engine 2018-12-11 20:25:52 +03:00
dimqua 442772a6c5 remove findx engine (#1452) 2018-12-02 22:39:04 +01:00
ZEROF 81db2e07ea Update Dockerfile (#1451)
- Forget one "\" in the process!
2018-11-29 18:49:03 +01:00
Ivan Skytte Jørgensen 0b7f0bde62 Use a more human-friendly format in searx/data/engines_languages.json (#1399)
Instead of a single line with 500000 characters use nicely formatted JSON.
Sort the lists in engine_languages.py so when updating it is possible to
more easily see the differences (search engines do change the order their
languages are listed in)
2018-11-29 16:31:05 +01:00
pofilo 3ff67c2e78
Merge pull request #1438 from Venca24/devel_seznam
[add] seznam engine
2018-11-29 16:20:33 +01:00
pofilo 1e1437580a
Merge branch 'master' into devel_seznam 2018-11-29 15:56:12 +01:00
pofilo ab8f7083e2
Merge pull request #1450 from ZEROF/patch-1
Update Dockerfile
2018-11-29 11:55:48 +01:00
ZEROF 6b462afe74
Update Dockerfile
- Fix for docker image build error "Could not find a version that satisfies the requirement cffi!=1.11.3,>=1.7 (from versions: )"
2018-11-29 10:30:59 +01:00
Venca24 cee15f0375 [fix] google videos test 2018-11-22 13:18:18 +01:00