From 317f485564440be7fc11b76010e1f1c0d1055ca1 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Fri, 10 Sep 2021 23:28:04 +0200 Subject: [PATCH 1/6] Fix --- manifest.json | 5 ++--- scripts/install | 3 --- scripts/restore | 2 -- 3 files changed, 2 insertions(+), 8 deletions(-) diff --git a/manifest.json b/manifest.json index a951605..0bb0831 100644 --- a/manifest.json +++ b/manifest.json @@ -11,11 +11,10 @@ "license": "AGPL-3.0", "maintainer": { "name": "", - "email": "", - "url": "" + "email": "" }, "requirements": { - "yunohost": ">= 4.1.7" + "yunohost": ">= 4.2.4" }, "multi_instance": false, "services": [ diff --git a/scripts/install b/scripts/install index 7bda8f8..bdb3caf 100755 --- a/scripts/install +++ b/scripts/install @@ -66,7 +66,6 @@ ynh_script_progression --message="Configuring NGINX web server..." --weight=1 # Create a dedicated NGINX config ynh_add_nginx_config - #================================================= # SETUP SSOWAT #================================================= @@ -75,8 +74,6 @@ ynh_script_progression --message="Configuring permissions..." --weight=1 # Make app public if necessary if [ $is_public -eq 1 ] then - # Everyone can access the app. - # The "main" permission is automatically created before the install script. ynh_permission_update --permission="main" --add="visitors" fi #================================================= diff --git a/scripts/restore b/scripts/restore index 6d1b70d..f9558f0 100755 --- a/scripts/restore +++ b/scripts/restore @@ -33,8 +33,6 @@ final_path=$(ynh_app_setting_get --app=$app --key=final_path) #================================================= ynh_script_progression --message="Validating restoration parameters..." --weight=2 -ynh_webpath_available --domain=$domain --path_url=$path_url \ - || ynh_die --message="Path not available: ${domain}${path_url}" test ! -d $final_path \ || ynh_die --message="There is already a directory: $final_path " From 48469a640fd2b12b19217106ac491e257a1b6e4a Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sun, 14 Nov 2021 23:35:47 +0100 Subject: [PATCH 2/6] Cleaning up --- manifest.json | 3 +-- scripts/_common.sh | 3 --- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/manifest.json b/manifest.json index 0bb0831..b19bb63 100644 --- a/manifest.json +++ b/manifest.json @@ -24,8 +24,7 @@ "install" : [ { "name": "domain", - "type": "domain", - "example": "example.com" + "type": "domain" }, { "name": "path", diff --git a/scripts/_common.sh b/scripts/_common.sh index 7e55ac0..944a65e 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -4,9 +4,6 @@ # COMMON VARIABLES #================================================= -# dependencies used by the app -pkg_dependencies="deb1 deb2 php$YNH_DEFAULT_PHP_VERSION-deb1 php$YNH_DEFAULT_PHP_VERSION-deb2" - #================================================= # PERSONAL HELPERS #================================================= From 340efd755c99add5262438ae331da9e0fead5fb4 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Tue, 4 Jan 2022 22:44:45 +0100 Subject: [PATCH 3/6] Update 4.3 --- conf/nginx.conf | 5 ----- manifest.json | 2 +- scripts/restore | 3 +-- 3 files changed, 2 insertions(+), 8 deletions(-) diff --git a/conf/nginx.conf b/conf/nginx.conf index 052c370..508fc0a 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -4,11 +4,6 @@ location __PATH__/ { # Path to source alias __FINALPATH__/ ; - # Force usage of https - if ($scheme = http) { - rewrite ^ https://$server_name$request_uri? permanent; - } - # Include SSOWAT user panel. include conf.d/yunohost_panel.conf.inc; } diff --git a/manifest.json b/manifest.json index b19bb63..0f1f675 100644 --- a/manifest.json +++ b/manifest.json @@ -14,7 +14,7 @@ "email": "" }, "requirements": { - "yunohost": ">= 4.2.4" + "yunohost": ">= 4.3.0" }, "multi_instance": false, "services": [ diff --git a/scripts/restore b/scripts/restore index f9558f0..3fbf90b 100755 --- a/scripts/restore +++ b/scripts/restore @@ -33,8 +33,7 @@ final_path=$(ynh_app_setting_get --app=$app --key=final_path) #================================================= ynh_script_progression --message="Validating restoration parameters..." --weight=2 -test ! -d $final_path \ - || ynh_die --message="There is already a directory: $final_path " +test ! -d $final_path || ynh_die --message="There is already a directory: $final_path " #================================================= # STANDARD RESTORATION STEPS From 6d7d2a4fc3bbd747a7a48d607ef00adcf2c17430 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Fri, 13 Jan 2023 19:21:59 +0100 Subject: [PATCH 4/6] Update manifest.json --- manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index 0f1f675..994435f 100644 --- a/manifest.json +++ b/manifest.json @@ -14,7 +14,7 @@ "email": "" }, "requirements": { - "yunohost": ">= 4.3.0" + "yunohost": ">= 11.0.9" }, "multi_instance": false, "services": [ From a7b68820b423d55240a8cd48cca604f04eea7fba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Fri, 13 Jan 2023 19:26:40 +0100 Subject: [PATCH 5/6] Fix linter --- doc/DESCRIPTION.md | 1 + doc/DESCRIPTION_fr.md | 1 + .../screenshots}/mindmaps-screenshot.jpg | Bin manifest.json | 6 ++++++ 4 files changed, 8 insertions(+) create mode 100644 doc/DESCRIPTION.md create mode 100644 doc/DESCRIPTION_fr.md rename {sources => doc/screenshots}/mindmaps-screenshot.jpg (100%) diff --git a/doc/DESCRIPTION.md b/doc/DESCRIPTION.md new file mode 100644 index 0000000..a761690 --- /dev/null +++ b/doc/DESCRIPTION.md @@ -0,0 +1 @@ +Mindmaps is a HTML5 based mind mapping application. It lets you create neat looking mind maps in the browser. diff --git a/doc/DESCRIPTION_fr.md b/doc/DESCRIPTION_fr.md new file mode 100644 index 0000000..6d8af99 --- /dev/null +++ b/doc/DESCRIPTION_fr.md @@ -0,0 +1 @@ +Mindmaps est une application de mind mapping basée sur HTML5. Il vous permet de créer des cartes mentales soignées dans le navigateur. \ No newline at end of file diff --git a/sources/mindmaps-screenshot.jpg b/doc/screenshots/mindmaps-screenshot.jpg similarity index 100% rename from sources/mindmaps-screenshot.jpg rename to doc/screenshots/mindmaps-screenshot.jpg diff --git a/manifest.json b/manifest.json index 994435f..905053f 100644 --- a/manifest.json +++ b/manifest.json @@ -8,6 +8,12 @@ }, "version": "0.0.20201010~ynh2", "url": "https://www.mindmaps.app/", + "upstream": { + "license": "AGPL-3.0", + "website": "https://www.mindmaps.app/", + "demo": "https://www.mindmaps.app/", + "code": "https://github.com/drichard/mindmaps" + }, "license": "AGPL-3.0", "maintainer": { "name": "", From 6e95114bca9485a02ddab3d34ebc369a4681d502 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Fri, 13 Jan 2023 18:26:44 +0000 Subject: [PATCH 6/6] Auto-update README --- README.md | 63 +++++++++++++++++----------------------------- README_fr.md | 70 +++++++++++++++++++--------------------------------- 2 files changed, 47 insertions(+), 86 deletions(-) diff --git a/README.md b/README.md index 6e5fbdc..a4354ce 100644 --- a/README.md +++ b/README.md @@ -1,67 +1,48 @@ + + # Mindmaps for YunoHost -[![Integration level](https://dash.yunohost.org/integration/mindmaps.svg)](https://dash.yunohost.org/appci/app/mindmaps) ![](https://ci-apps.yunohost.org/ci/badges/mindmaps.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/mindmaps.maintain.svg) +[![Integration level](https://dash.yunohost.org/integration/mindmaps.svg)](https://dash.yunohost.org/appci/app/mindmaps) ![Working status](https://ci-apps.yunohost.org/ci/badges/mindmaps.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/mindmaps.maintain.svg) [![Install Mindmaps with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=mindmaps) *[Lire ce readme en français.](./README_fr.md)* -> *This package allows you to install Mindmaps quickly and simply on a YunoHost server. +> *This package allows you to install Mindmaps 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 + Mindmaps is a HTML5 based mind mapping application. It lets you create neat looking mind maps in the browser. -**Shipped version:** 20201010 + +**Shipped version:** 0.0.20201010~ynh2 + +**Demo:** https://www.mindmaps.app/ ## Screenshots -![](sources/mindmaps-screenshot.jpg) +![Screenshot of Mindmaps](./doc/screenshots/mindmaps-screenshot.jpg) -## Demo +## Documentation and resources -* [Official demo](https://www.mindmaps.app/) - -## Documentation - - * Official documentation: Link to the official documentation of this app - * YunoHost documentation: https://yunohost.org/en/app_mindmaps - -## YunoHost specific features - -#### Multi-user support - - * Are LDAP and HTTP auth supported? **No** - * Can the app be used by multiple users? **Yes** - -#### Supported architectures - -* x86-64 - [![Build Status](https://ci-apps.yunohost.org/ci/logs/mindmaps.svg)](https://ci-apps.yunohost.org/ci/apps/mindmaps/) -* ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/mindmaps.svg)](https://ci-apps-arm.yunohost.org/ci/apps/mindmaps/) - -## Limitations - -* Any known limitations. - -## Additional information - -* Other info you would like to add about this app. - -## Links - - * Report a bug: https://github.com/YunoHost-Apps/mindmaps_ynh/issues - * App website: https://www.mindmaps.app/ - * Upstream app repository: https://github.com/drichard/mindmaps - * YunoHost website: https://yunohost.org/ - ---- +* Official app website: +* Upstream app code repository: +* YunoHost documentation for this app: +* Report a bug: ## Developer info Please send your pull request to the [testing branch](https://github.com/YunoHost-Apps/mindmaps_ynh/tree/testing). To try the testing branch, please proceed like that. -``` + +``` bash sudo yunohost app install https://github.com/YunoHost-Apps/mindmaps_ynh/tree/testing --debug or sudo yunohost app upgrade mindmaps -u https://github.com/YunoHost-Apps/mindmaps_ynh/tree/testing --debug ``` + +**More info regarding app packaging:** diff --git a/README_fr.md b/README_fr.md index a0049e8..64ee8b3 100644 --- a/README_fr.md +++ b/README_fr.md @@ -1,67 +1,47 @@ + + # Mindmaps pour YunoHost -[![Integration level](https://dash.yunohost.org/integration/mindmaps.svg)](https://dash.yunohost.org/appci/app/mindmaps) ![](https://ci-apps.yunohost.org/ci/badges/mindmaps.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/mindmaps.maintain.svg) +[![Niveau d'intégration](https://dash.yunohost.org/integration/mindmaps.svg)](https://dash.yunohost.org/appci/app/mindmaps) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/mindmaps.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/mindmaps.maintain.svg) [![Installer Mindmaps avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=mindmaps) -*[Read this readme in english.](./README.md)* +*[Read this readme in english.](./README.md)* -> *Ce package vous permet d’installer Mindmaps 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 Mindmaps 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.* + +## Vue d'ensemble -## Vue d’ensemble Mindmaps est une application de mind mapping basée sur HTML5. Il vous permet de créer des cartes mentales soignées dans le navigateur. -**Shipped version:** 20201010 +**Version incluse :** 0.0.20201010~ynh2 -## Captures d’écran +**Démo :** https://www.mindmaps.app/ -![](sources/mindmaps-screenshot.jpg) +## Captures d'écran -## Démo +![Capture d'écran de Mindmaps](./doc/screenshots/mindmaps-screenshot.jpg) -* [Démo officielle](https://www.mindmaps.app/) +## Documentations et ressources -## Documentation - - * Documentation officielle : Lien vers la documentation officielle de cette application. - * Documentation YunoHost : https://yunohost.org/fr/app_mindmaps - -## Caractéristiques spécifiques YunoHost - -#### Support multi-utilisateur - -* L'authentification LDAP et HTTP est-elle prise en charge ? **Non** -* L'application peut-elle être utilisée par plusieurs utilisateurs ? **Oui** - -#### Architectures supportées - -* x86-64 - [![Build Status](https://ci-apps.yunohost.org/ci/logs/mindmaps.svg)](https://ci-apps.yunohost.org/ci/apps/mindmaps/) -* ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/mindmaps.svg)](https://ci-apps-arm.yunohost.org/ci/apps/mindmaps/) - -## Limitations - -* Limitations connues. - -## Informations additionnelles - -* Autres informations que vous souhaitez ajouter sur cette application. - -## Liens - - * Signaler un bug : https://github.com/YunoHost-Apps/mindmaps_ynh/issues - * Site de l'application : https://www.mindmaps.app/ - * Dépôt de l'application principale : https://github.com/drichard/mindmaps - * Site web YunoHost : https://yunohost.org/ - ---- +* Site officiel de l'app : +* Dépôt de code officiel de l'app : +* 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/mindmaps_ynh/tree/testing). Pour essayer la branche testing, procédez comme suit. -``` + +``` bash sudo yunohost app install https://github.com/YunoHost-Apps/mindmaps_ynh/tree/testing --debug -or +ou sudo yunohost app upgrade mindmaps -u https://github.com/YunoHost-Apps/mindmaps_ynh/tree/testing --debug ``` + +**Plus d'infos sur le packaging d'applications :**