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 #60 from YunoHost-Apps/testing

Browse source 
Testing to master
This commit is contained in:
Limezy 2022-09-06 18:33:32 +07:00 • committed by GitHub
commit 61b3e0c754
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
9 changed files with 19 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
README.md
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 - Using Yunohost's built-in SMTP server for notifications
**Shipped version:** 0.65.2~ynh2 **Shipped version:** 0.66.0~ynh1
**Demo:** https://app.getoutline.com/create **Demo:** https://app.getoutline.com/create

2
README_fr.md
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 - Using Yunohost's built-in SMTP server for notifications
**Version incluse :** 0.65.2~ynh2 **Version incluse :** 0.66.0~ynh1
**Démo :** https://app.getoutline.com/create **Démo :** https://app.getoutline.com/create

4
conf/app.src
View file

@ -1,5 +1,5 @@
SOURCE_URL=https://github.com/outline/outline/archive/refs/tags/v0.65.2.tar.gz SOURCE_URL=https://github.com/outline/outline/archive/refs/tags/v0.66.0.tar.gz
SOURCE_SUM=6c3b78313724abe567f7af48439257c9f95628e9e0209fa5652110c393aafc1a SOURCE_SUM=956bb0dec2445b355b3d9e02af56049d934a90ea29826ef12e0773cb878b4758
SOURCE_SUM_PRG=sha256sum SOURCE_SUM_PRG=sha256sum
SOURCE_FORMAT=tar.gz SOURCE_FORMAT=tar.gz
SOURCE_IN_SUBDIR=true SOURCE_IN_SUBDIR=true

4
manifest.json
View file

