Merge branch 'nextcloud:master' into occ-token-login-name

Author: piepre

.github/workflows/block-unconventional-commits.yml

@@ -31,6 +31,6 @@ jobs:
         with:
           persist-credentials: false
 
-      - uses: webiny/action-conventional-commits@faccb24fc2550dd15c0390d944379d2d8ed9690e # v1.3.1
+      - uses: webiny/action-conventional-commits@7f91b1595ca1951cdb671ddc9f07a49081ec5b69 # v1.4.2
         with:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/cypress.yml

@@ -165,7 +165,7 @@ jobs:
         run: ./node_modules/cypress/bin/cypress install
 
       - name: Run ${{ matrix.containers == 'component' && 'component' || 'E2E' }} cypress tests
-        uses: cypress-io/github-action@783cb3f07983868532cabaedaa1e6c00ff4786a8 # v7.1.9
+        uses: cypress-io/github-action@c495c3ddffba403ba11be95fffb67e25203b3799 # v7.1.10
         with:
           # We already installed the dependencies in the init job
           install: false

.gitignore

@@ -17,16 +17,17 @@ node_modules/
 
 # ignore all apps except core ones
 /apps*/*
+!/apps/admin_audit
+!/apps/appstore
 !/apps/cloud_federation_api
 !/apps/comments
 !/apps/contactsinteraction
 !/apps/dashboard
 !/apps/dav
-!/apps/files
+!/apps/encryption
 !/apps/federation
 !/apps/federatedfilesharing
-!/apps/sharebymail
-!/apps/encryption
+!/apps/files
 !/apps/files_external
 !/apps/files_reminders
 !/apps/files_sharing
@@ -38,9 +39,9 @@ node_modules/
 !/apps/profile
 !/apps/provisioning_api
 !/apps/settings
+!/apps/sharebymail
 !/apps/systemtags
 !/apps/testing
-!/apps/admin_audit
 !/apps/updatenotification
 !/apps/theming
 !/apps/twofactor_backupcodes

.nextcloudignore

@@ -55,6 +55,7 @@ window.d.ts
 /.devcontainer
 /__mocks__
 /__tests__
+/apps/testing
 /autotest*.sh
 /build
 /config/config.php

.tx/config

@@ -8,6 +8,12 @@ source_file = translationfiles/templates/admin_audit.pot
 source_lang = en
 type        = PO
 
+[o:nextcloud:p:nextcloud:r:appstore]
+file_filter = translationfiles/<lang>/appstore.po
+source_file = translationfiles/templates/appstore.pot
+source_lang = en
+type        = PO
+
 [o:nextcloud:p:nextcloud:r:cloud_federation_api]
 file_filter = translationfiles/<lang>/cloud_federation_api.po
 source_file = translationfiles/templates/cloud_federation_api.pot

apps/appstore/REUSE.toml

@@ -0,0 +1,22 @@
+version = 1
+SPDX-PackageName = "nextcloud"
+SPDX-PackageSupplier = "Nextcloud <info@nextcloud.com>"
+SPDX-PackageDownloadLocation = "https://github.com/nextcloud/server"
+
+[[annotations]]
+path = ["tests/fixtures/categories.json", "tests/fixtures/categories-api-response.json"]
+precedence = "aggregate"
+SPDX-FileCopyrightText = "2026 Nextcloud GmbH and Nextcloud contributors"
+SPDX-License-Identifier = "CC-BY-SA-4.0"
+
+[[annotations]]
+path = ["img/app.svg"]
+precedence = "aggregate"
+SPDX-FileCopyrightText = "2018-2024 Google LLC"
+SPDX-License-Identifier = "Apache-2.0"
+
+[[annotations]]
+path = ["l10n/**.js", "l10n/**.json"]
+precedence = "aggregate"
+SPDX-FileCopyrightText = "2026 Nextcloud translators"
+SPDX-License-Identifier = "AGPL-3.0-or-later"

apps/appstore/appinfo/info.xml

@@ -0,0 +1,22 @@
+<?xml version="1.0"?>
+<!--
+  - SPDX-FileCopyrightText: 2025 Nextcloud GmbH and Nextcloud contributors
+  - SPDX-License-Identifier: AGPL-3.0-or-later
+-->
+<info xmlns:xsi= "http://www.w3.org/2001/XMLSchema-instance"
+	  xsi:noNamespaceSchemaLocation="../../../resources/app-info-shipped.xsd">
+	<id>appstore</id>
+	<name>Nextcloud Appstore</name>
+	<summary>Nextcloud Appstore</summary>
+	<description>Nextcloud Appstore</description>
+	<version>1.0.0</version>
+	<licence>agpl</licence>
+	<author>Nextcloud</author>
+	<namespace>Appstore</namespace>
+
+	<category>customization</category>
+	<bugs>https://github.com/nextcloud/server/issues</bugs>
+	<dependencies>
+		<nextcloud min-version="34" max-version="34"/>
+	</dependencies>
+</info>

apps/appstore/composer/autoload.php

@@ -0,0 +1,22 @@
+<?php
+
+// autoload.php @generated by Composer
+
+if (PHP_VERSION_ID < 50600) {
+    if (!headers_sent()) {
+        header('HTTP/1.1 500 Internal Server Error');
+    }
+    $err = 'Composer 2.3.0 dropped support for autoloading on PHP <5.6 and you are running '.PHP_VERSION.', please upgrade PHP or use Composer 2.2 LTS via "composer self-update --2.2". Aborting.'.PHP_EOL;
+    if (!ini_get('display_errors')) {
+        if (PHP_SAPI === 'cli' || PHP_SAPI === 'phpdbg') {
+            fwrite(STDERR, $err);
+        } elseif (!headers_sent()) {
+            echo $err;
+        }
+    }
+    throw new RuntimeException($err);
+}
+
+require_once __DIR__ . '/composer/autoload_real.php';
+
+return ComposerAutoloaderInitAppstore::getLoader();

apps/appstore/composer/composer.json

@@ -0,0 +1,13 @@
+{
+    "config" : {
+        "vendor-dir": ".",
+        "optimize-autoloader": true,
+        "classmap-authoritative": true,
+        "autoloader-suffix": "Appstore"
+    },
+    "autoload" : {
+        "psr-4": {
+            "OCA\\Appstore\\": "../lib/"
+        }
+    }
+}