Merge branch 'develop'

This commit is contained in:
Simon Vieille 2022-07-26 14:41:52 +02:00
commit 2dac9ce0f4
5 changed files with 50 additions and 4 deletions

40
.woodpecker.yml Normal file
View file

@ -0,0 +1,40 @@
pipeline:
dependencies:
image: deblan/devenv
commands:
- npm install
when:
branch: [master, develop, feature/*]
build:
image: deblan/devenv
commands:
- make npm-build
when:
branch: [develop, feature/*]
package:
image: deblan/devenv
volumes:
- /var/www/html/artifacts:/var/www/html/artifacts
secrets: [app_certificate]
commands:
- mkdir -p "$HOME/.nextcloud/certificates"
- echo "$APP_CERTIFICATE" > "$HOME/.nextcloud/certificates/side_menu.key"
- export VERSION=$(grep "<version>" appinfo/info.xml | grep -o "[0-9]*\.[0-9]*\.[0-9]*" --color=never)
- export RELEASE_DIRECTORY="/var/www/html/artifacts/deblan/side_menu"
- make release
when:
branch: [master]
release:
image: plugins/gitea-release
volumes:
- /var/www/html/artifacts:/var/www/html/artifacts
settings:
api_key:
from_secret: gitnet_api_key
base_url: https://gitnet.fr
files: "/var/www/html/artifacts/deblan/side_menu/${CI_COMMIT_TAG}/*"
when:
event: [tag]

View file

@ -1,5 +1,11 @@
## [Unreleased]
## 2.4.2
### Fixed
* fix typo
### Changed
* change ci/cd
## 2.4.1
### Fixed
* fix user setting save

View file

@ -15,7 +15,7 @@ You can customize colors depending of the theme (Dark theme and Breeze Dark). Co
You like this app and you want to support me? ☕ [Buy me a coffee](https://www.buymeacoffee.com/deblan) or [Donate with liberapay](https://liberapay.com/deblan)
[![Build Status](https://ci2.gitnet.fr/api/badges/deblan/side_menu/status.svg)](https://ci2.gitnet.fr/deblan/side_menu)
[![Build Status](https://ci.gitnet.fr/api/badges/deblan/side_menu/status.svg)](https://ci.gitnet.fr/deblan/side_menu)
Requirements
------------

View file

@ -17,7 +17,7 @@ You can report a bug or request a feature by opening an issue.
Requirements:
* PHP >= 7.3
* PHP >= 7.4
* App `theming` enabled
If you like this application and if you want to support the development:
@ -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.4.1</version>
<version>2.4.2</version>
<licence>agpl</licence>
<author mail="contact@deblan.fr" homepage="https://www.deblan.io/">Simon Vieille</author>
<namespace>SideMenu</namespace>

View file

@ -880,7 +880,7 @@ $choicesSizes = [
<a class="side-menu-toggler" data-target="#apps-categories-custom-list" href="#_">
🖱️ <?php p($l->t('Show and hide the list of applications')); ?>
</a>
-to
<div id="apps-categories-custom-list" style="display: none">
<ul class="side-menu-setting-list">
<?php foreach ($_['apps'] as $app): ?>