Release: merge development into beta

.github/workflows/code-quality.yml

@@ -170,7 +170,7 @@ jobs:
       # entirely on the version openregister cannot load.
       #
       # EVERY MAJOR IN THE DECLARED RANGE, NOT JUST ITS ENDS. appinfo/info.xml declares
-      # <nextcloud min-version="32" max-version="34"/>, and
+      # <nextcloud min-version="32" max-version="35"/>, and
       # tests/Unit/ClaimAccuracyTest::testDeclaredNextcloudRangeMatchesTheTestedMatrix
       # asserts that the lowest ref here EQUALS that floor. A matrix of stable34
       # alone therefore advertises 32 and 33 to the app store while exercising
@@ -187,14 +187,20 @@ jobs:
       # in the LOOSER direction, which this fleet does not take. The floor is still
       # 32, so ClaimAccuracyTest's lowest-ref-equals-floor assertion is unaffected.
       #
-      # stable34 is FIRST deliberately. Playwright is the job that reads [0], and
+      # stable35 is FIRST deliberately, and moved there when max-version rose to
+      # 35. Playwright is the job that reads [0], and
       # tests/e2e/spec-coverage/selector-liveness.spec.ts is a cross-version
       # stylesheet audit whose SINCE deferrals expire only once the survey
-      # reaches the newest supported major (MAX_SUPPORTED_NC). Surveying 32 would
-      # defer the NC33+ header selectors indefinitely; surveying 34 forces them
-      # to be proven live — which is how the eight dead NC 32/33-only selectors
-      # now recorded in that file's ALLOWED list were found.
-      nextcloud-test-refs: '["stable34", "stable32", "stable33"]'
+      # reaches the newest supported major (MAX_SUPPORTED_NC, a constant in that
+      # spec file that mirrors info.xml BY HAND — it still reads 34, so raising
+      # it is a separate decision: it expires that file's SINCE deferrals).
+      # Surveying 32 would defer the NC33+ header selectors
+      # indefinitely; surveying the newest major forces them to be proven live —
+      # which is how the eight dead NC 32/33-only selectors now recorded in that
+      # file's ALLOWED list were found. Leaving stable34 in front of a declared
+      # 35 would put the survey one major behind the claim and start that drift
+      # over again.
+      nextcloud-test-refs: '["stable35", "stable32", "stable33", "stable34"]'
       # These three were `false`, and that is worse than it sounds. The shared
       # workflow builds one matrix leg per tool unconditionally; a disabled leg
       # prints "<tool> is disabled — skipping." and `exit 0`. The job therefore

.gitignore

@@ -23,6 +23,17 @@
 # boot, so it must never be committed (a stray test value here restyles the
 # whole instance the moment the app is activated).
 /css/custom-overrides.css
+# The same, per set, for every set on no design system: the stock Nextcloud
+# theme (custom-overrides-nextcloud.css) and the themes saved off it. Only that
+# set loads its file, so emptying the stock one (the reset) gives stock back.
+/css/custom-overrides-*.css
+
+# Runtime theme state — Nextcloud's own logos, favicon and background image,
+# copied into a theme when it is saved from the editor (BrandingCaptureService)
+# so applying the theme brings them back. They are an admin's uploads on one
+# instance, never part of the app.
+/img/logos/*-captured-*
+/img/backgrounds/*-captured-*
 
 # Runtime theme state — written by the freeform custom-CSS editor at runtime
 # (CustomCssService::write(), atomic temp-file + rename). Unlike

.prettierignore

@@ -52,3 +52,10 @@ scripts/sources/
 # file — so the validation tests have something to reject. Formatting them
 # would remove the very defect under test.
 tests/integration/fixtures/
+
+# Same contract again: both emitted by scripts/generate-component-scopes.mjs
+# from scripts/mapping/component-tokens.json and byte-compared against the
+# committed copies by `npm run test:component-scopes`. Prettier would rewrap
+# the var() fallback chains and fail that check on a file nobody edited.
+css/component-scopes.css
+css/primary-lock.css

appinfo/routes.php

@@ -32,6 +32,8 @@
 		['name' => 'settings#getTokenSet', 'url' => '/settings/tokenset', 'verb' => 'GET'],
 		['name' => 'settings#setSloganSetting', 'url' => '/settings/slogan', 'verb' => 'POST'],
 		['name' => 'settings#setMenuLabelsSetting', 'url' => '/settings/menulabels', 'verb' => 'POST'],
+		['name' => 'settings#setPrimaryDrivesComponentsSetting', 'url' => '/settings/primary-drives-components', 'verb' => 'POST'],
+		['name' => 'settings#setSaveConfirmSettings', 'url' => '/settings/save-confirmations', 'verb' => 'POST'],
 		['name' => 'settings#getThemingValues', 'url' => '/settings/theming', 'verb' => 'GET'],
 		['name' => 'settings#updateThemingValues', 'url' => '/settings/theming', 'verb' => 'POST'],
 		// Resetting core theming to stock deliberately has NO route of its own:

composer.json

@@ -22,7 +22,7 @@
         "conduction/hydra-gates": "^1.8.2",
         "cyclonedx/cyclonedx-php-composer": "^6.2",
         "edgedesign/phpqa": "^1.27",
-        "nextcloud/ocp": "^34.0",
+        "nextcloud/ocp": "^35.0",
         "phpcsstandards/phpcsextra": "^1.4",
         "phpmd/phpmd": "^2.15",
         "phpmetrics/phpmetrics": "^2.8",