diff --git a/admin_manual/apps_management.rst b/admin_manual/apps_management.rst index 995d2982a..b822a03e9 100644 --- a/admin_manual/apps_management.rst +++ b/admin_manual/apps_management.rst @@ -4,11 +4,11 @@ Apps management Nextcloud apps can enhance, customize or even restrict the features and experience you and your users has with the Nextcloud server. Next to default enabled functions -like Files, Activity and Gallery there are other apps like Calendar, Contacts, +like Files, Activity and Photos there are other apps like Calendar, Contacts, Talk and more which are enhancing the features of your Nextcloud server. After installing the Nextcloud server, you might want to consider about enabling, -disabling or even restricting some apps to groups depending on your and your users +disabling or even restricting some apps to groups depending on your and your users' needs. Apps @@ -21,19 +21,19 @@ During the Nextcloud server installation, some apps are enabled by default. To see which apps are enabled go to your Apps page. Those apps are supported and developed by Nextcloud GmbH directly and -have an **Official**-tag. See :doc:`installation/apps_supported` for a list of supported apps. +have an **Featured**-tag. See :doc:`installation/apps_supported` for a list of supported apps. + +.. note:: Your Nextcloud server needs to be able to communicate with + ``https://apps.nextcloud.com`` to list and download apps. Please make sure to whitelist this target in your firewall or proxy if necessary_. .. note:: To get access to work-arounds, long-term-support, priority bug fixing and custom consulting for supported apps, contact our `sales team `_. -Apps with **Approved** tag are community-developed and were uploaded in the -`Nextcloud App Store `_. - .. note:: If you would like to develop your own Nextcloud app, you can find out - more information in our `developer manual `_. + more information in our `developer manual `_. .. TODO ON RELEASE: Update version number above on release -All apps need to be licensed under AGPLv3+ or any compatible license. +All apps must be licensed under AGPLv3+ or any compatible license. Managing apps ------------- diff --git a/admin_manual/configuration_server/occ_command.rst b/admin_manual/configuration_server/occ_command.rst index df2147947..d9f5ff374 100644 --- a/admin_manual/configuration_server/occ_command.rst +++ b/admin_manual/configuration_server/occ_command.rst @@ -757,7 +757,7 @@ and to copy external mount configurations to another Nextcloud server. Integrity check --------------- -Apps which have an official tag MUST be code signed with Nextcloud. Unsigned official apps won't be installable anymore. Code signing is optional for all third-party applications:: +Apps which have a ``Featured`` tag MUST be code signed with Nextcloud. Unsigned featured apps won't be installable anymore. Code signing is optional for all third-party applications:: integrity integrity:check-app Check app integrity using a signature. diff --git a/admin_manual/configuration_user/two_factor-auth.rst b/admin_manual/configuration_user/two_factor-auth.rst index 28ac5b75e..24e480532 100644 --- a/admin_manual/configuration_user/two_factor-auth.rst +++ b/admin_manual/configuration_user/two_factor-auth.rst @@ -5,7 +5,7 @@ Two-factor authentication Two-factor authentication adds an additional layer of security to user accounts. In order to log in on an account with two-factor authentication (2FA) enabled, it is necessary to provide both the login password and another factor. 2FA in Nextcloud is pluggable, meaning that they are not part -of the Nextcloud Server component but provided by official and 3rd-party Nextcloud apps. +of the Nextcloud Server component but provided by featured and 3rd-party Nextcloud apps. Several 2FA apps are already available including diff --git a/developer_manual/app/code_signing.rst b/developer_manual/app/code_signing.rst index 0ad7f1dbd..d18ee827e 100644 --- a/developer_manual/app/code_signing.rst +++ b/developer_manual/app/code_signing.rst @@ -28,7 +28,7 @@ Do we lock down Nextcloud? The Nextcloud project is open source and always will be. We do not want to make it more difficult for our users to run Nextcloud. Any code signing errors on upgrades will not prevent Nextcloud from running, but will display a warning on -the Admin page. For applications that are not tagged "Official" the code signing +the Admin page. For applications that are not tagged "Featured" the code signing process is optional. Not open source anymore? @@ -103,8 +103,8 @@ still be ensured by having a new certificate issued. How code signing affects apps in the app store ---------------------------------------------- -- Apps which have an ``official`` tag **MUST** be code signed. - Unsigned ``official`` apps won't be installable anymore. +- Apps which have a ``Featured`` tag **MUST** be code signed. + Unsigned ``Featured`` apps won't be installable anymore. - Apps which have been signed in a previous release **MUST** be code-signed in all future releases as well, otherwise the update will be refused. diff --git a/developer_manual/app/publishing.rst b/developer_manual/app/publishing.rst index a5ea18309..2d456c982 100644 --- a/developer_manual/app/publishing.rst +++ b/developer_manual/app/publishing.rst @@ -41,12 +41,13 @@ These are the app guidelines an app has to comply with to have a chance to be ap Legal and security ^^^^^^^^^^^^^^^^^^ -* Apps can not use 'Nextcloud' in their name. +* Apps must be licensed under AGPLv3+ or any compatible license. +* Apps must not use 'Nextcloud' in their name. * Irregular and unannounced security audits of all apps can and will take place. * If any indication of malicious intent or bad faith is found the developer(s) in question can count on a minimum 2 year ban from any Nextcloud infrastructure. * Malicious intent includes deliberate spying on users by leaking user data to a third party system or adding a back door (like a hard-coded user account) to Nextcloud. An unintentional security bug that gets fixed in time won't be considered bad faith. * Apps do not violate any laws; it has to comply with copyright- and trademark law. -* App authors have to respond timely to security concerns and not make Nextcloud more vulnerable to attack. +* App authors have to respond timely to security concerns and not make Nextcloud more vulnerable to attacks. .. note:: Distributing malicious or illegal applications can have legal consequences including, but not limited to Nextcloud or affected users taking legal action.