diff --git a/manifest.toml b/manifest.toml index 931d416..694cb62 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.72.1.1~ynh1" +version = "0.75.0~ynh1" maintainers = ["Raoul de Limezy"] @@ -55,8 +55,8 @@ ram.runtime = "50M" [resources] [resources.sources.main] - url = "https://github.com/outline/outline/archive/ebeb201a9f48e2c6b619a0d152e051946849aa10.zip" - sha256 = "7f7afaff1c12a197583871659f7d08355586a4727133e903a63fd5def1bfbcd2" + url = "https://github.com/outline/outline/archive/2c9b01391fa12ebfd65dc01ec33bbb4941ef23bf.zip" + sha256 = "1bf8ef7fdac470ed0faeefd9575ffbac1f12d623e89d9ee244b2f83788d92933" [resources.system_user] allow_email = true diff --git a/scripts/install b/scripts/install index e908285..60133ad 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 --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 @@ -118,7 +118,7 @@ yunohost service add $app --description="Outline server" --log="/var/log/$app/$a #================================================= # BUILD YARN DEPENDENCIES #================================================= -ynh_script_progression --message="Building $app" --weight=18 +ynh_script_progression --message="Building $app. This can be very long, be patient !" --weight=18 pushd "$install_dir" ynh_use_nodejs diff --git a/scripts/upgrade b/scripts/upgrade index 92d87b1..5db2220 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -77,7 +77,7 @@ ynh_exec_warn_less ynh_install_nodejs --nodejs_version=$NODEJS_VERSION #================================================= # UPGRADE YARN DEPENDENCIES #================================================= -ynh_script_progression --message="Building $app" --weight=10 +ynh_script_progression --message="Building $app. This can be very long, be patient !" --weight=10 pushd "$install_dir" ynh_use_nodejs diff --git a/sources/patches/diff.txt b/sources/patches/diff.txt new file mode 100644 index 0000000..f781b63 --- /dev/null +++ b/sources/patches/diff.txt @@ -0,0 +1,371 @@ +diff --git a/app/components/Icons/OutlineIcon.tsx b/app/components/Icons/OutlineIcon.tsx +index bb7f29ce7..70db50bcd 100644 +--- a/app/components/Icons/OutlineIcon.tsx ++++ b/app/components/Icons/OutlineIcon.tsx +@@ -22,7 +22,10 @@ export default function OutlineIcon({ + viewBox={cover ? "2 2 20 20" : "0 0 24 24"} + version="1.1" + > +- ++ + + ); + } +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 6a73e6750..15b74aa9e 100644 +--- a/app/hooks/useDictionary.ts ++++ b/app/hooks/useDictionary.ts +@@ -81,6 +81,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 a231a90ee..67684d36d 100644 +--- a/app/scenes/Document/components/Document.tsx ++++ b/app/scenes/Document/components/Document.tsx +@@ -532,11 +532,6 @@ class DocumentScene extends React.Component { + + + +- {isShare && +- !parseDomain(window.location.origin).custom && +- !auth.user && ( +- +- )} + + {!isShare && ( +