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

Merge pull request #64 from YunoHost-Apps/testing

Browse source 
Testing to master
This commit is contained in:
Limezy 2023-02-07 23:55:15 +07:00 committed by GitHub
commit 2bfe474529
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 24 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
README.md
View file

@ -5,7 +5,7 @@ It shall NOT be edited by hand.
# Outline for YunoHost
[![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)
[![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)*
@ -25,8 +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.66.0~ynh1
**Shipped version:** 0.67.2~ynh1
**Demo:** https://app.getoutline.com/create

23
README_fr.md
View file

@ -5,15 +5,15 @@ 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) ![Statut 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)*
> *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.*
> *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
## Vue d’ensemble
The fastest wiki and knowledge base for growing teams. Beautiful, feature rich, and markdown compatible.
@ -25,14 +25,13 @@ The fastest wiki and knowledge base for growing teams. Beautiful, feature rich,
- Using Yunohost's built-in SMTP server for notifications
**Version incluse :** 0.66.0~ynh1
**Version incluse :** 0.67.2~ynh1
**Démo :** https://app.getoutline.com/create
## Captures d'écran
## Captures d’écran
![Capture d'écran de Outline](./doc/screenshots/outline_screenshot.png)
![Capture d’écran de Outline](./doc/screenshots/outline_screenshot.png)
## Avertissements / informations importantes
@ -58,10 +57,10 @@ 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>
* 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 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>
@ -77,4 +76,4 @@ 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>

2
conf/.env
View file

@ -55,7 +55,7 @@ OIDC_USERINFO_URI=__DEX_USER_URI__
OIDC_USERNAME_CLAIM=preferred_username
# Display name for OIDC authentication
OIDC_DISPLAY_NAME=Yunohost
OIDC_DISPLAY_NAME=membre (mot de passe)
# Space separated auth scopes.
OIDC_SCOPES="openid profile email"

6
conf/app.src
View file

@ -1,7 +1,7 @@
SOURCE_URL=https://github.com/outline/outline/archive/refs/tags/v0.66.0.tar.gz
SOURCE_SUM=956bb0dec2445b355b3d9e02af56049d934a90ea29826ef12e0773cb878b4758
SOURCE_URL=https://github.com/outline/outline/archive/f0d9bb4898642ca65bde42c8c53d1a4c6dc72e0d.zip
SOURCE_SUM=0788a176da28b52433a19d7144878ad8c2fad3b2893a22aa69285a1f6c356731
SOURCE_SUM_PRG=sha256sum
SOURCE_FORMAT=tar.gz
SOURCE_FORMAT=zip
SOURCE_IN_SUBDIR=true
SOURCE_FILENAME=
SOURCE_EXTRACT=true

2
manifest.json
View file

@ -6,7 +6,7 @@
"en": "Wiki and knowledge base for teams",
"fr": "Wiki et base de connaissances pour les équipes"
},
"version": "0.66.0~ynh1",
"version": "0.67.2~ynh1",
"url": "www.getoutline.com",
"upstream": {
"license": "BUSL-1.1",

4
scripts/upgrade
View file

@ -84,11 +84,11 @@ ynh_system_user_create --username=$app --home_dir="$final_path"
#=================================================
if [ "$upgrade_type" == "UPGRADE_APP" ]
then
then
ynh_script_progression --message="Upgrading source files..." --weight=1
# Download, check integrity, uncompress and patch the source from app.src
ynh_setup_source --dest_dir="$final_path"
ynh_setup_source --dest_dir="$final_path" --full_replace=1
fi
chmod 750 "$final_path"

14
sources/patches/app-01-branding.patch
View file

@ -1,14 +0,0 @@
diff --git a/app/scenes/Document/components/Document.tsx b/app/scenes/Document/components/Document.tsx
index 9d86f478..25b45653 100644
--- a/app/scenes/Document/components/Document.tsx
+++ b/app/scenes/Document/components/Document.tsx
@@ -617,9 +617,6 @@ class DocumentScene extends React.Component<Props> {
</Flex>
</React.Suspense>
</MaxWidth>
- {isShare && !parseDomain(window.location.origin).custom && (
- <Branding href="//www.getoutline.com?ref=sharelink" />
- )}
</Container>
</Background>
{!isShare && (

7
sources/patches/app-02-email.patch
View file

@ -1,11 +1,12 @@
diff --git a/server/emails/mailer.tsx b/server/emails/mailer.tsx
index 669d0038..ccc5c047 100644
index 0d4dea367..5857ccb8a 100644
--- a/server/emails/mailer.tsx
+++ b/server/emails/mailer.tsx
@@ -121,6 +121,7 @@ export class Mailer {
@@ -123,6 +123,7 @@ export class Mailer {
: {
rejectUnauthorized: false,
},
+ ignoreTLS:true
};
}
}