From f2ec84dc412cf9724d0fc334f71cf7b61aef7f70 Mon Sep 17 00:00:00 2001 From: Limezy Date: Thu, 21 Jul 2022 16:34:47 +0200 Subject: [PATCH 1/2] Update to v0.65.2 --- conf/app.src | 4 ++-- doc/DISCLAIMER.md | 2 +- manifest.json | 2 +- sources/patches/app-01-branding.patch | 6 +++--- sources/patches/app-02-email.patch | 4 ++-- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/conf/app.src b/conf/app.src index 7041520..801dabb 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/outline/outline/archive/refs/tags/v0.64.3.tar.gz -SOURCE_SUM=5fc5f9442114cdf1dfcc924e8e2d7cd6d756e634ca22bd17b366bffee4af4158 +SOURCE_URL=https://github.com/outline/outline/archive/refs/tags/v0.65.2.tar.gz +SOURCE_SUM=6c3b78313724abe567f7af48439257c9f95628e9e0209fa5652110c393aafc1a SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/doc/DISCLAIMER.md b/doc/DISCLAIMER.md index 0264de6..a544695 100644 --- 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.64.3) will be released under Apache-2.0 licence [after May 23rd 2026](https://github.com/outline/outline/blob/151c2c731a94eefdda4e62f311308e9bd4615838/LICENSE). +The Outline version shipped with this package (v0.65.2) will be released under Apache-2.0 licence [after May 23rd 2026](https://github.com/outline/outline/blob/151c2c731a94eefdda4e62f311308e9bd4615838/LICENSE). ### Known limitations diff --git a/manifest.json b/manifest.json index d7ad447..7339991 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Wiki and knowledge base for teams", "fr": "Wiki et base de connaissances pour les équipes" }, - "version": "0.64.3~ynh1", + "version": "0.65.2~ynh1", "url": "www.getoutline.com", "upstream": { "license": "BUSL-1.1", diff --git a/sources/patches/app-01-branding.patch b/sources/patches/app-01-branding.patch index 42c3cd7..6923853 100644 --- a/sources/patches/app-01-branding.patch +++ b/sources/patches/app-01-branding.patch @@ -1,12 +1,12 @@ diff --git a/app/scenes/Document/components/Document.tsx b/app/scenes/Document/components/Document.tsx -index 6a9d1265..452511f1 100644 +index 9d86f4782..25b456532 100644 --- a/app/scenes/Document/components/Document.tsx +++ b/app/scenes/Document/components/Document.tsx -@@ -625,9 +625,6 @@ class DocumentScene extends React.Component { +@@ -617,9 +617,6 @@ class DocumentScene extends React.Component { -- {isShare && !isCustomDomain() && ( +- {isShare && !parseDomain(window.location.origin).custom && ( - - )} diff --git a/sources/patches/app-02-email.patch b/sources/patches/app-02-email.patch index ae8e4e9..ef88a4f 100644 --- a/sources/patches/app-02-email.patch +++ b/sources/patches/app-02-email.patch @@ -1,8 +1,8 @@ diff --git a/server/emails/mailer.tsx b/server/emails/mailer.tsx -index b13e29dd..bac5fc41 100644 +index f366391a9..2df962fbc 100644 --- a/server/emails/mailer.tsx +++ b/server/emails/mailer.tsx -@@ -107,6 +107,7 @@ export class Mailer { +@@ -108,6 +108,7 @@ export class Mailer { ciphers: env.SMTP_TLS_CIPHERS, } : undefined, From c9b27df25019448a524cead2cef029ba4ea5a91c Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Fri, 22 Jul 2022 06:35:17 +0000 Subject: [PATCH 2/2] Auto-update README --- README.md | 4 ++-- README_fr.md | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 93a3d47..d93d32c 100644 --- a/README.md +++ b/README.md @@ -25,7 +25,7 @@ The fastest wiki and knowledge base for growing teams. Beautiful, feature rich, - Using Yunohost's built-in SMTP server for notifications -**Shipped version:** 0.64.3~ynh1 +**Shipped version:** 0.65.2~ynh1 **Demo:** https://app.getoutline.com/create @@ -38,7 +38,7 @@ The fastest wiki and knowledge base for growing teams. Beautiful, feature rich, ### 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.64.3) will be released under Apache-2.0 licence [after May 23rd 2026](https://github.com/outline/outline/blob/151c2c731a94eefdda4e62f311308e9bd4615838/LICENSE). +The Outline version shipped with this package (v0.65.2) will be released under Apache-2.0 licence [after May 23rd 2026](https://github.com/outline/outline/blob/151c2c731a94eefdda4e62f311308e9bd4615838/LICENSE). ### Known limitations diff --git a/README_fr.md b/README_fr.md index 6625711..0093035 100644 --- a/README_fr.md +++ b/README_fr.md @@ -5,7 +5,7 @@ It shall NOT be edited by hand. # 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) +[![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) ![Statut 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)* @@ -25,7 +25,7 @@ The fastest wiki and knowledge base for growing teams. Beautiful, feature rich, - Using Yunohost's built-in SMTP server for notifications -**Version incluse :** 0.64.3~ynh1 +**Version incluse :** 0.65.2~ynh1 **Démo :** https://app.getoutline.com/create @@ -38,7 +38,7 @@ The fastest wiki and knowledge base for growing teams. Beautiful, feature rich, ### 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.64.3) will be released under Apache-2.0 licence [after May 23rd 2026](https://github.com/outline/outline/blob/151c2c731a94eefdda4e62f311308e9bd4615838/LICENSE). +The Outline version shipped with this package (v0.65.2) will be released under Apache-2.0 licence [after May 23rd 2026](https://github.com/outline/outline/blob/151c2c731a94eefdda4e62f311308e9bd4615838/LICENSE). ### Known limitations