diff --git a/ALL_README.md b/ALL_README.md new file mode 100644 index 0000000..3d6c579 --- /dev/null +++ b/ALL_README.md @@ -0,0 +1,6 @@ +# All available README files by language + +- [Read the README in English](README.md) +- [Lire le README en français](README_fr.md) +- [Le o README en galego](README_gl.md) +- [Leggi il “README” in italiano](README_it.md) diff --git a/README.md b/README.md index 69075ed..7a5cfd1 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,5 @@ # Outline for YunoHost @@ -9,10 +8,10 @@ It shall NOT be edited by hand. [![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)* +*[Read this README is other languages.](./ALL_README.md)* -> *This package allows you to install Outline quickly and simply on a YunoHost server. -If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/install) to learn how to install it.* +> *This package allows you to install Outline quickly and simply on a YunoHost server.* +> *If you don't have YunoHost, please consult [the guide](https://yunohost.org/install) to learn how to install it.* ## Overview @@ -27,7 +26,7 @@ Outline is a wiki and knowledge base for growing teams. Beautiful, feature rich, **Shipped version:** 0.75.0~ynh2 -**Demo:** https://app.getoutline.com/create +**Demo:** ## Screenshots @@ -39,20 +38,20 @@ Outline is a wiki and knowledge base for growing teams. Beautiful, feature rich, ## Documentation and resources -* Official app website: -* Official user documentation: -* Official admin documentation: -* Upstream app code repository: -* YunoHost Store: -* Report a bug: +- Official app website: +- Official user documentation: +- Official admin documentation: +- Upstream app code repository: +- YunoHost Store: +- Report a bug: ## Developer info -Please send your pull request to the [testing branch](https://github.com/YunoHost-Apps/outline_ynh/tree/testing). +Please send your pull request to the [`testing` branch](https://github.com/YunoHost-Apps/outline_ynh/tree/testing). -To try the testing branch, please proceed like that. +To try the `testing` branch, please proceed like that: -``` bash +```bash sudo yunohost app install https://github.com/YunoHost-Apps/outline_ynh/tree/testing --debug or sudo yunohost app upgrade outline -u https://github.com/YunoHost-Apps/outline_ynh/tree/testing --debug diff --git a/README_fr.md b/README_fr.md index 0dfed33..8955be0 100644 --- a/README_fr.md +++ b/README_fr.md @@ -9,10 +9,10 @@ It shall NOT be edited by hand. [![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)* +*[Lire le README dans d'autres langues.](./ALL_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, consultez [ce guide](https://yunohost.org/install) pour savoir comment l’installer et en profiter.* ## Vue d’ensemble @@ -24,37 +24,37 @@ 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~ynh2 +**Version incluse :** 0.75.0~ynh1 -**Démo :** https://app.getoutline.com/create +**Démo :** ## Captures d’écran ![Capture d’écran de Outline](./doc/screenshots/screenshot.png) -## :red_circle: Fonctions indésirables +## :red_circle: Anti-fonctionnalités -- **Not totally free upstream**: The packaged app is under an overall free licence, but with clauses that restrict its use. +- **Application sous licence libre restreinte**: L'application packagée est sous une licence globalement libre, mais avec des clauses qui pourraient restreindre son utilisation. ## Documentations et ressources -* Site officiel de l’app : -* Documentation officielle utilisateur : -* Documentation officielle de l’admin : -* Dépôt de code officiel de l’app : -* YunoHost Store: -* Signaler un bug : +- Site officiel de l’app : +- Documentation officielle utilisateur : +- Documentation officielle de l’admin : +- Dépôt de code officiel de l’app : +- YunoHost Store : +- Signaler un bug : ## Informations pour les développeurs -Merci de faire vos pull request sur la [branche testing](https://github.com/YunoHost-Apps/outline_ynh/tree/testing). +Merci de faire vos pull request sur la [branche `testing`](https://github.com/YunoHost-Apps/outline_ynh/tree/testing). -Pour essayer la branche testing, procédez comme suit. +Pour essayer la branche `testing`, procédez comme suit : -``` bash +```bash sudo yunohost app install https://github.com/YunoHost-Apps/outline_ynh/tree/testing --debug 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 :** \ No newline at end of file +**Plus d’infos sur le packaging d’applications :** diff --git a/README_gl.md b/README_gl.md new file mode 100644 index 0000000..07dedb1 --- /dev/null +++ b/README_gl.md @@ -0,0 +1,61 @@ + + +# Outline para YunoHost + +[![Nivel de integración](https://dash.yunohost.org/integration/outline.svg)](https://dash.yunohost.org/appci/app/outline) ![Estado de funcionamento](https://ci-apps.yunohost.org/ci/badges/outline.status.svg) ![Estado de mantemento](https://ci-apps.yunohost.org/ci/badges/outline.maintain.svg) + +[![Instalar Outline con YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=outline) + +*[Le este README en outros idiomas.](./ALL_README.md)* + +> *Este paquete permíteche instalar Outline de xeito rápido e doado nun servidor YunoHost.* +> *Se non usas YunoHost, le a [documentación](https://yunohost.org/install) para saber como instalalo.* + +## Vista xeral + +Outline is a wiki and knowledge base for growing teams. Beautiful, feature rich, and markdown compatible. + +### Features + +- Fully working installation of Outline wiki +- Including a Dex server to connect to YunoHost's LDAP userbase using an OIDC auth flow +- Using Yunohost's built-in SMTP server for notifications + + +**Versión proporcionada:** 0.75.0~ynh1 + +**Demo:** + +## Capturas de pantalla + +![Captura de pantalla de Outline](./doc/screenshots/screenshot.png) + +## :red_circle: Caraterísticas cuestionables + +- **Not totally free upstream**: The packaged app is under an overall free licence, but with clauses that restrict its use. + +## Documentación e recursos + +- Web oficial da app: +- Documentación oficial para usuarias: +- Documentación oficial para admin: +- Repositorio de orixe do código: +- Tenda YunoHost: +- Informar dun problema: + +## Info de desenvolvemento + +Envía a túa colaboración á [rama `testing`](https://github.com/YunoHost-Apps/outline_ynh/tree/testing). + +Para probar a rama `testing`, procede deste xeito: + +```bash +sudo yunohost app install https://github.com/YunoHost-Apps/outline_ynh/tree/testing --debug +ou +sudo yunohost app upgrade outline -u https://github.com/YunoHost-Apps/outline_ynh/tree/testing --debug +``` + +**Máis info sobre o empaquetado da app:** diff --git a/README_it.md b/README_it.md new file mode 100644 index 0000000..5af943b --- /dev/null +++ b/README_it.md @@ -0,0 +1,61 @@ + + +# Outline per YunoHost + +[![Livello di integrazione](https://dash.yunohost.org/integration/outline.svg)](https://dash.yunohost.org/appci/app/outline) ![Stato di funzionamento](https://ci-apps.yunohost.org/ci/badges/outline.status.svg) ![Stato di manutenzione](https://ci-apps.yunohost.org/ci/badges/outline.maintain.svg) + +[![Installa Outline con YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=outline) + +*[Leggi questo README in altre lingue.](./ALL_README.md)* + +> *Questo pacchetto ti permette di installare Outline su un server YunoHost in modo semplice e veloce.* +> *Se non hai YunoHost, consulta [la guida](https://yunohost.org/install) per imparare a installarlo.* + +## Panoramica + +Outline is a wiki and knowledge base for growing teams. Beautiful, feature rich, and markdown compatible. + +### Features + +- Fully working installation of Outline wiki +- Including a Dex server to connect to YunoHost's LDAP userbase using an OIDC auth flow +- Using Yunohost's built-in SMTP server for notifications + + +**Versione pubblicata:** 0.75.0~ynh1 + +**Prova:** + +## Screenshot + +![Screenshot di Outline](./doc/screenshots/screenshot.png) + +## :red_circle: Anti-funzionalità + +- **Applicazione con licenza parzialmente libera**: Quest’applicazione è protetta da licenza generalmente libera, ma con delle clausole che potrebbero limitare il suo utilizzo. + +## Documentazione e risorse + +- Sito web ufficiale dell’app: +- Documentazione ufficiale per gli utenti: +- Documentazione ufficiale per gli amministratori: +- Repository upstream del codice dell’app: +- Store di YunoHost: +- Segnala un problema: + +## Informazioni per sviluppatori + +Si prega di inviare la tua pull request alla [branch di `testing`](https://github.com/YunoHost-Apps/outline_ynh/tree/testing). + +Per provare la branch di `testing`, si prega di procedere in questo modo: + +```bash +sudo yunohost app install https://github.com/YunoHost-Apps/outline_ynh/tree/testing --debug +o +sudo yunohost app upgrade outline -u https://github.com/YunoHost-Apps/outline_ynh/tree/testing --debug +``` + +**Maggiori informazioni riguardo il pacchetto di quest’app:** diff --git a/manifest.toml b/manifest.toml index 3e3eeae..b5b5c63 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.75.0~ynh2" +version = "0.76.1~ynh1" maintainers = ["Raoul de Limezy"] @@ -55,8 +55,8 @@ ram.runtime = "50M" [resources] [resources.sources.main] - url = "https://github.com/outline/outline/archive/2c9b01391fa12ebfd65dc01ec33bbb4941ef23bf.zip" - sha256 = "1bf8ef7fdac470ed0faeefd9575ffbac1f12d623e89d9ee244b2f83788d92933" + url = "https://github.com/outline/outline/archive/86abd274b0865a4453bd5245392a0a042e68931b.zip" + sha256 = "65cd3b1d4420cd4ae1f50345b45c89ede2d75b377576cdc6d2db48d5f24c6c4c" [resources.system_user] allow_email = true 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/scripts/upgrade b/scripts/upgrade index ed2ce02..e460679 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -58,7 +58,7 @@ then ynh_script_progression --message="Don't forget to remove MinIO app if you don't use it !" db_name=$(ynh_sanitize_dbid --db_name=$app) - ynh_psql_execute_as_root --sql="CREATE EXTENSION IF NOT EXISTS uuid-ossp;" --database=$db_name + ynh_psql_execute_as_root --sql="CREATE EXTENSION IF NOT EXISTS "uuid-ossp";" --database=$db_name else ynh_script_progression --message="No migration to be done" fi diff --git a/sources/patches/diff.txt b/sources/patches/diff.txt deleted file mode 100644 index f781b63..0000000 --- a/sources/patches/diff.txt +++ /dev/null @@ -1,371 +0,0 @@ -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 && ( -