kamp/searxng
1
0
Fork 0
mirror of https://github.com/searxng/searxng.git synced 2024-11-16 17:40:11 +01:00
Code
3,029 Commits 6 Branches 17 Tags 132 MiB
1075f58a72
Commit Graph

3029 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Markus Heiser
f272781ab7
Merge branch 'master' into autocomplete_swisscows 2020-02-23 14:43:33 +00:00
Markus Heiser
57efb45ce5
Merge pull request #1773 from Monogramm/docker/opencontainers 
📝 Add Opencontainers labels in docker image
 2020-02-23 14:43:14 +00:00
Markus Heiser
b7105da2af Add missing autocomplete backends to settings.yml comment 
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2020-02-23 15:41:08 +01:00
Markus Heiser
78c5216d76
Merge branch 'master' into autocomplete_swisscows 2020-02-23 14:24:42 +00:00
Markus Heiser
55aa7f96c1
Merge branch 'master' into docker/opencontainers 2020-02-23 11:55:20 +00:00
Markus Heiser
8c26097757
Merge pull request #1842 from piplongrun/engine-etools 
Add new eTools.ch engine
 2020-02-23 11:52:29 +00:00
Markus Heiser
98322ac15c
Merge branch 'master' into engine-etools 2020-02-23 11:47:49 +00:00
Markus Heiser
90d23e7ef6
Merge pull request #1860 from MarcAbonce/fix-default-locale 
Fix default locale and language issues
 2020-02-23 11:39:04 +00:00
Marc Abonce Seguin
c0006cadf7 fix default locale and language issues 2020-02-23 02:03:42 -07:00
Markus Heiser
2ade2ce10a
Merge pull request #1855 from return42/fix-dead-links 
docs: fix dead Searx-instance links to https://searx.space
 2020-02-20 18:31:05 +00:00
Markus Heiser
a9d184473f docs: fix dead Searx-instance links to https://searx.space 
Related to #1853 / BTW update year of copyright note

Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2020-02-20 18:11:34 +01:00
Adam Tauber
6df4172887 [fix] allow settin custom locale from settins.yml 2020-02-18 00:56:27 +01:00
Markus Heiser
ab2f56e886
Merge pull request #1843 from dalf/searx_space 
[mod] move public instance list to https://searx.space
 2020-02-15 09:06:37 +00:00
piplongrun
b136480546
Add Swisscows autocomplete option 2020-02-14 19:19:24 +01:00
Dalf
88f9ac58f4 [mod] move public instance list to https://searx.space 2020-02-14 13:48:44 +01:00
piplongrun
e1b60106b7
Add etools engine to the list 2020-02-12 23:59:18 +01:00
piplongrun
f0684a5bb5
Add eTools engine 2020-02-12 23:58:50 +01:00
Markus Heiser
7f224713e5
Merge pull request #1621 from nfk/locale 
Fix regional settings #844
 2020-02-08 14:54:22 +00:00
Markus Heiser
7c79eb9b1b Merge commit 'refs/pull/1621/head' of https://github.com/asciimoo/searx 
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2020-02-08 15:08:33 +01:00
Markus Heiser
50b070c5d3 Merge pull request #1835 from dalf/uwsgi_fix 
[fix] Disable HTTP keep alive
 2020-02-08 12:52:22 +00:00
Markus Heiser
3f127b6c95
Merge branch 'master' into uwsgi_fix 2020-02-08 12:47:56 +00:00
Markus Heiser
3062e2adf9 Merge pull request #1823 from kvch/make-engines-private 
Thanks! .. excellent work, I see you on #1836 :)
 2020-02-08 12:04:42 +00:00
Noémi Ványi
99435381a8 [enh] introduce private engines 
This PR adds a new setting to engines named `tokens`.
It expects a list of tokens which lets searx validate
if the request should be accepted or not.
 2020-02-08 11:47:39 +01:00
Dalf
0579d93783 [fix] Disable HTTP keep alive 
Fix HTTP 429 response from filtron
See https://github.com/searx/searx-docker/issues/24
 2020-02-07 19:16:15 +01:00
Adam Tauber
f9c7a678d2 [doc] fix rst format to be able to upload the package to pypi 2020-02-07 12:00:45 +01:00
Adam Tauber
ab1b1ac358
Merge pull request #1831 from nfk/nicofonk/fix/werkzeug_import 
Fix deprecated werkzeug import
 2020-02-06 21:58:42 +00:00
