Merge pull request #53 from YunoHost-Apps/testing

Testing to master
2024-09-03 19:56:12 +02:00 · 2022-05-25 16:27:56 +07:00 · 2022-05-25 16:27:56 +07:00 · 274a27a6d1
commit 274a27a6d1
parent 9526128f8b 9109fc9636
8 changed files with 73 additions and 119 deletions
--- a/README.md
+++ b/README.md
@ -3,14 +3,14 @@ N.B.: This README was automatically generated by https://github.com/YunoHost/app
 It shall NOT be edited by hand.
 -->

-# Outline wiki for YunoHost
+# Outline for YunoHost

-[![Integration level](https://dash.yunohost.org/integration/outline.svg)](https://dash.yunohost.org/appci/app/outline) ![](https://ci-apps.yunohost.org/ci/badges/outline.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/outline.maintain.svg)  
-[![Install Outline wiki with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=outline)
+[![Integration level](https://dash.yunohost.org/integration/outline.svg)](https://dash.yunohost.org/appci/app/outline) ![Working status](https://ci-apps.yunohost.org/ci/badges/outline.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/outline.maintain.svg)  
+[![Install Outline with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=outline)

 *[Lire ce readme en français.](./README_fr.md)*

-> *This package allows you to install Outline wiki quickly and simply on a YunoHost server.
+> *This package allows you to install Outline quickly and simply on a YunoHost server.
 If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/install) to learn how to install it.*

 ## Overview
@ -25,20 +25,20 @@ The fastest wiki and knowledge base for growing teams. Beautiful, feature rich,
 - Using Yunohost's built-in SMTP server for notifications


-**Shipped version:** 0.63.0~ynh3
+**Shipped version:** 0.64.3~ynh1

 **Demo:** https://app.getoutline.com/create

 ## Screenshots

-![](./doc/screenshots/outline_screenshot.png)
+![Screenshot of Outline](./doc/screenshots/outline_screenshot.png)

 ## Disclaimers / important information

 ### Not totally free licence
 Outline is a softwared licenced under [BUSL 1.1 licence](https://spdx.org/licenses/BUSL-1.1.html). 
 ⚠️ That licence **is not totally free**. Please read it very carefully if you have any commercial use in mind.
-The Outline version shipped with this package (v0.63.0) will be released under Apache-2.0 licence [after April 15th 2026](https://github.com/outline/outline/blob/1a8f2c3bb08df1ac3fa9cea5a2a7491757b7cf28/LICENSE).
+The Outline version shipped with this package (v0.64.3) will be released under Apache-2.0 licence [after May 23rd 2026](https://github.com/outline/outline/blob/151c2c731a94eefdda4e62f311308e9bd4615838/LICENSE).

 ### Known limitations

@ -57,22 +57,23 @@ You can then change the user rights by default and/or change the admin user afte

 ## Documentation and resources

-* Official app website: www.getoutline.com
-* Official user documentation: https://www.getoutline.com/about
-* Official admin documentation: https://www.getoutline.com/developers
-* Upstream app code repository: https://github.com/outline/outline
-* YunoHost documentation for this app: https://yunohost.org/app_outline
-* Report a bug: https://github.com/YunoHost-Apps/outline_ynh/issues
+* Official app website: <www.getoutline.com>
+* Official user documentation: <https://www.getoutline.com/about>
+* Official admin documentation: <https://www.getoutline.com/developers>
+* Upstream app code repository: <https://github.com/outline/outline>
+* YunoHost documentation for this app: <https://yunohost.org/app_outline>
+* Report a bug: <https://github.com/YunoHost-Apps/outline_ynh/issues>

 ## Developer info

 Please send your pull request to the [testing branch](https://github.com/YunoHost-Apps/outline_ynh/tree/testing).

 To try the testing branch, please proceed like that.
-```
+
+``` bash
 sudo yunohost app install https://github.com/YunoHost-Apps/outline_ynh/tree/testing --debug
 or
 sudo yunohost app upgrade outline -u https://github.com/YunoHost-Apps/outline_ynh/tree/testing --debug
 ```

-**More info regarding app packaging:** https://yunohost.org/packaging_apps
+**More info regarding app packaging:** <https://yunohost.org/packaging_apps>
--- a/README_fr.md
+++ b/README_fr.md
@ -1,12 +1,16 @@
-# Outline wiki pour YunoHost
+<!--
+N.B.: This README was automatically generated by https://github.com/YunoHost/apps/tree/master/tools/README-generator
+It shall NOT be edited by hand.
+-->

-[![Niveau d'intégration](https://dash.yunohost.org/integration/outline.svg)](https://dash.yunohost.org/appci/app/outline) ![](https://ci-apps.yunohost.org/ci/badges/outline.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/outline.maintain.svg)  
-[![Installer Outline wiki avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=outline)
+# Outline pour YunoHost
+
+[![Niveau d'intégration](https://dash.yunohost.org/integration/outline.svg)](https://dash.yunohost.org/appci/app/outline) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/outline.status.svg) ![Status de maintenance](https://ci-apps.yunohost.org/ci/badges/outline.maintain.svg)  
+[![Installer Outline avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=outline)

 *[Read this readme in english.](./README.md)*
-*[Lire ce readme en français.](./README_fr.md)*

-> *Ce package vous permet d'installer Outline wiki rapidement et simplement sur un serveur YunoHost.
+> *Ce package vous permet d'installer Outline rapidement et simplement sur un serveur YunoHost.
 Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour savoir comment l'installer et en profiter.*

 ## Vue d'ensemble
@ -21,20 +25,20 @@ The fastest wiki and knowledge base for growing teams. Beautiful, feature rich,
 - Using Yunohost's built-in SMTP server for notifications


-**Version incluse :** 0.63.0~ynh3
+**Version incluse :** 0.64.3~ynh1

 **Démo :** https://app.getoutline.com/create

 ## Captures d'écran

-![](./doc/screenshots/outline_screenshot.png)
+![Capture d'écran de Outline](./doc/screenshots/outline_screenshot.png)

 ## Avertissements / informations importantes

 ### Not totally free licence
 Outline is a softwared licenced under [BUSL 1.1 licence](https://spdx.org/licenses/BUSL-1.1.html). 
 ⚠️ That licence **is not totally free**. Please read it very carefully if you have any commercial use in mind.
-The Outline version shipped with this package (v0.63.0) will be released under Apache-2.0 licence [after April 15th 2026](https://github.com/outline/outline/blob/1a8f2c3bb08df1ac3fa9cea5a2a7491757b7cf28/LICENSE).
+The Outline version shipped with this package (v0.64.3) will be released under Apache-2.0 licence [after May 23rd 2026](https://github.com/outline/outline/blob/151c2c731a94eefdda4e62f311308e9bd4615838/LICENSE).

 ### Known limitations

@ -53,22 +57,23 @@ You can then change the user rights by default and/or change the admin user afte

 ## Documentations et ressources

-* Site officiel de l'app : www.getoutline.com
-* Documentation officielle utilisateur : https://www.getoutline.com/about
-* Documentation officielle de l'admin : https://www.getoutline.com/developers
-* Dépôt de code officiel de l'app : https://github.com/outline/outline
-* Documentation YunoHost pour cette app : https://yunohost.org/app_outline
-* Signaler un bug : https://github.com/YunoHost-Apps/outline_ynh/issues
+* Site officiel de l'app : <www.getoutline.com>
+* Documentation officielle utilisateur : <https://www.getoutline.com/about>
+* Documentation officielle de l'admin : <https://www.getoutline.com/developers>
+* Dépôt de code officiel de l'app : <https://github.com/outline/outline>
+* Documentation YunoHost pour cette app : <https://yunohost.org/app_outline>
+* Signaler un bug : <https://github.com/YunoHost-Apps/outline_ynh/issues>

 ## Informations pour les développeurs

 Merci de faire vos pull request sur la [branche testing](https://github.com/YunoHost-Apps/outline_ynh/tree/testing).

 Pour essayer la branche testing, procédez comme suit.
-```
+
+``` bash
 sudo yunohost app install https://github.com/YunoHost-Apps/outline_ynh/tree/testing --debug
 ou
 sudo yunohost app upgrade outline -u https://github.com/YunoHost-Apps/outline_ynh/tree/testing --debug
 ```

-**Plus d'infos sur le packaging d'applications :** https://yunohost.org/packaging_apps
+**Plus d'infos sur le packaging d'applications :** <https://yunohost.org/packaging_apps>
--- a/conf/.env
+++ b/conf/.env
@ -21,10 +21,6 @@ REDIS_URL=redis://localhost:6379
 URL=https://__DOMAIN__
 PORT=__PORT__

-# See [documentation](docs/SERVICES.md) on running a separate collaboration
-# server, for normal operation this does not need to be set.
-COLLABORATION_URL=
-
 # To support uploading of images for avatars and document attachments an
 # s3-compatible storage must be provided. AWS S3 is recommended for redundency
 # however if you want to keep all file storage local an alternative such as
@ -45,33 +41,6 @@ AWS_S3_ACL=private

 # –––––––––––––– AUTHENTICATION ––––––––––––––

-# Third party signin credentials, at least ONE OF EITHER Google, Slack,
-# or Microsoft is required for a working installation or you'll have no sign-in
-# options.
-
-# To configure Slack auth, you'll need to create an Application at
-# => https://api.slack.com/apps
-#
-# When configuring the Client ID, add a redirect URL under "OAuth & Permissions":
-# https://<URL>/auth/slack.callback
-SLACK_KEY=
-SLACK_SECRET=
-
-# To configure Google auth, you'll need to create an OAuth Client ID at
-# => https://console.cloud.google.com/apis/credentials
-#
-# When configuring the Client ID, add an Authorized redirect URI:
-# https://<URL>/auth/google.callback
-GOOGLE_CLIENT_ID=
-GOOGLE_CLIENT_SECRET=
-
-# To configure Microsoft/Azure auth, you'll need to create an OAuth Client. See
-# the guide for details on setting up your Azure App:
-# => https://wiki.generaloutline.com/share/dfa77e56-d4d2-4b51-8ff8-84ea6608faa4
-AZURE_CLIENT_ID=
-AZURE_CLIENT_SECRET=
-AZURE_RESOURCE_APP_ID=
-
 # To configure generic OIDC auth, you'll need some kind of identity provider.
 # See documentation for whichever IdP you use to acquire the following info:
 # Redirect URI is https://<URL>/auth/oidc.callback
@ -94,24 +63,6 @@ OIDC_SCOPES="openid profile email"

 # –––––––––––––––– OPTIONAL ––––––––––––––––

-# Base64 encoded private key and certificate for HTTPS termination. This is only
-# required if you do not use an external reverse proxy. See documentation:
-# https://wiki.generaloutline.com/share/1c922644-40d8-41fe-98f9-df2b67239d45
-SSL_KEY=
-SSL_CERT=
-
-# Base64 encoded private key and certificate for HTTPS termination. This is only
-# required if you do not use an external reverse proxy. See documentation:
-# https://wiki.generaloutline.com/share/1c922644-40d8-41fe-98f9-df2b67239d45
-SSL_KEY=
-SSL_CERT=
-
-# If using a Cloudfront/Cloudflare distribution or similar it can be set below.
-# This will cause paths to javascript, stylesheets, and images to be updated to
-# the hostname defined in CDN_URL. In your CDN configuration the origin server
-# should be set to the same as URL.
-CDN_URL=
-
 # Auto-redirect to https in production. The default is true but you may set to
 # false if you can be sure that SSL is terminated at an external loadbalancer.
 FORCE_HTTPS=true
@ -132,24 +83,6 @@ MAXIMUM_IMPORT_SIZE=5120000
 # requests and this ends up being duplicative
 DEBUG=cache,presenters,events,emails,mailer,utils,http,server,processors

-# Comma separated list of domains to be allowed to signin to the wiki. If not
-# set, all domains are allowed by default when using Google OAuth to signin
-ALLOWED_DOMAINS=
-
-# For a complete Slack integration with search and posting to channels the
-# following configs are also needed, some more details
-# => https://wiki.generaloutline.com/share/be25efd1-b3ef-4450-b8e5-c4a4fc11e02a
-#
-SLACK_VERIFICATION_TOKEN=your_token
-SLACK_APP_ID=A0XXXXXXX
-SLACK_MESSAGE_ACTIONS=true
-
-# Optionally enable google analytics to track pageviews in the knowledge base
-GOOGLE_ANALYTICS_ID=
-
-# Optionally enable Sentry (sentry.io) to track errors and performance
-SENTRY_DSN=
-
 # To support sending outgoing transactional emails such as "document updated" or
 # "you've been invited" you'll need to provide authentication for an SMTP server
 SMTP_HOST='localhost'
--- a/conf/app.src
+++ b/conf/app.src
@ -1,5 +1,5 @@
-SOURCE_URL=https://github.com/outline/outline/archive/refs/tags/v0.63.0.tar.gz
-SOURCE_SUM=ca2758a6461c7a159c073374a2480b77d2049625ff9ef87686f57557bd2f0bb4
+SOURCE_URL=https://github.com/outline/outline/archive/refs/tags/v0.64.3.tar.gz
+SOURCE_SUM=5fc5f9442114cdf1dfcc924e8e2d7cd6d756e634ca22bd17b366bffee4af4158
 SOURCE_SUM_PRG=sha256sum
 SOURCE_FORMAT=tar.gz
 SOURCE_IN_SUBDIR=true
--- a/doc/DISCLAIMER.md
+++ b/doc/DISCLAIMER.md
@ -1,7 +1,7 @@
 ### Not totally free licence
 Outline is a softwared licenced under [BUSL 1.1 licence](https://spdx.org/licenses/BUSL-1.1.html). 
 ⚠️ That licence **is not totally free**. Please read it very carefully if you have any commercial use in mind.
-The Outline version shipped with this package (v0.63.0) will be released under Apache-2.0 licence [after April 15th 2026](https://github.com/outline/outline/blob/1a8f2c3bb08df1ac3fa9cea5a2a7491757b7cf28/LICENSE).
+The Outline version shipped with this package (v0.64.3) will be released under Apache-2.0 licence [after May 23rd 2026](https://github.com/outline/outline/blob/151c2c731a94eefdda4e62f311308e9bd4615838/LICENSE).

 ### Known limitations

--- a/manifest.json
+++ b/manifest.json
@ -1,12 +1,12 @@
 {
-    "name": "Outline wiki",
+    "name": "Outline",
    "id": "outline",
    "packaging_format": 1,
    "description": {
-        "en": "An open, extensible, wiki for your team built using React and Node.js.",
-        "fr": "Un wiki open source et évolutif pour votre équipe, conçu avec React et Node.js"
+        "en": "Wiki and knowledge base for teams",
+        "fr": "Wiki et base de connaissances pour les équipes"
    },
-    "version": "0.63.0~ynh3",
+    "version": "0.64.3~ynh1",
    "url": "www.getoutline.com",
    "upstream": {
        "license": "BUSL-1.1",
@ -21,7 +21,7 @@
        "name": "Raoul de Limezy"
    },
    "requirements": {
-        "yunohost": ">= 4.2.4"
+        "yunohost": ">= 4.3.0"
    },
    "multi_instance": false,
    "services": [
@ -51,28 +51,43 @@
            {
                "name": "dex_domain",
                "type": "domain",
-                "ask": "Domain for authentification. It can't be the same domain as above. Dex app will be installed and used for the authentification mechanism"
+                "ask": {
+                    "en": "Domain for authentication. It can't be the same domain as above. Dex app will be installed and used for the authentication mechanism.",
+                    "fr": "Domaine pour l'authentification. Il ne peut pas s'agir du même domaine que ci-dessus. L'application Dex sera installée et utilisée pour le mécanisme d'authentification."
+                }
            },
            {
                "name": "dex_path",
                "type": "path",
                "default": "/",
-                "ask": "Path for authentification url. Please don't use 'auth' as it will break Nginx configuration"
+                "ask": {
+                    "en": "Path for authentication URL. Please don't use 'auth' as it will break NGINX configuration.",
+                    "fr": "Chemin de l'URL d'authentification. Veuillez ne pas utiliser 'auth' car cela casserait la configuration NGINX."
+                }
            },
            {
                "name": "minio_domain",
                "type": "domain",
-                "ask": "Domain for MinIO app, used for images and attachements storage. If not yet installed, it will automatically be. Minio has to be installed at the root"
+                "ask": {
+                    "en": "Domain for MinIO app, used for images and attachments storage. If not yet installed, it will automatically be. MinIO has to be installed at the root.",
+                    "fr": "Domaine pour l'application MinIO, utilisé pour le stockage des images et des pièces jointes. S'il n'est pas encore installé, il le sera automatiquement. MinIO doit être installé à la racine."
+                }
            },
            {
                "name": "minio_admin",
                "type": "user",
-                "ask": "Admin for MinIO app, used for images and attachements storage. Please note that if MinIO is already installed, that setting won't be used"
+                "ask": {
+                    "en": "Administrator for MinIO app, used for images and attachments storage. Please note that if MinIO is already installed, that setting won't be used.",
+                    "fr": "Administrateur pour l'application MinIO, utilisée pour le stockage des images et des pièces jointes. Veuillez noter que si MinIO est déjà installé, ce paramètre ne sera pas utilisé."
+                }
            },
            {
                "name": "minio_password",
                "type": "password",
-                "ask": "Password for MinIO admin"
+                "ask": {
+                    "en": "Password for MinIO administrator",
+                    "fr": "Mot de passe pour l'administrateur MinIO"
+                }
            }
        ]
    }
--- a/sources/patches/app-01-branding.patch
+++ b/sources/patches/app-01-branding.patch
@ -1,8 +1,8 @@
 diff --git a/app/scenes/Document/components/Document.tsx b/app/scenes/Document/components/Document.tsx
-index 955a1fd5..ce385aa2 100644
+index 6a9d1265..452511f1 100644
 --- a/app/scenes/Document/components/Document.tsx
 +++ b/app/scenes/Document/components/Document.tsx
-@@ -611,9 +611,6 @@ class DocumentScene extends React.Component<Props> {
+@@ -625,9 +625,6 @@ class DocumentScene extends React.Component<Props> {
                 </Flex>
               </React.Suspense>
             </MaxWidth>
--- a/sources/patches/app-02-email.patch
+++ b/sources/patches/app-02-email.patch
@ -1,12 +1,12 @@
 diff --git a/server/emails/mailer.tsx b/server/emails/mailer.tsx
-index 6fc9865a..69e5b8ac 100644
+index b13e29dd..bac5fc41 100644
 --- a/server/emails/mailer.tsx
 +++ b/server/emails/mailer.tsx
-@@ -109,6 +109,7 @@ export class Mailer {
-               ciphers: process.env.SMTP_TLS_CIPHERS,
-             }
-           : undefined,
-+        ignoreTLS:true
+@@ -107,6 +107,7 @@ export class Mailer {
+             ciphers: env.SMTP_TLS_CIPHERS,
+           }
+         : undefined,
+      ignoreTLS:true
     };
   }