upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-11 01:30:50 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 79

Merge pull request #60294 from nextcloud/backport/60212/stable31
Some checks failed
Integration sqlite / changes (push) Has been cancelled
Details
Integration sqlite / integration-sqlite (stable31, 8.1, stable31, --tags ~@large files_features) (push) Has been cancelled
Details
Integration sqlite / integration-sqlite (stable31, 8.1, stable31, capabilities_features) (push) Has been cancelled
Details
Integration sqlite / integration-sqlite (stable31, 8.1, stable31, collaboration_features) (push) Has been cancelled
Details
Integration sqlite / integration-sqlite (stable31, 8.1, stable31, comments_features) (push) Has been cancelled
Details
Integration sqlite / integration-sqlite (stable31, 8.1, stable31, dav_features) (push) Has been cancelled
Details
Integration sqlite / integration-sqlite (stable31, 8.1, stable31, features) (push) Has been cancelled
Details
Integration sqlite / integration-sqlite (stable31, 8.1, stable31, federation_features) (push) Has been cancelled
Details
Integration sqlite / integration-sqlite (stable31, 8.1, stable31, file_conversions) (push) Has been cancelled
Details
Integration sqlite / integration-sqlite (stable31, 8.1, stable31, files_reminders) (push) Has been cancelled
Details
Integration sqlite / integration-sqlite (stable31, 8.1, stable31, filesdrop_features) (push) Has been cancelled
Details
Integration sqlite / integration-sqlite (stable31, 8.1, stable31, ldap_features) (push) Has been cancelled
Details
Integration sqlite / integration-sqlite (stable31, 8.1, stable31, openldap_features) (push) Has been cancelled
Details
Integration sqlite / integration-sqlite (stable31, 8.1, stable31, openldap_numerical_features) (push) Has been cancelled
Details
Integration sqlite / integration-sqlite (stable31, 8.1, stable31, remoteapi_features) (push) Has been cancelled
Details
Integration sqlite / integration-sqlite (stable31, 8.1, stable31, setup_features) (push) Has been cancelled
Details
Integration sqlite / integration-sqlite (stable31, 8.1, stable31, sharees_features) (push) Has been cancelled
Details
Integration sqlite / integration-sqlite (stable31, 8.1, stable31, sharing_features) (push) Has been cancelled
Details
Integration sqlite / integration-sqlite (stable31, 8.1, stable31, theming_features) (push) Has been cancelled
Details
Integration sqlite / integration-sqlite (stable31, 8.1, stable31, videoverification_features) (push) Has been cancelled
Details
Integration sqlite / integration-sqlite-summary (push) Has been cancelled
Details

Browse source 
[stable31] feat(app-licenses): Add further compatible licenses for apps to use
This commit is contained in:
Andy Scherzinger 2026-05-11 16:31:49 +02:00 committed by GitHub
commit 1a8d5ca706
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 37 additions and 1 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"

18
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"/>