From 7306a31a7d472ccb3314202c4005b55cbf19da6c Mon Sep 17 00:00:00 2001
From: Simon Vieille <simon@deblan.fr>
Date: Sat, 3 Jul 2021 20:32:39 +0200
Subject: [PATCH 1/7] release v1.24.0

---
 appinfo/info.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/appinfo/info.xml b/appinfo/info.xml
index d35adbc..5faecd0 100644
--- a/appinfo/info.xml
+++ b/appinfo/info.xml
@@ -26,7 +26,7 @@ If you like this application and if you want to support the development:
 * [Donate with liberapay](https://liberapay.com/deblan)
 * [Leave a comment](https://apps.nextcloud.com/apps/side_menu#comments)
 ]]></description>
-    <version>1.23.1</version>
+    <version>1.24.0</version>
     <licence>agpl</licence>
     <author mail="contact@deblan.fr" homepage="https://www.deblan.io/">Simon Vieille</author>
     <namespace>SideMenu</namespace>

From 5d03fbaa4948991d22e05549457d6d235ebce5b7 Mon Sep 17 00:00:00 2001
From: Simon Vieille <simon@deblan.fr>
Date: Fri, 14 Jan 2022 16:44:54 +0100
Subject: [PATCH 2/7] update ci/cd conf

---
 .drone.yml | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/.drone.yml b/.drone.yml
index dc4929b..11f07ce 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -35,13 +35,18 @@ steps:
       - export VERSION=$(grep "<version>" appinfo/info.xml | grep -o "[0-9]*\.[0-9]*\.[0-9]*" --color=never)
       - export RELEASE_DIRECTORY="/artifacts/deblan/side_menu"
       - make release
-    when:
+    trigger:
       branch:
         exclude:
           - develop
           - feature/*
         include:
           - master
+      event:
+        exclude:
+          - pull_request
+        include:
+          - push
 
 volumes:
   - name: artifacts

From 2d32e542cb34399b963134013d716ef1142fa3a2 Mon Sep 17 00:00:00 2001
From: Simon Vieille <simon@deblan.fr>
Date: Fri, 14 Jan 2022 16:46:47 +0100
Subject: [PATCH 3/7] update ci/cd conf

---
 .drone.yml | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index 11f07ce..2d488ec 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -37,16 +37,9 @@ steps:
       - make release
     trigger:
       branch:
-        exclude:
-          - develop
-          - feature/*
-        include:
-          - master
+        - master
       event:
-        exclude:
-          - pull_request
-        include:
-          - push
+        - push
 
 volumes:
   - name: artifacts

From a913bd5ba2cdab3d8663c1d0bd7ae91f032ffa8b Mon Sep 17 00:00:00 2001
From: Simon Vieille <simon@deblan.fr>
Date: Fri, 14 Jan 2022 16:49:14 +0100
Subject: [PATCH 4/7] update ci/cd conf

---
 .drone.yml | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index 2d488ec..4fa0e2c 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -35,9 +35,13 @@ steps:
       - export VERSION=$(grep "<version>" appinfo/info.xml | grep -o "[0-9]*\.[0-9]*\.[0-9]*" --color=never)
       - export RELEASE_DIRECTORY="/artifacts/deblan/side_menu"
       - make release
-    trigger:
+    when:
       branch:
-        - master
+        exclude:
+          - develop
+          - feature/*
+        include:
+          - master
       event:
         - push
 

From 59e3b6b85eb56cd2b8bca1a50bc8601ac059b422 Mon Sep 17 00:00:00 2001
From: Simon Vieille <simon@deblan.fr>
Date: Fri, 14 Jan 2022 16:50:15 +0100
Subject: [PATCH 5/7] update ci/cd conf

---
 .drone.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.drone.yml b/.drone.yml
index 4fa0e2c..90f1007 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -20,6 +20,9 @@ steps:
         include:
           - develop
           - feature/*
+      event:
+        - push
+        - pull_request
 
   - name: release
     image: deblan/devenv

From 8c5b0e98343bee408a6042576cf3eb7259b80232 Mon Sep 17 00:00:00 2001
From: Simon Vieille <simon@deblan.fr>
Date: Fri, 14 Jan 2022 16:52:36 +0100
Subject: [PATCH 6/7] update ci/cd conf

---
 .metroline.yml | 7 -------
 1 file changed, 7 deletions(-)
 delete mode 100644 .metroline.yml

diff --git a/.metroline.yml b/.metroline.yml
deleted file mode 100644
index 7917ee0..0000000
--- a/.metroline.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-version: '1'
-image: deblan/devenv
-jobs:
-  build:
-    script:
-      - npm install
-      - make npm-build

From d8072d8568d2dc821021bf0f62ebfaf5458c771e Mon Sep 17 00:00:00 2001
From: sergeng <sergeng@yahoo.fr>
Date: Sun, 16 Jan 2022 16:38:02 +0100
Subject: [PATCH 7/7] Update 'lib/Service/LangRepository.php'

Resolve web app BSOD
giving the following error due to no proper escaping.

    "exception":{                                                                                                                                                                                                                          +
        "Exception":"Doctrine\\DBAL\\Exception\\InvalidFieldNameException",                                                                                                                                                                +
        "Message":""                                                                                                                                                                                                                       +
        An exception occurred while executing a query: SQLSTATE[42703]: Undefined column: 7 ERROR:  column "lang" does not exist                                                                                                           +
        LINE 1: ...configvalue FROM "oc_preferences" WHERE configkey="lang" and...

Signed-off-by: sergeng <sergeng@yahoo.fr>
---
 lib/Service/LangRepository.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/Service/LangRepository.php b/lib/Service/LangRepository.php
index c998a7e..bc124bd 100644
--- a/lib/Service/LangRepository.php
+++ b/lib/Service/LangRepository.php
@@ -26,7 +26,7 @@ class LangRepository
         $qb = $this->db->getQueryBuilder();
 
         $qb->select($qb->createFunction('DISTINCT configvalue'))
-            ->where('configkey="lang" and appid="core" and configvalue<>"en"')
+            ->where('configkey=\'lang\' and appid=\'core\' and configvalue<>\'en\'')
             ->from('preferences')
         ;