From 423b36842faff20824a610f2639a6529dff52daa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Thu, 25 Aug 2022 17:12:56 +0200 Subject: [PATCH 1/4] Update manifest.json --- manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index 0cec0ce..637a0a6 100644 --- a/manifest.json +++ b/manifest.json @@ -19,7 +19,7 @@ "email": "rafi59_dev@srvmaison.fr.nf" }, "requirements": { - "yunohost": ">= 4.2.4" + "yunohost": ">= 11.0.9" }, "multi_instance": false, "services": [ From 2d02ae1094a0bf25f8aa08e92d92975962f64189 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Thu, 25 Aug 2022 15:12:58 +0000 Subject: [PATCH 2/4] Auto-update README --- README.md | 18 +++++++++--------- README_fr.md | 26 +++++++++++++++----------- 2 files changed, 24 insertions(+), 20 deletions(-) diff --git a/README.md b/README.md index 6498ffc..e4f2678 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ It shall NOT be edited by hand. # Collabora Online for YunoHost -[![Integration level](https://dash.yunohost.org/integration/collabora.svg)](https://dash.yunohost.org/appci/app/collabora) ![](https://ci-apps.yunohost.org/ci/badges/collabora.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/collabora.maintain.svg) +[![Integration level](https://dash.yunohost.org/integration/collabora.svg)](https://dash.yunohost.org/appci/app/collabora) ![Working status](https://ci-apps.yunohost.org/ci/badges/collabora.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/collabora.maintain.svg) [![Install Collabora Online with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=collabora) *[Lire ce readme en français.](./README_fr.md)* @@ -31,10 +31,9 @@ Collabora Online is a powerful LibreOffice-based online office that supports all **Shipped version:** 21.11.4.1~ynh1 - ## Screenshots -![](./doc/screenshots/Collabora_Online_-_versions_integration.png) +![Screenshot of Collabora Online](./doc/screenshots/Collabora_Online_-_versions_integration.png) ## Disclaimers / important information @@ -62,20 +61,21 @@ If you want to connect with Nextcloud, you have to install the [Collabora Online ## Documentation and resources -* Official app website: https://collaboraoffice.com -* Official admin documentation: https://www.collaboraoffice.com/code/ -* YunoHost documentation for this app: https://yunohost.org/app_collabora -* Report a bug: https://github.com/YunoHost-Apps/collabora_ynh/issues +* Official app website: +* Official admin documentation: +* YunoHost documentation for this app: +* Report a bug: ## Developer info Please send your pull request to the [testing branch](https://github.com/YunoHost-Apps/collabora_ynh/tree/testing). To try the testing branch, please proceed like that. -``` + +``` bash sudo yunohost app install https://github.com/YunoHost-Apps/collabora_ynh/tree/testing --debug or sudo yunohost app upgrade collabora -u https://github.com/YunoHost-Apps/collabora_ynh/tree/testing --debug ``` -**More info regarding app packaging:** https://yunohost.org/packaging_apps \ No newline at end of file +**More info regarding app packaging:** diff --git a/README_fr.md b/README_fr.md index 44c837f..966d00e 100644 --- a/README_fr.md +++ b/README_fr.md @@ -1,10 +1,14 @@ + + # Collabora Online pour YunoHost -[![Niveau d'intégration](https://dash.yunohost.org/integration/collabora.svg)](https://dash.yunohost.org/appci/app/collabora) ![](https://ci-apps.yunohost.org/ci/badges/collabora.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/collabora.maintain.svg) +[![Niveau d'intégration](https://dash.yunohost.org/integration/collabora.svg)](https://dash.yunohost.org/appci/app/collabora) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/collabora.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/collabora.maintain.svg) [![Installer Collabora Online avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=collabora) *[Read this readme in english.](./README.md)* -*[Lire ce readme en français.](./README_fr.md)* > *Ce package vous permet d'installer Collabora Online 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.* @@ -23,13 +27,12 @@ Collabora Online est une suite bureautique en ligne open source basé sur LibreO - des tableurs (ods, xlsx, xls…) - présentations (odp, pptx, ppt…) -**Version incluse :** 21.11.4.1~ynh1 - +**Version incluse :** 21.11.4.1~ynh1 ## Captures d'écran -![](./doc/screenshots/Collabora_Online_-_versions_integration.png) +![Capture d'écran de Collabora Online](./doc/screenshots/Collabora_Online_-_versions_integration.png) ## Avertissements / informations importantes @@ -57,20 +60,21 @@ Si vous souhaitez vous connecter à Nextcloud, vous devez installer l'applicatio ## Documentations et ressources -* Site officiel de l'app : https://collaboraoffice.com -* Documentation officielle de l'admin : https://www.collaboraoffice.com/code/ -* Documentation YunoHost pour cette app : https://yunohost.org/app_collabora -* Signaler un bug : https://github.com/YunoHost-Apps/collabora_ynh/issues +* Site officiel de l'app : +* Documentation officielle de l'admin : +* Documentation YunoHost pour cette app : +* Signaler un bug : ## Informations pour les développeurs Merci de faire vos pull request sur la [branche testing](https://github.com/YunoHost-Apps/collabora_ynh/tree/testing). Pour essayer la branche testing, procédez comme suit. -``` + +``` bash sudo yunohost app install https://github.com/YunoHost-Apps/collabora_ynh/tree/testing --debug ou sudo yunohost app upgrade collabora -u https://github.com/YunoHost-Apps/collabora_ynh/tree/testing --debug ``` -**Plus d'infos sur le packaging d'applications :** https://yunohost.org/packaging_apps \ No newline at end of file +**Plus d'infos sur le packaging d'applications :** From a096e02478f56cb2ea8d2d41b0b6c6bafa05db29 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Fri, 21 Oct 2022 10:31:07 +0200 Subject: [PATCH 3/4] Update manifest.json --- manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index 637a0a6..279fc19 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "LibreOffice-based online office suite with collaborative editing", "fr": "Suite office en ligne et collaborative, basée sur LibreOffice" }, - "version": "21.11.4.1~ynh1", + "version": "22.05.6.3~ynh1", "url": "https://collaboraoffice.com", "upstream": { "license": "MPL-2.0", From 4cbab74b4e05b35414b6c4b4d92da2c25f8235d9 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Fri, 21 Oct 2022 08:31:18 +0000 Subject: [PATCH 4/4] Auto-update README --- README.md | 2 +- README_fr.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 7676761..0e64593 100644 --- a/README.md +++ b/README.md @@ -28,7 +28,7 @@ Collabora Online is a powerful LibreOffice-based online office that supports all - presentations (odp, pptx, ppt…) -**Shipped version:** 21.11.4.1~ynh1 +**Shipped version:** 22.05.6.3~ynh1 ## Screenshots diff --git a/README_fr.md b/README_fr.md index 04963e7..02a4167 100644 --- a/README_fr.md +++ b/README_fr.md @@ -27,7 +27,7 @@ Collabora Online est une suite bureautique en ligne open source basé sur LibreO - des tableurs (ods, xlsx, xls…) - présentations (odp, pptx, ppt…) -**Version incluse :** 21.11.4.1~ynh1 +**Version incluse :** 22.05.6.3~ynh1 ## Captures d'écran