Nicolas Gelot
b8b13372c8 Fix deprecated werkzeug import 
Close: #1830
Signed-off-by: Nicolas Gelot <nicolas.gelot@e.email>
 2020-02-06 22:49:35 +01:00
Adam Tauber
6060ab85f8 [enh] version v0.16.0 2020-01-30 13:39:06 +01:00
Adam Tauber
89662cd33e [enh] update AUTHORS.rst with new contributors 2020-01-30 13:33:19 +01:00
Adam Tauber
b6a2aff94a [enh] update translations 2020-01-30 11:16:15 +01:00
Adam Tauber
8e3bd3fcbd [mod] add py2 deprecation warning to webapp 2020-01-28 15:52:50 +01:00
Markus Heiser
54675c7690
Merge pull request #1766 from dalf/fix-infinite-scroll 
[mod] infinite scroll: XHR requests are sent with the header "Accept: text/html"
 2020-01-28 11:04:02 +00:00
Markus Heiser
e64ff38217
Merge branch 'master' into fix-infinite-scroll 2020-01-28 10:59:03 +00:00
Mathieu Brunot
24472ce718
Merge branch 'master' into docker/opencontainers 2020-01-14 15:43:43 +01:00
Markus Heiser
bda1895655
Merge pull request #1804 from unixfox/patch-1 
searx.be stopped using Fathom analytics
 2020-01-12 11:25:47 +00:00
Emilien Devos
e84067816b
searx.be stopped using Fathom analytics 2020-01-12 10:48:29 +00:00
Adam Tauber
68abe6ff11
Merge pull request #1800 from Yetangitu/flickr_noapi_double_encode 
[engines|fix] flickr_noapi: Fix double-encode error (fixes #1799)
 2020-01-08 00:42:17 +00:00
frankdelange
db9d7d47bd Fix double-encode error (fixes #1799) 2020-01-07 21:41:43 +01:00
Markus Heiser
22d05b3e59
Merge pull request #1791 from return42/add-docs 
misc docs
 2020-01-06 14:28:24 +00:00
Markus Heiser
86b5163641 docs: move wiki/Searx-instances from wiki to docs 
fix project link in conf.py

Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2020-01-06 15:06:36 +01:00
Markus Heiser
f521a279ac Merge branch 'master' of https://github.com/asciimoo/searx into add-docs 2020-01-06 14:32:34 +01:00
Markus Heiser
0f4f0e517e docs(user): move wiki/Searx-instances from wiki to docs 
fixed some reST markups

Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2020-01-06 14:31:18 +01:00
Markus Heiser
a3bbf95ad5
Merge pull request #1781 from finn0/bug/oscar-theme 
Oscar: move info box at top of the page
 2020-01-06 08:16:22 +00:00
Markus Heiser
1d86d0054f
Merge branch 'master' into bug/oscar-theme 2020-01-06 08:05:29 +00:00
Markus Heiser
3bb97fcb84 docs(user): public instances, fix Searxes@Danwin entry 
fixes: https://github.com/asciimoo/searx/issues/1770

This is not Searx at all. This is Meta-Searx with other engines.

See https://github.com/asciimoo/searx/issues/1770#issuecomment-570776655

Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2020-01-05 10:02:42 +01:00
Markus Heiser
200c3a31f5 docs(user): move wiki/Searx-instances from wiki to docs (WIP) 
Move wiki entry https://github.com/asciimoo/searx/wiki/Searx-instances
into user section of the docs (#1785).

links has been ported from markdown to reST by::

      regexpr:        \[([^\]]*)\]\(([^)]*)\)
      substitution:  `\1 <\2>`__

Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2020-01-04 18:26:04 +01:00
Markus Heiser
7347d9b508 docs(user): move wiki/Searx-instances from wiki to docs 
Move wiki entry https://github.com/asciimoo/searx/wiki/Searx-instances
into user section of the docs (#1785).

Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2020-01-04 17:09:11 +01:00
Markus Heiser
51b9295b84 Merge branch 'master' of https://github.com/asciimoo/searx into add-docs 2020-01-03 14:30:53 +01:00
Adam Tauber
17b6faa4c3 [fix] pep8 2020-01-02 22:38:12 +01:00
Adam Tauber
ad5bb994b1 [fix] add py3 compatibility 2020-01-02 22:30:18 +01:00