upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-05-28 04:32:30 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 25

Merge pull request #60295 from nextcloud/backport/60212/stable32
Some checks are pending
CodeQL Advanced / Analyze (actions) (push) Waiting to run
Details
CodeQL Advanced / Analyze (javascript-typescript) (push) Waiting to run
Details
Integration sqlite / changes (push) Waiting to run
Details
Integration sqlite / integration-sqlite (stable32, 8.1, stable32, --tags ~@large files_features) (push) Blocked by required conditions
Details
Integration sqlite / integration-sqlite (stable32, 8.1, stable32, capabilities_features) (push) Blocked by required conditions
Details
Integration sqlite / integration-sqlite (stable32, 8.1, stable32, collaboration_features) (push) Blocked by required conditions
Details
Integration sqlite / integration-sqlite (stable32, 8.1, stable32, comments_features) (push) Blocked by required conditions
Details
Integration sqlite / integration-sqlite (stable32, 8.1, stable32, dav_features) (push) Blocked by required conditions
Details
Integration sqlite / integration-sqlite (stable32, 8.1, stable32, features) (push) Blocked by required conditions
Details
Integration sqlite / integration-sqlite (stable32, 8.1, stable32, federation_features) (push) Blocked by required conditions
Details
Integration sqlite / integration-sqlite (stable32, 8.1, stable32, file_conversions) (push) Blocked by required conditions
Details
Integration sqlite / integration-sqlite (stable32, 8.1, stable32, files_reminders) (push) Blocked by required conditions
Details
Integration sqlite / integration-sqlite (stable32, 8.1, stable32, filesdrop_features) (push) Blocked by required conditions
Details
Integration sqlite / integration-sqlite (stable32, 8.1, stable32, ldap_features) (push) Blocked by required conditions
Details
Integration sqlite / integration-sqlite (stable32, 8.1, stable32, openldap_features) (push) Blocked by required conditions
Details
Integration sqlite / integration-sqlite (stable32, 8.1, stable32, openldap_numerical_features) (push) Blocked by required conditions
Details
Integration sqlite / integration-sqlite (stable32, 8.1, stable32, remoteapi_features) (push) Blocked by required conditions
Details
Integration sqlite / integration-sqlite (stable32, 8.1, stable32, routing_features) (push) Blocked by required conditions
Details
Integration sqlite / integration-sqlite (stable32, 8.1, stable32, setup_features) (push) Blocked by required conditions
Details
Integration sqlite / integration-sqlite (stable32, 8.1, stable32, sharees_features) (push) Blocked by required conditions
Details
Integration sqlite / integration-sqlite (stable32, 8.1, stable32, sharing_features) (push) Blocked by required conditions
Details
Integration sqlite / integration-sqlite (stable32, 8.1, stable32, theming_features) (push) Blocked by required conditions
Details
Integration sqlite / integration-sqlite (stable32, 8.1, stable32, videoverification_features) (push) Blocked by required conditions
Details
Integration sqlite / integration-sqlite-summary (push) Blocked by required conditions
Details

Browse source 
[stable32] feat(app-licenses): Add further compatible licenses for apps to use
This commit is contained in:
Andy Scherzinger 2026-05-11 16:31:55 +02:00 committed by GitHub
commit 96df650a1e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 39 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
resources/app-info-shipped.xsd
View file

@ -374,13 +374,31 @@
<xs:simpleType name="licence">
<xs:restriction base="xs:string">
<!-- Requires Nextcloud minVersion >= 31 -->
<xs:enumeration value="0BSD"/>
<xs:enumeration value="AGPL-3.0-only"/>
<xs:enumeration value="AGPL-3.0-or-later"/>
<xs:enumeration value="Apache-2.0"/>
<xs:enumeration value="BSD-2-Clause"/>
<xs:enumeration value="BSD-3-Clause"/>
<xs:enumeration value="BSD-3-Clause-Clear"/>
<xs:enumeration value="CC0-1.0"/>
<xs:enumeration value="EUPL-1.2"/>
<xs:enumeration value="FSFAP"/>
<xs:enumeration value="GPL-2.0-or-later"/>
<xs:enumeration value="GPL-3.0-only"/>
<xs:enumeration value="GPL-3.0-or-later"/>
<xs:enumeration value="LGPL-2.1-only"/>
<xs:enumeration value="LGPL-2.1-or-later"/>
<xs:enumeration value="LGPL-3.0-only"/>
<xs:enumeration value="LGPL-3.0-or-later"/>
<xs:enumeration value="MIT"/>
<xs:enumeration value="MPL-2.0"/>
<xs:enumeration value="OLDAP-2.7"/>
<xs:enumeration value="PDDL-1.0"/>
<xs:enumeration value="SAX-PD"/>
<xs:enumeration value="Unlicense"/>
<xs:enumeration value="X11"/>
<!-- Deprecated -->
<xs:enumeration value="agpl"/>
@ -408,7 +426,7 @@
<xs:complexType name="settings">
<xs:sequence>
<xs:element name="admin" minOccurs="0" maxOccurs="unbounded"/>
<xs:element name="admin" minOccurs="0" maxOccurs="unbounded"/>
<xs:element name="admin-section" type="php-class" minOccurs="0"
maxOccurs="unbounded"/>
<xs:element name="personal" type="php-class" minOccurs="0"

22
resources/app-info.xsd
View file

@ -370,13 +370,31 @@
<xs:simpleType name="licence">
<xs:restriction base="xs:string">
<!-- Requires Nextcloud minVersion >= 31 -->
<xs:enumeration value="0BSD"/>
<xs:enumeration value="AGPL-3.0-only"/>
<xs:enumeration value="AGPL-3.0-or-later"/>
<xs:enumeration value="Apache-2.0"/>
<xs:enumeration value="BSD-2-Clause"/>
<xs:enumeration value="BSD-3-Clause"/>
<xs:enumeration value="BSD-3-Clause-Clear"/>
<xs:enumeration value="CC0-1.0"/>
<xs:enumeration value="EUPL-1.2"/>
<xs:enumeration value="FSFAP"/>
<xs:enumeration value="GPL-2.0-or-later"/>
<xs:enumeration value="GPL-3.0-only"/>
<xs:enumeration value="GPL-3.0-or-later"/>
<xs:enumeration value="LGPL-2.1-only"/>
<xs:enumeration value="LGPL-2.1-or-later"/>
<xs:enumeration value="LGPL-3.0-only"/>
<xs:enumeration value="LGPL-3.0-or-later"/>
<xs:enumeration value="MIT"/>
<xs:enumeration value="MPL-2.0"/>
<xs:enumeration value="OLDAP-2.7"/>
<xs:enumeration value="PDDL-1.0"/>
<xs:enumeration value="SAX-PD"/>
<xs:enumeration value="Unlicense"/>
<xs:enumeration value="X11"/>
<!-- Deprecated -->
<xs:enumeration value="agpl"/>
@ -404,8 +422,8 @@
<xs:complexType name="settings">
<xs:sequence>
<xs:element name="admin" minOccurs="0" maxOccurs="unbounded"/>
<xs:element name="admin-section" type="php-class" minOccurs="0"
<xs:element name="admin" minOccurs="0" maxOccurs="unbounded"/>
<xs:element name="admin-section" type="php-class" minOccurs="0"
maxOccurs="unbounded"/>
<xs:element name="personal" type="php-class" minOccurs="0"
maxOccurs="unbounded"/>