From 236b7ae6e32f2060482e5d0d82f8b2e7514d202e Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Wed, 21 Feb 2024 09:57:50 +0000 Subject: [PATCH 1/8] Auto-update README --- README.md | 6 +++--- README_fr.md | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 80b9b26..69075ed 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ @@ -25,7 +25,7 @@ Outline is a wiki and knowledge base for growing teams. Beautiful, feature rich, - Using Yunohost's built-in SMTP server for notifications -**Shipped version:** 0.75.0~ynh1 +**Shipped version:** 0.75.0~ynh2 **Demo:** https://app.getoutline.com/create @@ -58,4 +58,4 @@ or sudo yunohost app upgrade outline -u https://github.com/YunoHost-Apps/outline_ynh/tree/testing --debug ``` -**More info regarding app packaging:** +**More info regarding app packaging:** \ No newline at end of file diff --git a/README_fr.md b/README_fr.md index 37a882a..0dfed33 100644 --- a/README_fr.md +++ b/README_fr.md @@ -1,5 +1,5 @@ @@ -24,7 +24,7 @@ Outile est un wiki et la base de connaissances les plus rapides pour les équipe - Y compris un serveur Dex pour se connecter à la base d'utilisateurs LDAP de YunoHost à l'aide d'un flux d'authentification OIDC - Utilisation du serveur SMTP intégré de Yunohost pour les notifications -**Version incluse :** 0.75.0~ynh1 +**Version incluse :** 0.75.0~ynh2 **Démo :** https://app.getoutline.com/create From d61a8eb4ebe796df4df08cd16483df3dfbcced4c Mon Sep 17 00:00:00 2001 From: Limezy Date: Tue, 14 May 2024 11:08:10 +0700 Subject: [PATCH 2/8] Fix Dex version and remove specific patches --- scripts/install | 2 +- scripts/restore | 2 +- sources/patches/diff.txt | 388 -------------------------- sources/patches/main-02-visitor.patch | 166 ----------- sources/patches/main-03-login.patch | 59 ---- sources/patches/main-04-bible.patch | 151 ---------- 6 files changed, 2 insertions(+), 766 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/scripts/install b/scripts/install index 60133ad..42b2895 100755 --- a/scripts/install +++ b/scripts/install @@ -29,7 +29,7 @@ if yunohost app list | grep -q "$YNH_APP_ARG_DEX_DOMAIN$YNH_APP_ARG_DEX_PATH"; t ynh_die "The domain provided for Dex is already used by another app. Please chose another one !" fi -yunohost app install https://github.com/YunoHost-Apps/dex_ynh --force --args "domain=$dex_domain&path=$dex_path&oidc_name=$oidc_name&oidc_secret=$oidc_secret&oidc_callback=$oidc_callback" 2>&1 | tee dexlog.txt +yunohost app install https://github.com/YunoHost-Apps/dex_ynh/tree/ccc5b82dc9762b42abe82dfa0582e6e4bb6175c5 --force --args "domain=$dex_domain&path=$dex_path&oidc_name=$oidc_name&oidc_secret=$oidc_secret&oidc_callback=$oidc_callback" 2>&1 | tee dexlog.txt dex_app=$(gawk 'match($0, /Installation of (.+) completed/, app) {print app[1]}' dexlog.txt) rm dexlog.txt diff --git a/scripts/restore b/scripts/restore index 03e23ae..c131566 100755 --- a/scripts/restore +++ b/scripts/restore @@ -21,7 +21,7 @@ if ! yunohost app list | grep -q "id: $dex_app"; then if yunohost app list | grep -q "$dex_domain$dex_path"; then ynh_die "The domain provided for Dex is already used by another app. Please chose another one !" fi - yunohost app install https://github.com/YunoHost-Apps/dex_ynh --force --args "domain=$dex_domain&path=$dex_path&oidc_name=$oidc_name&oidc_secret=$oidc_secret&oidc_callback=$oidc_callback" + yunohost app install https://github.com/YunoHost-Apps/dex_ynh/tree/ccc5b82dc9762b42abe82dfa0582e6e4bb6175c5 --force --args "domain=$dex_domain&path=$dex_path&oidc_name=$oidc_name&oidc_secret=$oidc_secret&oidc_callback=$oidc_callback" fi #================================================= diff --git a/sources/patches/diff.txt b/sources/patches/diff.txt deleted file mode 100644 index 263dd53..0000000 --- a/sources/patches/diff.txt +++ /dev/null @@ -1,388 +0,0 @@ -diff --git a/app/editor/menus/block.tsx b/app/editor/menus/block.tsx -index 301c2610d..1e6917bd8 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 cfbd81bcd..683fa6883 100644 ---- a/app/hooks/useDictionary.ts -+++ b/app/hooks/useDictionary.ts -@@ -83,6 +83,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 094c9dafb..a749e8e6a 100644 ---- a/app/scenes/Document/components/Document.tsx -+++ b/app/scenes/Document/components/Document.tsx -@@ -547,11 +547,6 @@ class DocumentScene extends React.Component { - - - -- {isShare && -- !parseDomain(window.location.origin).custom && -- !auth.user && ( -- -- )} - - {!isShare && ( -