Merge branch 'develop' into bugfix/intl-segmenter-polyfill

Merge pull request 'bugfix/issue475-orm' (#476 ) from bugfix/issue475-orm into develop
Reviewed-on: #476
2026-03-08 19:05:14 +01:00 · 2026-03-01 13:18:24 +01:00 · 2026-03-01 13:11:26 +01:00 · 2026-03-01 13:09:02 +01:00 · 2026-03-01 13:08:26 +01:00 · 2026-03-01 13:07:07 +01:00
6 changed files with 28 additions and 9 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -1,9 +1,23 @@
 ## [Unreleased]

-## 5.1.4-rc1
+## 5.2.2
 ### Fixed
 - fix #464: add Intl.Segmenter polyfill

+## 5.2.1
+### Added
+- chore: set side_menu as package name
+### Fixed
+- fix(LangRepository): check orm capabilities to query entities
+- fix(admin/\*SaveButton): cast settings to string
+
+## 5.2.0
+### Added
+* add compatibility with NC33
+### Fixed
+* fix #468: force nextcloud logo display css rule (opener-only)
+>>>>>>> develop
+
 ## 5.1.3
 ### Fixed
 - fix #445: fix build by adding package-lock.json
--- a/appinfo/info.xml
+++ b/appinfo/info.xml
@ -30,7 +30,7 @@ Notice
 Because I believe in a free and decentralized Internet, [Gitnet](https://gitnet.fr) is **self-hosted at home**.
 In case of downtime, you can download **Custom Menu** from [here](https://kim.deblan.fr/~side_menu/).
 ]]></description>
-    <version>5.1.4-rc1</version>
+    <version>5.2.2</version>
    <licence>agpl</licence>
    <author mail="contact@deblan.fr" homepage="https://www.deblan.fr/">Simon Vieille</author>
    <namespace>SideMenu</namespace>
@ -53,7 +53,7 @@ In case of downtime, you can download **Custom Menu** from [here](https://kim.de
    <screenshot><![CDATA[https://gitnet.fr/deblan/side_menu/raw/branch/master/screenshots/nc25_default_menu.png]]></screenshot>
    <dependencies>
        <php min-version="8.1" max-version="8.4" />
-        <nextcloud min-version="31" max-version="32"/>
+        <nextcloud min-version="31" max-version="33"/>
    </dependencies>
    <settings>
        <admin>OCA\SideMenu\Settings\Admin</admin>
--- a/lib/Service/LangRepository.php
+++ b/lib/Service/LangRepository.php
@ -30,7 +30,12 @@ class LangRepository
            ->from('preferences')
        ;

-        $stmt = $qb->execute();
+        // Nextcloud >=33+
+        if (method_exists($qb, 'executeQuery')) {
+            $stmt = $qb->executeQuery();
+        } else {
+            $stmt = $qb->execute();
+        }

        $langs = ['en'];

--- a/src/components/settings/AdminSaveButton.vue
+++ b/src/components/settings/AdminSaveButton.vue
@ -73,10 +73,10 @@ const save = async () => {
        if (Array.isArray(value) || typeof value === 'object') {
          value = JSON.stringify(value)
        } else if (typeof value === 'boolean') {
-          value = value ? 1 : 0
+          value = value ? '1' : '0'
        }

-        OCP.AppConfig.setValue('side_menu', key, value, {
+        OCP.AppConfig.setValue('side_menu', key, value.toString(), {
          success() {
            update()
          },
--- a/src/components/settings/UserSaveButton.vue
+++ b/src/components/settings/UserSaveButton.vue
@ -69,11 +69,11 @@ const save = async () => {
    if (Array.isArray(value) || typeof value === 'object') {
      value = JSON.stringify(value)
    } else if (typeof value === 'boolean') {
-      value = value ? 1 : 0
+      value = value ? '1' : '0'
    }

    formData.push('name=' + encodeURIComponent(key))
-    formData.push('value=' + encodeURIComponent(value))
+    formData.push('value=' + encodeURIComponent(value.toString()))

    fetch(url, {
      method: 'POST',
--- a/templates/css/stylesheet.php
+++ b/templates/css/stylesheet.php
@ -38,7 +38,7 @@ body[data-theme-light], body[data-theme-light-highcontrast] {

 <?php if ($_['opener-only']) { ?>
  #nextcloud {
-    display: none;
+    display: none !important;
  }
 <?php } ?>
Author	SHA1	Message	Date
Simon Vieille	77cf610c8b	Merge branch 'develop' into bugfix/intl-segmenter-polyfill Some checks are pending ci/woodpecker/push/build Pipeline is pending approval Details ci/woodpecker/push/security Pipeline is pending approval Details	2026-03-08 19:05:14 +01:00
Simon Vieille	5cd106640c	Merge pull request 'bugfix/issue475-orm' (#476 ) from bugfix/issue475-orm into develop Some checks are pending ci/woodpecker/push/build Pipeline is pending approval Details ci/woodpecker/push/security Pipeline is pending approval Details ci/woodpecker/pr/build Pipeline is pending approval Details ci/woodpecker/pr/security Pipeline is pending approval Details Reviewed-on: #476	2026-03-01 13:18:24 +01:00
Simon Vieille	d057cd7665	doc: update changelog Some checks are pending ci/woodpecker/push/build Pipeline is pending approval Details ci/woodpecker/push/security Pipeline is pending approval Details ci/woodpecker/pr/build Pipeline was successful Details ci/woodpecker/pr/security Pipeline was successful Details	2026-03-01 13:11:26 +01:00
Simon Vieille	520225603b	fix(admin/*SaveButton): cast settings to string	2026-03-01 13:09:02 +01:00
Simon Vieille	c2ecc5bf98	fix(LangRepository): check orm capabilities to query entities	2026-03-01 13:08:26 +01:00
Simon Vieille	8cca320a43	chore: set side_menu as package name	2026-03-01 13:07:07 +01:00
Simon Vieille	19aaf0759b	Merge pull request 'chore: app version' (#473 ) from feature/nc33 into develop Some checks are pending ci/woodpecker/push/build Pipeline is pending approval Details ci/woodpecker/push/security Pipeline is pending approval Details ci/woodpecker/pr/build Pipeline is pending approval Details ci/woodpecker/pr/security Pipeline is pending approval Details Reviewed-on: #473	2026-02-27 09:18:16 +01:00
Simon Vieille	47a83f10cc	chore: app version Some checks are pending ci/woodpecker/push/build Pipeline is pending approval Details ci/woodpecker/push/security Pipeline is pending approval Details ci/woodpecker/pr/build Pipeline is pending approval Details ci/woodpecker/pr/security Pipeline is pending approval Details	2026-02-27 09:17:46 +01:00
Simon Vieille	e1a191121d	Merge pull request 'chore: add compatibility with NC33' (#471 ) from feature/nc33 into develop Some checks are pending ci/woodpecker/push/build Pipeline is pending approval Details ci/woodpecker/push/security Pipeline is pending approval Details ci/woodpecker/pr/build Pipeline is pending approval Details ci/woodpecker/pr/security Pipeline is pending approval Details Reviewed-on: #471	2026-02-27 09:16:32 +01:00
Simon Vieille	54f4dce09b	chore: add compatibility with NC33 Some checks are pending ci/woodpecker/push/build Pipeline is pending approval Details ci/woodpecker/push/security Pipeline is pending approval Details ci/woodpecker/pr/build Pipeline is pending approval Details ci/woodpecker/pr/security Pipeline is pending approval Details	2026-02-27 09:16:02 +01:00
Simon Vieille	c0aaa206ed	Merge pull request 'bugfix/issue468-logo' (#469 ) from bugfix/issue468-logo into develop Some checks are pending ci/woodpecker/push/build Pipeline is pending approval Details ci/woodpecker/push/security Pipeline is pending approval Details Reviewed-on: #469	2026-02-16 11:52:40 +01:00
Simon Vieille	0124336558	doc: update changelog Some checks are pending ci/woodpecker/pr/build Pipeline is pending approval Details ci/woodpecker/pr/security Pipeline is pending approval Details ci/woodpecker/push/build Pipeline was successful Details ci/woodpecker/push/security Pipeline was successful Details	2026-02-16 10:12:09 +01:00
Simon Vieille	5ccb56309a	fix #468 : force nextcloud logo display css rule (opener-only)	2026-02-16 10:09:31 +01:00