@ -6,7 +6,7 @@
"en": "Wiki and knowledge base for teams", "en": "Wiki and knowledge base for teams",
"fr": "Wiki et base de connaissances pour les équipes" "fr": "Wiki et base de connaissances pour les équipes"
}, },
"version": "0.65.2~ynh2", "version": "0.66.0~ynh1",
"url": "www.getoutline.com", "url": "www.getoutline.com",
"upstream": { "upstream": {
"license": "BUSL-1.1", "license": "BUSL-1.1",
@ -21,7 +21,7 @@
"name": "Raoul de Limezy" "name": "Raoul de Limezy"
}, },
"requirements": { "requirements": {
"yunohost": ">= 4.3.0" "yunohost": ">= 11.0.9"
}, },
"multi_instance": false, "multi_instance": false,
"services": [ "services": [

2
scripts/_common.sh
View file

@ -7,7 +7,7 @@
# dependencies used by the app # dependencies used by the app
pkg_dependencies="postgresql" pkg_dependencies="postgresql"
NODEJS_VERSION=14 NODEJS_VERSION=16
#================================================= #=================================================
# PERSONAL HELPERS # PERSONAL HELPERS

4
scripts/install
View file

@ -215,13 +215,13 @@ ynh_add_nginx_config
pushd "$final_path" pushd "$final_path"
ynh_use_nodejs ynh_use_nodejs
ynh_script_progression --message="Fetching Yarn dev dependencies... This can be very long, be patient !" --weight=18 ynh_script_progression --message="Fetching Yarn dev dependencies... This can be very long, be patient !" --weight=18
ynh_exec_warn_less sudo -u $app env $ynh_node_load_PATH yarn install --no-optional --frozen-lockfile 2>&1 ynh_exec_warn_less sudo -u $app env $ynh_node_load_PATH yarn install --no-optional --frozen-lockfile --network-timeout 1000000000 2>&1
ynh_script_progression --message="Cleaning cache... " --weight=3 ynh_script_progression --message="Cleaning cache... " --weight=3
ynh_exec_warn_less sudo -u $app env $ynh_node_load_PATH yarn cache clean 2>&1 ynh_exec_warn_less sudo -u $app env $ynh_node_load_PATH yarn cache clean 2>&1
ynh_script_progression --message="Building Yarn dev dependencies... This can be very long, be patient !" --weight=18 ynh_script_progression --message="Building Yarn dev dependencies... This can be very long, be patient !" --weight=18
ynh_exec_warn_less sudo -u $app env $ynh_node_load_PATH yarn build 2>&1 ynh_exec_warn_less sudo -u $app env $ynh_node_load_PATH yarn build 2>&1
ynh_script_progression --message="Fetching Yarn production dependencies... This can be very long, be patient !" --weight=18 ynh_script_progression --message="Fetching Yarn production dependencies... This can be very long, be patient !" --weight=18
ynh_exec_warn_less sudo -u $app env $ynh_node_load_PATH yarn install --production=true --frozen-lockfile 2>&1 ynh_exec_warn_less sudo -u $app env $ynh_node_load_PATH yarn install --production=true --frozen-lockfile --network-timeout 1000000000 2>&1
ynh_script_progression --message="Cleaning cache... " --weight=3 ynh_script_progression --message="Cleaning cache... " --weight=3
ynh_exec_warn_less sudo -u $app env $ynh_node_load_PATH yarn cache clean 2>&1 ynh_exec_warn_less sudo -u $app env $ynh_node_load_PATH yarn cache clean 2>&1
popd popd

4
scripts/upgrade
View file

@ -124,13 +124,13 @@ ynh_script_progression --message="Building Yarn dependencies... This can be very
pushd "$final_path" pushd "$final_path"
ynh_use_nodejs ynh_use_nodejs
ynh_script_progression --message="Fetching Yarn dev dependencies... This can be very long, be patient !" --weight=5 ynh_script_progression --message="Fetching Yarn dev dependencies... This can be very long, be patient !" --weight=5
ynh_exec_warn_less sudo -u $app env $ynh_node_load_PATH yarn install --no-optional --frozen-lockfile 2>&1 ynh_exec_warn_less sudo -u $app env $ynh_node_load_PATH yarn install --no-optional --frozen-lockfile --network-timeout 1000000000 2>&1
ynh_script_progression --message="Cleaning cache... " --weight=1 ynh_script_progression --message="Cleaning cache... " --weight=1
ynh_exec_warn_less sudo -u $app env $ynh_node_load_PATH yarn cache clean 2>&1 ynh_exec_warn_less sudo -u $app env $ynh_node_load_PATH yarn cache clean 2>&1
ynh_script_progression --message="Building Yarn dev dependencies... This can be very long, be patient !" --weight=5 ynh_script_progression --message="Building Yarn dev dependencies... This can be very long, be patient !" --weight=5
ynh_exec_warn_less sudo -u $app env $ynh_node_load_PATH yarn build 2>&1 ynh_exec_warn_less sudo -u $app env $ynh_node_load_PATH yarn build 2>&1
ynh_script_progression --message="Fetching Yarn production dependencies... This can be very long, be patient !" --weight=5 ynh_script_progression --message="Fetching Yarn production dependencies... This can be very long, be patient !" --weight=5
ynh_exec_warn_less sudo -u $app env $ynh_node_load_PATH yarn install --production=true --frozen-lockfile 2>&1 ynh_exec_warn_less sudo -u $app env $ynh_node_load_PATH yarn install --production=true --frozen-lockfile --network-timeout 1000000000 2>&1
ynh_script_progression --message="Cleaning cache... " --weight=1 ynh_script_progression --message="Cleaning cache... " --weight=1
ynh_exec_warn_less sudo -u $app env $ynh_node_load_PATH yarn cache clean 2>&1 ynh_exec_warn_less sudo -u $app env $ynh_node_load_PATH yarn cache clean 2>&1
popd popd

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

@ -1,5 +1,5 @@
diff --git a/app/scenes/Document/components/Document.tsx b/app/scenes/Document/components/Document.tsx diff --git a/app/scenes/Document/components/Document.tsx b/app/scenes/Document/components/Document.tsx
index 9d86f4782..25b456532 100644 index 9d86f478..25b45653 100644
--- a/app/scenes/Document/components/Document.tsx --- a/app/scenes/Document/components/Document.tsx
+++ b/app/scenes/Document/components/Document.tsx +++ b/app/scenes/Document/components/Document.tsx
@@ -617,9 +617,6 @@ class DocumentScene extends React.Component<Props> { @@ -617,9 +617,6 @@ class DocumentScene extends React.Component<Props> {

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

@ -1,12 +1,11 @@
diff --git a/server/emails/mailer.tsx b/server/emails/mailer.tsx diff --git a/server/emails/mailer.tsx b/server/emails/mailer.tsx
index f366391a9..2df962fbc 100644 index 669d0038..ccc5c047 100644
--- a/server/emails/mailer.tsx --- a/server/emails/mailer.tsx
+++ b/server/emails/mailer.tsx +++ b/server/emails/mailer.tsx
@@ -108,6 +108,7 @@ export class Mailer { @@ -121,6 +121,7 @@ export class Mailer {
ciphers: env.SMTP_TLS_CIPHERS, : {
} rejectUnauthorized: false,
: undefined, },
+ ignoreTLS:true + ignoreTLS:true
}; };
} }