diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3a50a34..7d54a49 100644
--- 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
diff --git a/appinfo/info.xml b/appinfo/info.xml
index 650fce4..d7af92a 100644
--- 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/).
]]>
- 5.1.4-rc1
+ 5.2.2
agpl
Simon Vieille
SideMenu
@@ -53,7 +53,7 @@ In case of downtime, you can download **Custom Menu** from [here](https://kim.de
-
+
OCA\SideMenu\Settings\Admin
diff --git a/lib/Service/LangRepository.php b/lib/Service/LangRepository.php
index 1cde40a..4034b85 100644
--- 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'];
diff --git a/src/components/settings/AdminSaveButton.vue b/src/components/settings/AdminSaveButton.vue
index 14cc274..cd639a8 100644
--- 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()
},
diff --git a/src/components/settings/UserSaveButton.vue b/src/components/settings/UserSaveButton.vue
index b2b8c6d..b14974e 100644
--- 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',
diff --git a/templates/css/stylesheet.php b/templates/css/stylesheet.php
index 969f17a..5bdc08b 100644
--- a/templates/css/stylesheet.php
+++ b/templates/css/stylesheet.php
@@ -38,7 +38,7 @@ body[data-theme-light], body[data-theme-light-highcontrast] {
#nextcloud {
- display: none;
+ display: none !important;
}