From 373b8393bfc875799c21f98f1302671dcffa974c Mon Sep 17 00:00:00 2001 From: Simon Vieille Date: Mon, 15 Aug 2022 15:03:46 +0200 Subject: [PATCH 01/17] update changelog --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3901de8..a7fc283 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,8 @@ ## [Unreleased] +### Changed +* upgrade dependencies + ## 2.4.3 ### Fixed * fix translations From 280c1d72ae75892fc13d097c594ea5dc246698e6 Mon Sep 17 00:00:00 2001 From: Simon Vieille Date: Sun, 21 Aug 2022 13:48:16 +0200 Subject: [PATCH 02/17] (cq) remove duplicated code --- css/sideMenu.css | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/css/sideMenu.css b/css/sideMenu.css index 56bf97f..80ed6b7 100644 --- a/css/sideMenu.css +++ b/css/sideMenu.css @@ -315,6 +315,7 @@ @media screen and (max-width: 1024px) { #side-menu.side-menu-big { max-width: 290px; + height: 100vh; } .side-menu-categories { @@ -325,10 +326,6 @@ .side-menu-category { padding: 10px 0; } - - #side-menu.side-menu-big { - height: 100vh; - } } @media screen and (min-width: 1024px) { From fa9d5abf629dcda73d46ff6bdb28689c038f82e0 Mon Sep 17 00:00:00 2001 From: Simon Vieille Date: Sun, 21 Aug 2022 13:48:42 +0200 Subject: [PATCH 03/17] (cq) remove unsed variables --- lib/AppInfo/Application.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/AppInfo/Application.php b/lib/AppInfo/Application.php index f7f5e7e..b812fd7 100644 --- a/lib/AppInfo/Application.php +++ b/lib/AppInfo/Application.php @@ -96,7 +96,7 @@ class Application extends App implements IBootstrap $cache = $this->config->getAppValue(self::APP_ID, 'cache', '0'); - foreach ($assets as $key => $value) { + foreach ($assets as $value) { $route = OC::$server->getURLGenerator()->linkToRoute($value['route'], ['v' => $cache]); $value['attr'][$value['route_attr']] = $route; @@ -106,15 +106,15 @@ class Application extends App implements IBootstrap public function register(IRegistrationContext $context): void { - $context->registerService('AppRepository', function (ContainerInterface $c) { + $context->registerService('AppRepository', function () { return new AppRepository(); }); - $context->registerService('CategoryRepository', function (ContainerInterface $c) { + $context->registerService('CategoryRepository', function () { return new CategoryRepository(); }); - $context->registerService('ConfigProxy', function (ContainerInterface $c) { + $context->registerService('ConfigProxy', function () { return new ConfigProxy(); }); } From 059002ef1ccc52ed1eb31bbd7418231fe53f4ebb Mon Sep 17 00:00:00 2001 From: Simon Vieille Date: Sun, 21 Aug 2022 13:49:20 +0200 Subject: [PATCH 04/17] (cq) replace repeated strings with variables --- templates/settings/admin-form.php | 28 +++++++++++++++------------- templates/settings/personal-form.php | 8 +++++--- 2 files changed, 20 insertions(+), 16 deletions(-) diff --git a/templates/settings/admin-form.php b/templates/settings/admin-form.php index 59a5143..bd01e59 100644 --- a/templates/settings/admin-form.php +++ b/templates/settings/admin-form.php @@ -39,6 +39,8 @@ $choicesSizes = [ 'Big' => 'big', ]; +$labelShowHideApps = 'Show and hide the list of applications'; +$labelReset = 'Reset to default'; ?>
@@ -67,7 +69,7 @@ $choicesSizes = [ class="side-menu-setting side-menu-setting-live" value=""> -
@@ -107,7 +109,7 @@ $choicesSizes = [ class="side-menu-setting side-menu-setting-live" value=""> -
@@ -127,7 +129,7 @@ $choicesSizes = [ class="side-menu-setting side-menu-setting-live" value=""> -
@@ -147,7 +149,7 @@ $choicesSizes = [ class="side-menu-setting" value=""> -
@@ -255,7 +257,7 @@ $choicesSizes = [ class="side-menu-setting" value=""> -
@@ -295,7 +297,7 @@ $choicesSizes = [ class="side-menu-setting" value=""> -
@@ -315,7 +317,7 @@ $choicesSizes = [ class="side-menu-setting" value=""> -
@@ -335,7 +337,7 @@ $choicesSizes = [ class="side-menu-setting" value=""> -
@@ -649,7 +651,7 @@ $choicesSizes = [
- 🖱️ t('Show and hide the list of applications')); ?> + 🖱️ t($labelShowHideApps)); ?>
- 🖱️ t('Show and hide the list of applications')); ?> + 🖱️ t($labelShowHideApps)); ?>
- 🖱️ t('Show and hide the list of applications')); ?> + 🖱️ t($labelShowHideApps)); ?>
- 🖱️ t('Show and hide the list of applications')); ?> + 🖱️ t($labelShowHideApps)); ?>
- 🖱️ t('Show and hide the list of applications')); ?> + 🖱️ t($labelShowHideApps)); ?>