From 5df389dd422becdc231bce91b6c8f896809d7794 Mon Sep 17 00:00:00 2001 From: Simon Vieille Date: Sat, 11 Mar 2023 00:29:32 +0100 Subject: [PATCH 01/54] add badge of downloads --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 449bc17..bf8abbb 100644 --- a/README.md +++ b/README.md @@ -3,6 +3,7 @@ [![Build Status](https://ci.gitnet.fr/api/badges/deblan/side_menu/status.svg)](https://ci.gitnet.fr/deblan/side_menu) [![Translations](https://translate.codeberg.org/widgets/custom-menu/-/application/svg-badge.svg)](https://translate.codeberg.org/engage/custom-menu/) +![Downloads](https://img.shields.io/badge/dynamic/json?color=brightgreen&label=downloads&query=%24.K_downloads&suffix=K&url=https%3A%2F%2Fapi-side-menu.deblan.org%2Fdownloads.php) Allows you to modify the position of the main menu by creating a panel on the left of the interface or with a big menu on the top. You can also add and sort custom categories, define apps that must be displayed in the top menu, etc. Fully customisable. From 1eb392834c8e67cfc7fec17b62eb7ecc77512c6a Mon Sep 17 00:00:00 2001 From: Simon Vieille Date: Fri, 17 Mar 2023 17:10:56 +0100 Subject: [PATCH 02/54] use specifics images in ci --- .woodpecker.yml | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/.woodpecker.yml b/.woodpecker.yml index 47a4044..b3bc1ab 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -1,8 +1,10 @@ pipeline: dependencies: - image: gitnet.fr/deblan/devenv + image: node:16 + pull: true commands: - - make dep + - npm i + - npm link @nextcloud/vue when: event: [tag, push, pull_request] branch: [master, develop, feature/*, translations] @@ -14,9 +16,9 @@ pipeline: failure: ignore build: - image: gitnet.fr/deblan/devenv + image: node:16 commands: - - make build + - npm run build when: branch: [master, develop, feature/*, translations] event: [push, pull_request] @@ -37,11 +39,13 @@ pipeline: event: [pull_request] package: - image: gitnet.fr/deblan/devenv + image: deblan/php:8.0 volumes: - /var/www/html/artifacts:/var/www/html/artifacts secrets: [app_certificate] commands: + - apt-get update + - apt-get install -y zip make - mkdir -p "$HOME/.nextcloud/certificates" - echo "$APP_CERTIFICATE" > "$HOME/.nextcloud/certificates/side_menu.key" - export VERSION=$(grep "" appinfo/info.xml | grep -o "[0-9]*\.[0-9]*\.[0-9]*" --color=never) From 02afac526747050a5f7419c2615b5eb0b05b730e Mon Sep 17 00:00:00 2001 From: Simon Vieille Date: Fri, 17 Mar 2023 17:11:16 +0100 Subject: [PATCH 03/54] add debug version --- appinfo/info.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appinfo/info.xml b/appinfo/info.xml index fc48124..4c165a0 100644 --- a/appinfo/info.xml +++ b/appinfo/info.xml @@ -32,7 +32,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/). ]]> - 3.7.0 + 3.7.1-b1 agpl Simon Vieille SideMenu From fc5a6a4c641429477a66b71e82f708f2d84d7f16 Mon Sep 17 00:00:00 2001 From: Simon Vieille Date: Fri, 17 Mar 2023 17:13:31 +0100 Subject: [PATCH 04/54] fix typo in ci configuration --- .woodpecker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.woodpecker.yml b/.woodpecker.yml index b3bc1ab..b4ecc4f 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -18,7 +18,7 @@ pipeline: build: image: node:16 commands: - - npm run build + - npm run build when: branch: [master, develop, feature/*, translations] event: [push, pull_request] From 112e669723a7584086d3f3c1ece843a481d67a0a Mon Sep 17 00:00:00 2001 From: Simon Vieille Date: Fri, 17 Mar 2023 17:22:35 +0100 Subject: [PATCH 05/54] reduce release task as packaging (ci) move translation build in specific step (ci) --- .woodpecker.yml | 10 +++++++++- Makefile | 2 +- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/.woodpecker.yml b/.woodpecker.yml index b4ecc4f..dd9db2e 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -15,7 +15,7 @@ pipeline: - osv-detector package-lock.json failure: ignore - build: + build_js: image: node:16 commands: - npm run build @@ -23,6 +23,14 @@ pipeline: branch: [master, develop, feature/*, translations] event: [push, pull_request] + build_php: + image: deblan/php:8.0 + commands: + - php bin/generate_l10n.php + when: + branch: [master, develop, feature/*, translations] + event: [push, pull_request] + code_quality: image: sonarsource/sonar-scanner-cli secrets: [sonar_token, sonar_host, sonar_project] diff --git a/Makefile b/Makefile index 783bb6a..e5b6267 100644 --- a/Makefile +++ b/Makefile @@ -9,7 +9,7 @@ dep: npm link @nextcloud/vue || sudo npm link @nextcloud/vue .ONESHELL: -release: build translations +release: if [ -z "$$VERSION" ]; then echo "VERSION required" exit 1 From 3a51e6ecd5da2e76ffa7296bbdc61432cb307832 Mon Sep 17 00:00:00 2001 From: Simon Vieille Date: Fri, 17 Mar 2023 17:22:59 +0100 Subject: [PATCH 06/54] add debug version --- appinfo/info.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appinfo/info.xml b/appinfo/info.xml index 4c165a0..06eabf1 100644 --- a/appinfo/info.xml +++ b/appinfo/info.xml @@ -32,7 +32,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/). ]]> - 3.7.1-b1 + 3.7.1-b2 agpl Simon Vieille SideMenu From 7227f59dabe6185e8d43ce9e53f6354f5eb225c3 Mon Sep 17 00:00:00 2001 From: Simon Vieille Date: Fri, 17 Mar 2023 17:25:22 +0100 Subject: [PATCH 07/54] add tag on event restriction for build steps --- .woodpecker.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.woodpecker.yml b/.woodpecker.yml index dd9db2e..fd4c65d 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -21,7 +21,7 @@ pipeline: - npm run build when: branch: [master, develop, feature/*, translations] - event: [push, pull_request] + event: [tag, push, pull_request] build_php: image: deblan/php:8.0 @@ -29,7 +29,7 @@ pipeline: - php bin/generate_l10n.php when: branch: [master, develop, feature/*, translations] - event: [push, pull_request] + event: [tag, push, pull_request] code_quality: image: sonarsource/sonar-scanner-cli From 097ccc9dc9af0e141285f52890020f97d824f6e0 Mon Sep 17 00:00:00 2001 From: Simon Vieille Date: Sun, 19 Mar 2023 09:34:23 +0100 Subject: [PATCH 08/54] update ci conf --- .woodpecker.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.woodpecker.yml b/.woodpecker.yml index fd4c65d..576865e 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -3,8 +3,7 @@ pipeline: image: node:16 pull: true commands: - - npm i - - npm link @nextcloud/vue + - npm ci when: event: [tag, push, pull_request] branch: [master, develop, feature/*, translations] From 7d0b55243eb378d1c20596e3e07fbd6d0b9617f0 Mon Sep 17 00:00:00 2001 From: Simon Vieille Date: Sun, 19 Mar 2023 09:34:52 +0100 Subject: [PATCH 09/54] add debug version --- appinfo/info.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appinfo/info.xml b/appinfo/info.xml index 06eabf1..89461b0 100644 --- a/appinfo/info.xml +++ b/appinfo/info.xml @@ -32,7 +32,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/). ]]> - 3.7.1-b2 + 3.7.1-b3 agpl Simon Vieille SideMenu From 3a8021565794bb228fc449a62eaa50ec0f0b86f0 Mon Sep 17 00:00:00 2001 From: Simon Vieille Date: Sun, 19 Mar 2023 09:35:59 +0100 Subject: [PATCH 10/54] update ci conf --- .woodpecker.yml | 2 +- appinfo/info.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.woodpecker.yml b/.woodpecker.yml index 576865e..ca16045 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -3,7 +3,7 @@ pipeline: image: node:16 pull: true commands: - - npm ci + - npm i when: event: [tag, push, pull_request] branch: [master, develop, feature/*, translations] diff --git a/appinfo/info.xml b/appinfo/info.xml index 89461b0..b208bd0 100644 --- a/appinfo/info.xml +++ b/appinfo/info.xml @@ -32,7 +32,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/). ]]> - 3.7.1-b3 + 3.7.1-b4 agpl Simon Vieille SideMenu From 019f79d45f3dea30dd538531ace97c65e6cc1d3c Mon Sep 17 00:00:00 2001 From: Simon Vieille Date: Sun, 19 Mar 2023 09:45:51 +0100 Subject: [PATCH 11/54] update ci conf --- .woodpecker.yml | 2 +- appinfo/info.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.woodpecker.yml b/.woodpecker.yml index ca16045..59a771b 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -9,7 +9,7 @@ pipeline: branch: [master, develop, feature/*, translations] osv_detector: - image: gitnet.fr/deblan/docker-osv-detector:v0.9 + image: gitnet.fr/deblan/osv-detector:v0.10 commands: - osv-detector package-lock.json failure: ignore diff --git a/appinfo/info.xml b/appinfo/info.xml index b208bd0..d14d467 100644 --- a/appinfo/info.xml +++ b/appinfo/info.xml @@ -32,7 +32,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/). ]]> - 3.7.1-b4 + 3.7.1 agpl Simon Vieille SideMenu From 42043c5390132fc950a39f1e7efd455d84b981cb Mon Sep 17 00:00:00 2001 From: Simon Vieille Date: Sun, 19 Mar 2023 09:52:37 +0100 Subject: [PATCH 12/54] update changelog --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index c979fe2..42089a2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ ## [Unreleased] +## 3.7.1 +### Fixed +* fix build process (#230) + ## 3.7.0 ### Added * add translations (thanks to AHOHNMYC) From 9ccd11b6dcf705bfcf5504f0becc4e74e37c8841 Mon Sep 17 00:00:00 2001 From: Simon Vieille Date: Thu, 23 Mar 2023 22:17:05 +0100 Subject: [PATCH 13/54] load configuration and then retrieve apps in default side menu display fix #233 --- src/SideMenu.vue | 39 +++++++++++++++++++++------------------ 1 file changed, 21 insertions(+), 18 deletions(-) diff --git a/src/SideMenu.vue b/src/SideMenu.vue index c785d46..fd2f24e 100644 --- a/src/SideMenu.vue +++ b/src/SideMenu.vue @@ -93,7 +93,11 @@ export default { for (let id in ncApps) { if (window.topMenuApps.includes(id) && !window.topSideMenuApps.includes(id)) { - continue; + continue + } + + if (this.hiddenApps.includes(id)) { + continue } let app = ncApps[id] @@ -104,10 +108,10 @@ export default { finalApps.sort((a, b) => { if (a.order === null || b.order === null) { - return a.name < b.name ? -1 : 1; + return a.name < b.name ? -1 : 1 } - return a.order < b.order ? -1 : 1; + return a.order < b.order ? -1 : 1 }) this.apps = finalApps @@ -118,24 +122,23 @@ export default { }, retrieveConfig() { - axios - .get(OC.generateUrl('/apps/side_menu/js/config')) - .then((response) => { - const config = response.data - - this.targetBlankApps = config['target-blank-apps'] - this.forceLightIcon = config['force-light-icon'] - this.avatar = config['avatar'] - this.logo = config['logo'] - this.logoLink = config['logo-link'] - this.settings = config['settings'] - this.hiddenApps = config['big-menu-hidden-apps'] - }) }, }, mounted() { - this.retrieveConfig() - this.retrieveApps() + axios + .get(OC.generateUrl('/apps/side_menu/js/config')) + .then((response) => { + const config = response.data + + this.targetBlankApps = config['target-blank-apps'] + this.forceLightIcon = config['force-light-icon'] + this.avatar = config['avatar'] + this.logo = config['logo'] + this.logoLink = config['logo-link'] + this.settings = config['settings'] + this.hiddenApps = config['big-menu-hidden-apps'] + this.retrieveApps() + }) } } From 66e4d2989a8a9088967693cecbdb0ea2c4d03825 Mon Sep 17 00:00:00 2001 From: Simon Vieille Date: Thu, 23 Mar 2023 22:22:36 +0100 Subject: [PATCH 14/54] update pipeline conditions allowing fix/* --- .woodpecker.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.woodpecker.yml b/.woodpecker.yml index 59a771b..1c02aa5 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -6,7 +6,7 @@ pipeline: - npm i when: event: [tag, push, pull_request] - branch: [master, develop, feature/*, translations] + branch: [master, develop, feature/*, fix/*, translations] osv_detector: image: gitnet.fr/deblan/osv-detector:v0.10 @@ -19,7 +19,7 @@ pipeline: commands: - npm run build when: - branch: [master, develop, feature/*, translations] + branch: [master, develop, feature/*, fix/*, translations] event: [tag, push, pull_request] build_php: @@ -27,7 +27,7 @@ pipeline: commands: - php bin/generate_l10n.php when: - branch: [master, develop, feature/*, translations] + branch: [master, develop, feature/*, fix/*, translations] event: [tag, push, pull_request] code_quality: From 7ab2816bd9502108d89a2f6154e49dc98a93e165 Mon Sep 17 00:00:00 2001 From: Simon Vieille Date: Mon, 27 Mar 2023 18:34:50 +0200 Subject: [PATCH 15/54] update changelog --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 42089a2..6a44bf0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,11 @@ ## [Unreleased] +## 3.7.2 +### Added +* update pipeline conditions allowing `fix/*` +### Fixed +* fix #233: load configuration and then retrieve apps in default side menu display + ## 3.7.1 ### Fixed * fix build process (#230) From b65c0c650a54d6b4cc8cc625b22f438f99a31197 Mon Sep 17 00:00:00 2001 From: Simon Vieille Date: Mon, 27 Mar 2023 18:35:59 +0200 Subject: [PATCH 16/54] update app version --- appinfo/info.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appinfo/info.xml b/appinfo/info.xml index d14d467..8614a98 100644 --- a/appinfo/info.xml +++ b/appinfo/info.xml @@ -32,7 +32,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/). ]]> - 3.7.1 + 3.7.2 agpl Simon Vieille SideMenu From 917288eb54a9d81cac7588aafa3a9a48e50d7f04 Mon Sep 17 00:00:00 2001 From: Simon Vieille Date: Fri, 31 Mar 2023 14:07:19 +0200 Subject: [PATCH 17/54] add signature generation rename steps --- .woodpecker.yml | 29 +++++++++++++++++++++++------ 1 file changed, 23 insertions(+), 6 deletions(-) diff --git a/.woodpecker.yml b/.woodpecker.yml index 1c02aa5..9c24f2b 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -8,13 +8,13 @@ pipeline: event: [tag, push, pull_request] branch: [master, develop, feature/*, fix/*, translations] - osv_detector: + osv-detector: image: gitnet.fr/deblan/osv-detector:v0.10 commands: - osv-detector package-lock.json failure: ignore - build_js: + build-js: image: node:16 commands: - npm run build @@ -22,7 +22,7 @@ pipeline: branch: [master, develop, feature/*, fix/*, translations] event: [tag, push, pull_request] - build_php: + build-translations: image: deblan/php:8.0 commands: - php bin/generate_l10n.php @@ -30,7 +30,24 @@ pipeline: branch: [master, develop, feature/*, fix/*, translations] event: [tag, push, pull_request] - code_quality: + create-signature: + image: nextcloud:25 + secrets: [app_certificate, app_public_certificate] + environment: + SQLITE_DATABASE: /var/www/data/data.db + NEXTCLOUD_ADMIN_USER: admin + NEXTCLOUD_ADMIN_PASSWORD: admin + commands: + - echo "$APP_CERTIFICATE" > "/tmp/side_menu.key" + - echo "$APP_PUBLIC_CERTIFICATE" > "/tmp/side_menu.crt" + - /usr/src/nextcloud/occ integrity:sign-app + --privateKey=/tmp/side_menu.key + --certificate=/tmp/side_menu.crt + --path=$CI_WORKSPACE + when: + event: [tag] + + check-code-quality: image: sonarsource/sonar-scanner-cli secrets: [sonar_token, sonar_host, sonar_project] commands: @@ -45,7 +62,7 @@ pipeline: when: event: [pull_request] - package: + create-package: image: deblan/php:8.0 volumes: - /var/www/html/artifacts:/var/www/html/artifacts @@ -61,7 +78,7 @@ pipeline: when: event: [tag] - release: + push-release: image: plugins/gitea-release volumes: - /var/www/html/artifacts:/var/www/html/artifacts From 361badff6b0f7756917d5c2b660bca578bbd3b5a Mon Sep 17 00:00:00 2001 From: Simon Vieille Date: Fri, 31 Mar 2023 17:06:30 +0200 Subject: [PATCH 18/54] update changelog --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6a44bf0..6992410 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,8 @@ ## [Unreleased] +### Added +* add signature on build + ## 3.7.2 ### Added * update pipeline conditions allowing `fix/*` From dca727c120e94869995ada878aba307a1bd0d2d7 Mon Sep 17 00:00:00 2001 From: Simon Vieille Date: Fri, 14 Apr 2023 20:58:56 +0200 Subject: [PATCH 19/54] use app href for redirection (fix #244) --- lib/Controller/AppController.php | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/lib/Controller/AppController.php b/lib/Controller/AppController.php index 83a0e8c..5516090 100644 --- a/lib/Controller/AppController.php +++ b/lib/Controller/AppController.php @@ -78,29 +78,33 @@ class AppController extends Controller continue; } - return $this->redirectToApp($app['id']); + return $this->redirectToApp($app, true); } return $this->redirectToApp('files'); } - protected function redirectToApp($appId): RedirectResponse + protected function redirectToApp($app, bool $isHref = false): RedirectResponse { - $isIgnoreFrontController = true === OC::$server->getConfig()->getSystemValue( - 'htaccess.IgnoreFrontController', - false - ); + if (!$isHref) { + $isIgnoreFrontController = true === OC::$server->getConfig()->getSystemValue( + 'htaccess.IgnoreFrontController', + false + ); - $isFrontControllerActive = 'true' === getenv('front_controller_active'); + $isFrontControllerActive = 'true' === getenv('front_controller_active'); - if ($isIgnoreFrontController || $isFrontControllerActive) { - $path = '/apps/%s/'; + if ($isIgnoreFrontController || $isFrontControllerActive) { + $path = '/apps/%s/'; + } else { + $path = '/index.php/apps/%s/'; + } + + $url = $this->urlGenerator->getAbsoluteURL(sprintf($path, $app)); } else { - $path = '/index.php/apps/%s/'; + $url = $app['href']; } - $url = $this->urlGenerator->getAbsoluteURL(sprintf($path, $appId)); - return new RedirectResponse($url); } } From b9264d7e0511f61809d783edbb382adcd239db4e Mon Sep 17 00:00:00 2001 From: Simon Vieille Date: Fri, 14 Apr 2023 21:12:35 +0200 Subject: [PATCH 20/54] release v3.7.3 --- CHANGELOG.md | 3 +++ appinfo/info.xml | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6992410..0b84da9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,8 @@ ## [Unreleased] +## 3.7.3 +### Fixed +* fix #244: use app href for redirection ### Added * add signature on build diff --git a/appinfo/info.xml b/appinfo/info.xml index 8614a98..b24bd58 100644 --- a/appinfo/info.xml +++ b/appinfo/info.xml @@ -32,7 +32,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/). ]]> - 3.7.2 + 3.7.3 agpl Simon Vieille SideMenu From 0a556670b1a5a91ae38ec20c475916c2e93e43d5 Mon Sep 17 00:00:00 2001 From: Simon Vieille Date: Sun, 16 Apr 2023 14:16:18 +0200 Subject: [PATCH 21/54] update signature generation --- .woodpecker.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.woodpecker.yml b/.woodpecker.yml index 9c24f2b..a598a0f 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -40,10 +40,13 @@ pipeline: commands: - echo "$APP_CERTIFICATE" > "/tmp/side_menu.key" - echo "$APP_PUBLIC_CERTIFICATE" > "/tmp/side_menu.crt" + - mkdir /tmp/app + - cp -r README.md CHANGELOG.md appinfo css lib img l10n js src templates screenshots vendor /tmp/app - /usr/src/nextcloud/occ integrity:sign-app --privateKey=/tmp/side_menu.key --certificate=/tmp/side_menu.crt - --path=$CI_WORKSPACE + --path=/tmp/app + - mv /tmp/app/appinfo/signature.json appinfo/ when: event: [tag] From 6583883e2d7e89e83f7805372422df36bfe5c0f5 Mon Sep 17 00:00:00 2001 From: Simon Vieille Date: Sun, 16 Apr 2023 14:17:09 +0200 Subject: [PATCH 22/54] update signature generation --- .woodpecker.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.woodpecker.yml b/.woodpecker.yml index a598a0f..bca4ef8 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -47,8 +47,8 @@ pipeline: --certificate=/tmp/side_menu.crt --path=/tmp/app - mv /tmp/app/appinfo/signature.json appinfo/ - when: - event: [tag] + # when: + # event: [tag] check-code-quality: image: sonarsource/sonar-scanner-cli From 27f8888a904bd9b8c598c4995a28c0b933561cb3 Mon Sep 17 00:00:00 2001 From: Simon Vieille Date: Sun, 16 Apr 2023 14:24:17 +0200 Subject: [PATCH 23/54] update signature generation --- .woodpecker.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.woodpecker.yml b/.woodpecker.yml index bca4ef8..a598a0f 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -47,8 +47,8 @@ pipeline: --certificate=/tmp/side_menu.crt --path=/tmp/app - mv /tmp/app/appinfo/signature.json appinfo/ - # when: - # event: [tag] + when: + event: [tag] check-code-quality: image: sonarsource/sonar-scanner-cli From 135f27cc32a1aec15021f87b5ec3477bd1351cdd Mon Sep 17 00:00:00 2001 From: Simon Vieille Date: Sun, 16 Apr 2023 18:05:25 +0200 Subject: [PATCH 24/54] release v3.7.4 --- CHANGELOG.md | 4 ++++ appinfo/info.xml | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0b84da9..c9a1b79 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ ## [Unreleased] +## 3.7.4 +### Fixed +* fix Integrity failed (#247) + ## 3.7.3 ### Fixed * fix #244: use app href for redirection diff --git a/appinfo/info.xml b/appinfo/info.xml index b24bd58..f9933b4 100644 --- a/appinfo/info.xml +++ b/appinfo/info.xml @@ -32,7 +32,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/). ]]> - 3.7.3 + 3.7.4 agpl Simon Vieille SideMenu From 93fef370338c0f28620c0a5d12ea7a5f24344306 Mon Sep 17 00:00:00 2001 From: Simon Vieille Date: Tue, 23 May 2023 14:09:55 +0200 Subject: [PATCH 25/54] add option to show hovered label only on top menu --- lib/Controller/JsController.php | 2 +- src/AppMenu.vue | 29 ++++++++++++++++++++++------- src/l10n/fixtures/cs.yaml | 1 + src/l10n/fixtures/de.yaml | 1 + src/l10n/fixtures/es.yaml | 1 + src/l10n/fixtures/fr.yaml | 1 + src/l10n/fixtures/nl.yaml | 1 + src/l10n/fixtures/ru.yaml | 1 + src/l10n/fixtures/tpl/base.yaml | 1 + src/l10n/fixtures/zh_CN.yaml | 1 + templates/settings/admin-form.php | 2 +- 11 files changed, 32 insertions(+), 9 deletions(-) diff --git a/lib/Controller/JsController.php b/lib/Controller/JsController.php index 3abcdba..13d803e 100644 --- a/lib/Controller/JsController.php +++ b/lib/Controller/JsController.php @@ -171,7 +171,7 @@ class JsController extends Controller 'avatar' => $avatar, 'top-menu-apps' => $topMenuApps, 'top-side-menu-apps' => $topSideMenuApps, - 'top-menu-mouse-over-hidden-label' => $this->config->getAppValueBool( + 'top-menu-mouse-over-hidden-label' => $this->config->getAppValueInt( 'top-menu-mouse-over-hidden-label', '0' ), diff --git a/src/AppMenu.vue b/src/AppMenu.vue index 0e550d7..52a9810 100644 --- a/src/AppMenu.vue +++ b/src/AppMenu.vue @@ -24,14 +24,14 @@