From c213a16507a8e5173904e3cd4c83077b06dccfba Mon Sep 17 00:00:00 2001 From: Limezy Date: Mon, 26 Aug 2024 10:25:51 +0700 Subject: [PATCH 1/5] Update upgrade --- scripts/upgrade | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/upgrade b/scripts/upgrade index e460679..2a9b582 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -72,9 +72,9 @@ then ynh_script_progression --message="Migrating default language variable" if [ "$language" == "fr" ] then - $language = "fr_FR" + language = "fr_FR" else - $language = "en_US" + language = "en_US" fi else ynh_script_progression --message="No default language migration to be done" From 6ddedde74c06d5da548d54251794f95936e5fe71 Mon Sep 17 00:00:00 2001 From: Limezy Date: Mon, 26 Aug 2024 10:28:56 +0700 Subject: [PATCH 2/5] Update upgrade --- scripts/upgrade | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/upgrade b/scripts/upgrade index 2a9b582..09204f0 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -72,9 +72,9 @@ then ynh_script_progression --message="Migrating default language variable" if [ "$language" == "fr" ] then - language = "fr_FR" + ynh_app_setting_set --key=language --value="fr_FR" else - language = "en_US" + ynh_app_setting_set --key=language --value="en_US" fi else ynh_script_progression --message="No default language migration to be done" From 65159a07c360b65553e7223081828101e2660cc8 Mon Sep 17 00:00:00 2001 From: Limezy Date: Thu, 29 Aug 2024 09:54:44 +0700 Subject: [PATCH 3/5] Update upgrade --- scripts/upgrade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/upgrade b/scripts/upgrade index 09204f0..431c875 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -33,7 +33,7 @@ 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="$install_dir" + ynh_setup_source --dest_dir="$install_dir" -r fi chmod -R o-rwx "$install_dir" From 4130ff7496a950dbb411d87b5ce461894b142dba Mon Sep 17 00:00:00 2001 From: Limezy Date: Thu, 29 Aug 2024 09:56:33 +0700 Subject: [PATCH 4/5] Update upgrade --- scripts/upgrade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/upgrade b/scripts/upgrade index 431c875..8fe90cc 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -33,7 +33,7 @@ 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="$install_dir" -r + ynh_setup_source --dest_dir="$install_dir" --full_replace=1 fi chmod -R o-rwx "$install_dir" From 3a4c2e385c7d43d1315542a5caa5cb17fcd233b2 Mon Sep 17 00:00:00 2001 From: Limezy Date: Thu, 29 Aug 2024 11:34:46 +0700 Subject: [PATCH 5/5] Fix upgrades --- manifest.toml | 2 +- sources/patches/diff.txt | 389 -------------------------- sources/patches/main-02-visitor.patch | 167 ----------- sources/patches/main-03-login.patch | 59 ---- sources/patches/main-04-bible.patch | 151 ---------- 5 files changed, 1 insertion(+), 767 deletions(-) delete mode 100644 sources/patches/diff.txt delete mode 100644 sources/patches/main-02-visitor.patch delete mode 100644 sources/patches/main-03-login.patch delete mode 100644 sources/patches/main-04-bible.patch diff --git a/manifest.toml b/manifest.toml index f256022..6be8ff6 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "Outline" description.en = "Wiki and knowledge base for teams" description.fr = "Wiki et base de connaissances pour les équipes" -version = "0.78.0~ynh1" +version = "0.78.0~ynh2" maintainers = ["Raoul de Limezy"] diff --git a/sources/patches/diff.txt b/sources/patches/diff.txt deleted file mode 100644 index 8bfcccc..0000000 --- a/sources/patches/diff.txt +++ /dev/null @@ -1,389 +0,0 @@ -diff --git a/app/editor/menus/block.tsx b/app/editor/menus/block.tsx -index 05e9acee6..aca761095 100644 ---- a/app/editor/menus/block.tsx -+++ b/app/editor/menus/block.tsx -@@ -20,6 +20,7 @@ import { - MathIcon, - DoneIcon, - EmbedIcon, -+ BookmarkedIcon, - } from "outline-icons"; - import * as React from "react"; - import styled from "styled-components"; -@@ -195,6 +196,13 @@ export default function blockMenuItems(dictionary: Dictionary): MenuItem[] { - keywords: "notice card suggestion", - attrs: { style: "tip" }, - }, -+ { -+ name: "container_notice", -+ title: dictionary.bibleNotice, -+ icon: , -+ keywords: "notice card bible", -+ attrs: { style: "bible" }, -+ }, - { - name: "separator", - }, -diff --git a/app/hooks/useDictionary.ts b/app/hooks/useDictionary.ts -index e8178b11d..9dac7edba 100644 ---- a/app/hooks/useDictionary.ts -+++ b/app/hooks/useDictionary.ts -@@ -85,6 +85,8 @@ export default function useDictionary() { - warningNotice: t("Warning notice"), - success: t("Success"), - successNotice: t("Success notice"), -+ bible: t("Bible"), -+ bibleNotice: t("Bible quote"), - insertDate: t("Current date"), - insertTime: t("Current time"), - insertDateTime: t("Current date and time"), -diff --git a/app/scenes/Document/components/Document.tsx b/app/scenes/Document/components/Document.tsx -index 752915e89..5eefe890c 100644 ---- a/app/scenes/Document/components/Document.tsx -+++ b/app/scenes/Document/components/Document.tsx -@@ -599,11 +599,6 @@ class DocumentScene extends React.Component { - )} - - -- {isShare && -- !parseDomain(window.location.origin).custom && -- !auth.user && ( -- -- )} - - {!isShare && ( -