Merge pull request 'develop' (#94) from develop into master

Reviewed-on: https://gitnet.fr/deblan/side_menu/pulls/94

.drone.yml

@@ -15,8 +15,14 @@ steps:
       - make npm-build
     when:
       branch:
-        - develop
-        - feature/*
+        exclude:
+          - master
+        include:
+          - develop
+          - feature/*
+      event:
+        - push
+        - pull_request
 
   - name: release
     image: deblan/devenv
@@ -34,7 +40,13 @@ steps:
       - make release
     when:
       branch:
-        - master
+        exclude:
+          - develop
+          - feature/*
+        include:
+          - master
+      event:
+        - push
 
 volumes:
   - name: artifacts

.metroline.yml

@@ -1,7 +0,0 @@
-version: '1'
-image: deblan/devenv
-jobs:
-  build:
-    script:
-      - npm install
-      - make npm-build

CHANGELOG.md

@@ -1,5 +1,11 @@
 ## [Unreleased]
 
+## 2.3.3
+### Added
+* hide the scrollbar when mouse is out (menu always displayed)
+### Fixed
+* fix SQL Exception InvalidFieldNameException (#93)
+
 ## 2.3.2
 ### Fixed
 - fix hidden menu

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>2.3.2</version>
+    <version>2.3.3</version>
     <licence>agpl</licence>
     <author mail="contact@deblan.fr" homepage="https://www.deblan.io/">Simon Vieille</author>
     <namespace>SideMenu</namespace>

css/sideMenu.css

@@ -247,6 +247,11 @@
 .side-menu-always-displayed .side-menu-apps-list {
     height: calc(100vh - 49px);
     top: 49px;
+    overflow: hidden;
+}
+
+.side-menu-always-displayed .side-menu-apps-list:hover {
+    overflow: auto;
 }
 
 .side-menu-always-displayed #side-menu,

lib/Service/LangRepository.php

@@ -26,7 +26,12 @@ class LangRepository
         $qb = $this->db->getQueryBuilder();
 
         $qb->select($qb->createFunction('DISTINCT configvalue'))
-            ->where('configkey="lang" and appid="core" and configvalue<>"en"')
+            ->where('configkey=:configkey and appid=:appid and configvalue<>:configvalue')
+            ->setParameters([
+                'configkey' => 'lang',
+                'appid' => 'core',
+                'configvalue' => 'en',
+            ])
             ->from('preferences')
         ;