1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/outline_ynh.git synced 2024-09-03 19:56:12 +02:00

Merge pull request #55 from YunoHost-Apps/testing

Testing to master
This commit is contained in:
Limezy 2022-07-22 08:36:04 +02:00 committed by GitHub
commit a617fb0e72
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 14 additions and 14 deletions

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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",

View file

@ -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<Props> {
@@ -617,9 +617,6 @@ class DocumentScene extends React.Component<Props> {
</Flex>
</React.Suspense>
</MaxWidth>
- {isShare && !isCustomDomain() && (
- {isShare && !parseDomain(window.location.origin).custom && (
- <Branding href="//www.getoutline.com?ref=sharelink" />
- )}
</Container>

View file

@ -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,