From cbc08fdc26e96bf2cb02b76a30be095f5f60df9f Mon Sep 17 00:00:00 2001
From: Markus Heiser <markus.heiser@darmarit.de>
Date: Wed, 4 Mar 2020 19:56:40 +0100
Subject: docs: describe uwsgi setup of all suported distributions

Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
---
 searx/settings.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'searx')

diff --git a/searx/settings.yml b/searx/settings.yml
index 078d95b72..667338e12 100644
--- a/searx/settings.yml
+++ b/searx/settings.yml
@@ -1,5 +1,5 @@
 general:
-    debug : False # Debug mode, only for development
+    debug : True # Debug mode, only for development
     instance_name : "searx" # displayed name
 
 search:
-- 
cgit v1.2.3


From 0742c2504dae04ac054d263de8a2b8ab6161312c Mon Sep 17 00:00:00 2001
From: Markus Heiser <markus.heiser@darmarit.de>
Date: Sun, 29 Mar 2020 16:28:17 +0200
Subject: build environment: add GIT_BRANCH variable

Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
---
 searx/brand.py | 1 +
 1 file changed, 1 insertion(+)

(limited to 'searx')

diff --git a/searx/brand.py b/searx/brand.py
index d563447f6..91d2ab321 100644
--- a/searx/brand.py
+++ b/searx/brand.py
@@ -1,4 +1,5 @@
 GIT_URL = 'https://github.com/asciimoo/searx'
+GIT_BRANCH = 'master'
 ISSUE_URL = 'https://github.com/asciimoo/searx/issues'
 SEARX_URL = 'https://searx.me'
 DOCS_URL = 'https://asciimoo.github.io/searx'
-- 
cgit v1.2.3


From fcc5af66d8b4b364d98673d7c37e3b09373f4912 Mon Sep 17 00:00:00 2001
From: Markus Heiser <markus.heiser@darmarit.de>
Date: Thu, 21 May 2020 15:16:49 +0200
Subject: [fix] disable debug in settings.yml by default

debug was accidentally enabled in commit cbc08fd

Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
---
 searx/settings.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'searx')

diff --git a/searx/settings.yml b/searx/settings.yml
index b0dee9fed..77cc4e087 100644
--- a/searx/settings.yml
+++ b/searx/settings.yml
@@ -1,5 +1,5 @@
 general:
-    debug : True # Debug mode, only for development
+    debug : False # Debug mode, only for development
     instance_name : "searx" # displayed name
 
 search:
-- 
cgit v1.2.3


From 08c13daf85311aa1799b8ea9e0990fab058c2b7f Mon Sep 17 00:00:00 2001
From: Adam Tauber <asciimoo@gmail.com>
Date: Thu, 18 Jun 2020 19:37:14 +0200
Subject: [enh] update opensearch.xml to match major search engines
 opensearch.xml

---
 searx/templates/__common__/opensearch.xml | 20 +++++---------------
 searx/webapp.py                           |  2 +-
 2 files changed, 6 insertions(+), 16 deletions(-)

(limited to 'searx')

diff --git a/searx/templates/__common__/opensearch.xml b/searx/templates/__common__/opensearch.xml
index 15d3eb792..27634245f 100644
--- a/searx/templates/__common__/opensearch.xml
+++ b/searx/templates/__common__/opensearch.xml
@@ -6,23 +6,13 @@
   <Image>{{ urljoin(host, url_for('static', filename='img/favicon.png')) }}</Image>
   <LongName>searx metasearch</LongName>
   {% if opensearch_method == 'get' %}
-    <Url type="text/html" method="get" template="{{ host }}search?q={searchTerms}"/>
-    {% if autocomplete %}
-    <Url type="application/x-suggestions+json" method="get" template="{{ host }}autocompleter">
-        <Param name="format" value="x-suggestions" />
-        <Param name="q" value="{searchTerms}" />
-    </Url>
-    {% endif %}
+    <Url rel="results" type="text/html" method="get" template="{{ host }}search?q={searchTerms}"/>
   {% else %}
-    <Url type="text/html" method="post" template="{{ host }}">
+    <Url rel="results" type="text/html" method="post" template="{{ host }}">
         <Param name="q" value="{searchTerms}" />
     </Url>
-    {% if autocomplete %}
-    <!-- TODO, POST REQUEST doesn't work -->
-    <Url type="application/x-suggestions+json" method="get" template="{{ host }}autocompleter">
-        <Param name="format" value="x-suggestions" />
-        <Param name="q" value="{searchTerms}" />
-    </Url>
-    {% endif %}
+  {% endif %}
+  {% if autocomplete %}
+    <Url rel="suggestions" type="application/json" template="{{ host }}autocompleter"/>
   {% endif %}
 </OpenSearchDescription>
diff --git a/searx/webapp.py b/searx/webapp.py
index 68be25584..35495a0ff 100755
--- a/searx/webapp.py
+++ b/searx/webapp.py
@@ -949,7 +949,7 @@ def opensearch():
 
     resp = Response(response=ret,
                     status=200,
-                    mimetype="text/xml")
+                    mimetype="application/opensearchdescription+xml")
     return resp
 
 
-- 
cgit v1.2.3


From 4ec2fab583d567b7bee45507304dd405f1fef2b2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?No=C3=A9mi=20V=C3=A1nyi?= <sitbackandwait@gmail.com>
Date: Tue, 16 Jun 2020 23:00:46 +0200
Subject: Consider HTTP request when running search categories on select is
 enabled

Closes #1138
---
 searx/static/plugins/js/search_on_category_select.js | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

(limited to 'searx')

diff --git a/searx/static/plugins/js/search_on_category_select.js b/searx/static/plugins/js/search_on_category_select.js
index 1c42d9e9e..d590ed127 100644
--- a/searx/static/plugins/js/search_on_category_select.js
+++ b/searx/static/plugins/js/search_on_category_select.js
@@ -6,19 +6,37 @@ $(document).ready(function() {
             });
             $(document.getElementById($(this).attr("for"))).prop('checked', true);
             if($('#q').val()) {
+                if (getHttpRequest() == "GET") {
+                    $('#search_form').attr('action', $('#search_form').serialize());
+                }
                 $('#search_form').submit();
             }
             return false;
         });
         $('#time-range').change(function(e) {
             if($('#q').val()) {
+                if (getHttpRequest() == "GET") {
+                    $('#search_form').attr('action', $('#search_form').serialize());
+                }
                 $('#search_form').submit();
             }
         });
         $('#language').change(function(e) {
             if($('#q').val()) {
+                if (getHttpRequest() == "GET") {
+                    $('#search_form').attr('action', $('#search_form').serialize());
+                }
                 $('#search_form').submit();
             }
         });
     }
 });
+
+function getHttpRequest() {
+    httpRequest = "POST";
+    urlParams = new URLSearchParams(window.location.search);
+    if (urlParams.has('method')) {
+        httpRequest = urlParams.get('method');
+    }
+    return httpRequest;
+}
-- 
cgit v1.2.3