From 2a06e064ef5f64b7202e6a6737e9ebb639ea1235 Mon Sep 17 00:00:00 2001 From: Kai Henseler <78687674+bromiesTM@users.noreply.github.com> Date: Wed, 29 Jul 2026 08:53:45 +0200 Subject: [PATCH 1/8] Revert "fix(PageControllerTest): remove OC_Util::$scripts reset, add scriptsInit reset for NC32" This reverts commit 04392dd4778b6d87c552dc0de49dde9a9c65f228. --- tests/Controller/PageControllerTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/Controller/PageControllerTest.php b/tests/Controller/PageControllerTest.php index 3843fe7..87df020 100644 --- a/tests/Controller/PageControllerTest.php +++ b/tests/Controller/PageControllerTest.php @@ -227,8 +227,8 @@ protected function tearDown(): void { * Reset Util script and style state for clean test isolation */ private function resetUtilState(): void { + \OC_Util::$scripts = []; \OC_Util::$styles = []; - self::invokePrivate(\OCP\Util::class, 'scriptsInit', [[]]); self::invokePrivate(\OCP\Util::class, 'scripts', [[]]); self::invokePrivate(\OCP\Util::class, 'scriptDeps', [[]]); } From 8795654db168c871651393333250bf06610475b9 Mon Sep 17 00:00:00 2001 From: Kai Henseler <78687674+bromiesTM@users.noreply.github.com> Date: Wed, 29 Jul 2026 08:53:45 +0200 Subject: [PATCH 2/8] Revert "fix(PageControllerTest.php): adapt unit tests" This reverts commit 7f5b0d0cd228d52d3bde1759d6729608b7f96a43. --- tests/Controller/PageControllerTest.php | 2 -- 1 file changed, 2 deletions(-) diff --git a/tests/Controller/PageControllerTest.php b/tests/Controller/PageControllerTest.php index 87df020..68cbf4a 100644 --- a/tests/Controller/PageControllerTest.php +++ b/tests/Controller/PageControllerTest.php @@ -404,8 +404,6 @@ public function testIndexProvidesInitialStateWithCustomClientURLs() { 'apps.ios.id' => 'mocked-ios-appid', 'apps.windows.url' => 'mocked-windows-url', 'apps.macos.url' => 'mocked-macos-url', - 'apps.linux.url' => 'mocked-linux-url', - 'apps.nautilus.url' => 'mocked-nautilus-url', ]; $this->initialState->expects($this->exactly(4)) From 70ffae2e814fa7beed0fe16b0e53137b667fe2a1 Mon Sep 17 00:00:00 2001 From: Kai Henseler <78687674+bromiesTM@users.noreply.github.com> Date: Wed, 29 Jul 2026 08:53:45 +0200 Subject: [PATCH 3/8] Revert "chore(Application.php): conditionally load files search script in simplesettings context" This reverts commit c939faa184356f07ee9baa80c18f79624224622e. --- tests/Controller/PageControllerTest.php | 2 -- 1 file changed, 2 deletions(-) diff --git a/tests/Controller/PageControllerTest.php b/tests/Controller/PageControllerTest.php index 68cbf4a..69c703b 100644 --- a/tests/Controller/PageControllerTest.php +++ b/tests/Controller/PageControllerTest.php @@ -227,8 +227,6 @@ protected function tearDown(): void { * Reset Util script and style state for clean test isolation */ private function resetUtilState(): void { - \OC_Util::$scripts = []; - \OC_Util::$styles = []; self::invokePrivate(\OCP\Util::class, 'scripts', [[]]); self::invokePrivate(\OCP\Util::class, 'scriptDeps', [[]]); } From c11ecd2ee4d798b6d05b97e3913ed87f2bbe2d03 Mon Sep 17 00:00:00 2001 From: Kai Henseler <78687674+bromiesTM@users.noreply.github.com> Date: Wed, 29 Jul 2026 08:53:45 +0200 Subject: [PATCH 4/8] Revert "fix(build): disable devtool to prevent source map conflict" This reverts commit f0bcb34af27307bd8db29bcc33c76e8efc3e2419. --- webpack.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/webpack.js b/webpack.js index cdb05cc..82a3796 100644 --- a/webpack.js +++ b/webpack.js @@ -49,8 +49,6 @@ webpackConfig.module.rules.push({ type: 'asset/source', }) -webpackConfig.devtool = false - webpackConfig.plugins.push(new webpack.SourceMapDevToolPlugin({ filename: '[file].map', })) From 072f01ca87d96d3e3544dfe205d2ff7b019f1274 Mon Sep 17 00:00:00 2001 From: Kai Henseler <78687674+bromiesTM@users.noreply.github.com> Date: Wed, 29 Jul 2026 08:53:45 +0200 Subject: [PATCH 5/8] Revert "fix(Software.vue): consolidate gap with same units (em)" This reverts commit e85647a4627ce9f68ce2ad6eb400219f25f47500. --- src/components/help/Software.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/help/Software.vue b/src/components/help/Software.vue index ec50b4a..4f1f7fb 100644 --- a/src/components/help/Software.vue +++ b/src/components/help/Software.vue @@ -146,7 +146,7 @@ export default defineComponent({ #software { --software-content-width: 40em; - --software-gap: 1em; + --software-gap: 10px; --software-qr-code-intrinsic-padding: 5px; /* padding within the image around the code (measured) */ } @@ -180,7 +180,7 @@ export default defineComponent({ display: flex; flex-wrap: wrap; flex: 0 0 auto; - gap: var(--software-gap); + gap: 1em; } .symbol { From 94a6c1e33312a35f0a9be8c6c2ff07bd9f24ec85 Mon Sep 17 00:00:00 2001 From: Kai Henseler <78687674+bromiesTM@users.noreply.github.com> Date: Wed, 29 Jul 2026 08:53:45 +0200 Subject: [PATCH 6/8] Revert "fix(Software.vue): add a little more space to breath to desktop-apps buttons" This reverts commit ae17b2e0088ea5f3036ff7f0d77cd6480c242aa7. --- src/components/help/Software.vue | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/src/components/help/Software.vue b/src/components/help/Software.vue index 4f1f7fb..efb3cdb 100644 --- a/src/components/help/Software.vue +++ b/src/components/help/Software.vue @@ -163,7 +163,6 @@ export default defineComponent({ justify-content: space-between; padding-bottom: 2em; max-width: var(--software-content-width); - gap: var(--software-gap); .ios, .android { display: flex; @@ -178,9 +177,11 @@ export default defineComponent({ .desktop-apps { display: flex; - flex-wrap: wrap; - flex: 0 0 auto; - gap: 1em; + max-width: var(--software-content-width); +} + +.mobile-apps, .desktop-apps { + gap: var(--software-gap); } .symbol { @@ -188,6 +189,12 @@ export default defineComponent({ vertical-align: middle; } +@media screen and (min-width: calc(variables.$breakpoint-mobile / 2)) { + .desktop-app { + max-width: calc(var(--software-content-width) / 2); + } +} + @media screen and (max-width: calc(variables.$breakpoint-mobile / 2)) { .mobile-apps { flex-flow: column wrap; @@ -201,6 +208,7 @@ export default defineComponent({ .desktop-apps { flex-direction: column; + gap: 1em; } } From 251e0100ad03374eb6b9e4d271d588baaa39ede6 Mon Sep 17 00:00:00 2001 From: Kai Henseler <78687674+bromiesTM@users.noreply.github.com> Date: Wed, 29 Jul 2026 08:53:45 +0200 Subject: [PATCH 7/8] Revert "feat(Software.vue): add Linux App Image and Nautilus Integration buttons" This reverts commit 03c3c2d373e3a52a2b880797062eb0d2117124cd. --- src/components/help/Software.vue | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/src/components/help/Software.vue b/src/components/help/Software.vue index efb3cdb..dc65223 100644 --- a/src/components/help/Software.vue +++ b/src/components/help/Software.vue @@ -79,20 +79,6 @@ along with this program. If not, see . {{ t('simplesettings', 'Install desktop app for Windows') }}  ❯  - - {{ t('simplesettings', 'Linux App Image') }} -  ❯  - - - {{ t('simplesettings', 'Nautilus Integration') }} -  ❯  - @@ -121,16 +107,12 @@ export default defineComponent({ const iosUrl = appLinks['apps.ios.url'] const macosUrl = appLinks['apps.macos.url'] const windowsUrl = appLinks['apps.windows.url'] - const linuxUrl = appLinks['apps.linux.url'] - const nautilusUrl = appLinks['apps.nautilus.url'] return { androidUrl, iosUrl, macosUrl, windowsUrl, - linuxUrl, - nautilusUrl, androidSVG, iosSVG, } From fc3ab26cf48d0ba2edb67824fed52fcfd598ae20 Mon Sep 17 00:00:00 2001 From: Kai Henseler <78687674+bromiesTM@users.noreply.github.com> Date: Wed, 29 Jul 2026 08:53:45 +0200 Subject: [PATCH 8/8] Revert "feat(PageController): add Linux and Nautilus URLs to configuration" This reverts commit 358fb19e1de5cc5d9cd70ef7b03c1e097e92acb4. --- lib/Controller/PageController.php | 2 -- tests/Controller/PageControllerTest.php | 6 +----- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/lib/Controller/PageController.php b/lib/Controller/PageController.php index 79b85eb..7ad8556 100644 --- a/lib/Controller/PageController.php +++ b/lib/Controller/PageController.php @@ -199,8 +199,6 @@ private function getCustomClientURL(): array { 'apps.ios.url' => $this->config->getSystemValue('ionos_customclient_ios'), 'apps.windows.url' => $this->config->getSystemValue('ionos_customclient_windows'), 'apps.macos.url' => $this->config->getSystemValue('ionos_customclient_macos'), - 'apps.linux.url' => $this->config->getSystemValue('ionos_customclient_linux'), - 'apps.nautilus.url' => $this->config->getSystemValue('ionos_customclient_nautilus'), 'apps.ios.id' => $this->config->getSystemValue('ionos_customclient_ios_appid'), ]; } diff --git a/tests/Controller/PageControllerTest.php b/tests/Controller/PageControllerTest.php index 69c703b..e03e53d 100644 --- a/tests/Controller/PageControllerTest.php +++ b/tests/Controller/PageControllerTest.php @@ -170,8 +170,6 @@ protected function setUp(): void { 'ionos_customclient_ios_appid' => 'mocked-ios-appid', 'ionos_customclient_windows' => 'mocked-windows-url', 'ionos_customclient_macos' => 'mocked-macos-url', - 'ionos_customclient_linux' => 'mocked-linux-url', - 'ionos_customclient_nautilus' => 'mocked-nautilus-url', ]; $mockUser = $this->createMock(IUser::class); @@ -185,7 +183,7 @@ protected function setUp(): void { ->with($this->equalTo($this->uid)) ->willReturn($mockUser); - $this->config->expects($this->atMost(8)) + $this->config->expects($this->atMost(6)) ->method('getSystemValue') ->with( $this->logicalOr( @@ -195,8 +193,6 @@ protected function setUp(): void { $this->equalTo('ionos_customclient_ios_appid'), $this->equalTo('ionos_customclient_windows'), $this->equalTo('ionos_customclient_macos'), - $this->equalTo('ionos_customclient_linux'), - $this->equalTo('ionos_customclient_nautilus'), ), $this->anything() // This catches any default value passed )