From 136eca6091f3c892818b8fdb3e3e9690dfc577bb Mon Sep 17 00:00:00 2001 From: Yunohost-Bot <> Date: Sat, 28 Aug 2021 17:31:19 +0000 Subject: [PATCH 1/5] Auto-update README --- README.md | 4 ++-- README_fr.md | 23 +++++++++++------------ 2 files changed, 13 insertions(+), 14 deletions(-) diff --git a/README.md b/README.md index 95610df..368b663 100644 --- a/README.md +++ b/README.md @@ -26,7 +26,7 @@ The IFM is a web-based filemanager, which comes as a single file solution using - extract archives (tar, tgz, tar.gz, tar.bz2, zip) - change permissions - image preview -- simple authentication (LDAP via ldap_bind possible) +- simple authentication (LDAP via `ldap_bind` possible) **Shipped version:** 2.6.3~ynh1 @@ -39,7 +39,7 @@ The IFM is a web-based filemanager, which comes as a single file solution using ## Disclaimers / important information -The IFM is usually locked to it's own directory (`/home/yunohost.app.ifm`), so you are not able to go above. You can change that by setting `env[IFM_ROOT_DIR] = /home/yunohost.app.ifm` in the PHP config `/etc/php/7.3/fpm/pool.d/ifm.conf` L.434 with this [documentation](https://github.com/misterunknown/ifm/wiki/Configuration). +The IFM is usually locked to it's own directory (`/home/yunohost.app.ifm`), so you are not able to go above. You can change that by setting `env[IFM_ROOT_DIR] = /home/yunohost.app.ifm` in the PHP config `/etc/php/7.3/fpm/pool.d/ifm.conf` L.434 with the help of this [documentation](https://github.com/misterunknown/ifm/wiki/Configuration). ## Documentation and resources * Official app website: https://github.com/misterunknown/ifm diff --git a/README_fr.md b/README_fr.md index 97ec1c6..225369c 100644 --- a/README_fr.md +++ b/README_fr.md @@ -11,19 +11,18 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour ## Vue d'ensemble -The IFM is a web-based filemanager, which comes as a single file solution using HTML5, CSS3, JavaScript and PHP. +L'IFM est un gestionnaire de fichiers basé sur le Web, qui se présente sous la forme d'un fichier unique utilisant HTML5, CSS3, JavaScript et PHP. -### features - -- create/edit files and directories -- copy/move files and directories -- download files and directories -- upload files directly, remotely via URL or per drag & drop -- extract archives (tar, tgz, tar.gz, tar.bz2, zip) -- change permissions -- image preview -- simple authentication (LDAP via ldap_bind possible) +### caractéristiques +- créer/éditer des fichiers et des répertoires +- copier/déplacer des fichiers et des répertoires +- télécharger des fichiers et des répertoires +- télécharger des fichiers directement, à distance via URL ou par glisser-déposer +- extraire les archives (tar, tgz, tar.gz, tar.bz2, zip) +- modifier les autorisations +- aperçu de l'image +- authentification simple (LDAP via `ldap_bind` possible) **Version incluse :** 2.6.3~ynh1 @@ -35,7 +34,7 @@ The IFM is a web-based filemanager, which comes as a single file solution using ## Avertissements / informations importantes -The IFM is usually locked to it's own directory (`/home/yunohost.app.ifm`), so you are not able to go above. You can change that by setting `env[IFM_ROOT_DIR] = /home/yunohost.app.ifm` in the PHP config `/etc/php/7.3/fpm/pool.d/ifm.conf` L.434 with this [documentation](https://github.com/misterunknown/ifm/wiki/Configuration). +L'IFM est généralement verrouillé dans son propre répertoire (`/home/yunohost.app.ifm`), vous ne pouvez donc pas aller sur d'autres répertoires. Vous pouvez changer cela en définissant `env[IFM_ROOT_DIR] = /home/yunohost.app.ifm` dans la configuration PHP `/etc/php/7.3/fpm/pool.d/ifm.conf` L.434 en vous aidant de cette [documentation](https://github.com/misterunknown/ifm/wiki/Configuration). ## Documentations et ressources * Site officiel de l'app : https://github.com/misterunknown/ifm From ce6c47d4a5d32c255f6160d64efac3095f02753d Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sat, 28 Aug 2021 19:38:33 +0200 Subject: [PATCH 2/5] Fix --- doc/DISCLAIMER.md | 2 +- doc/DISCLAIMER_fr.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/DISCLAIMER.md b/doc/DISCLAIMER.md index eeef566..cc20e08 100644 --- a/doc/DISCLAIMER.md +++ b/doc/DISCLAIMER.md @@ -1 +1 @@ -The IFM is usually locked to it's own directory (`/home/yunohost.app.ifm`), so you are not able to go above. You can change that by setting `env[IFM_ROOT_DIR] = /home/yunohost.app.ifm` in the PHP config `/etc/php/7.3/fpm/pool.d/ifm.conf` L.434 with the help of this [documentation](https://github.com/misterunknown/ifm/wiki/Configuration). \ No newline at end of file +The IFM is usually locked to it's own directory (`/home/yunohost.app/ifm`), so you are not able to go above. You can change that by setting `env[IFM_ROOT_DIR] = /home/yunohost.app/ifm` in the PHP config `/etc/php/7.3/fpm/pool.d/ifm.conf` L.434 with the help of this [documentation](https://github.com/misterunknown/ifm/wiki/Configuration). \ No newline at end of file diff --git a/doc/DISCLAIMER_fr.md b/doc/DISCLAIMER_fr.md index 88bf710..250a09b 100644 --- a/doc/DISCLAIMER_fr.md +++ b/doc/DISCLAIMER_fr.md @@ -1 +1 @@ -L'IFM est généralement verrouillé dans son propre répertoire (`/home/yunohost.app.ifm`), vous ne pouvez donc pas aller sur d'autres répertoires. Vous pouvez changer cela en définissant `env[IFM_ROOT_DIR] = /home/yunohost.app.ifm` dans la configuration PHP `/etc/php/7.3/fpm/pool.d/ifm.conf` L.434 en vous aidant de cette [documentation](https://github.com/misterunknown/ifm/wiki/Configuration). \ No newline at end of file +L'IFM est généralement verrouillé dans son propre répertoire (`/home/yunohost.app/ifm`), vous ne pouvez donc pas aller sur d'autres répertoires. Vous pouvez changer cela en définissant `env[IFM_ROOT_DIR] = /home/yunohost.app/ifm` dans la configuration PHP `/etc/php/7.3/fpm/pool.d/ifm.conf` L.434 en vous aidant de cette [documentation](https://github.com/misterunknown/ifm/wiki/Configuration). \ No newline at end of file From 96913ed8652ea4721ed3cc90e42822bff003559f Mon Sep 17 00:00:00 2001 From: Yunohost-Bot <> Date: Sat, 28 Aug 2021 17:38:40 +0000 Subject: [PATCH 3/5] 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 368b663..b7cb664 100644 --- a/README.md +++ b/README.md @@ -39,7 +39,7 @@ The IFM is a web-based filemanager, which comes as a single file solution using ## Disclaimers / important information -The IFM is usually locked to it's own directory (`/home/yunohost.app.ifm`), so you are not able to go above. You can change that by setting `env[IFM_ROOT_DIR] = /home/yunohost.app.ifm` in the PHP config `/etc/php/7.3/fpm/pool.d/ifm.conf` L.434 with the help of this [documentation](https://github.com/misterunknown/ifm/wiki/Configuration). +The IFM is usually locked to it's own directory (`/home/yunohost.app/ifm`), so you are not able to go above. You can change that by setting `env[IFM_ROOT_DIR] = /home/yunohost.app/ifm` in the PHP config `/etc/php/7.3/fpm/pool.d/ifm.conf` L.434 with the help of this [documentation](https://github.com/misterunknown/ifm/wiki/Configuration). ## Documentation and resources * Official app website: https://github.com/misterunknown/ifm diff --git a/README_fr.md b/README_fr.md index 225369c..089fe81 100644 --- a/README_fr.md +++ b/README_fr.md @@ -34,7 +34,7 @@ L'IFM est un gestionnaire de fichiers basé sur le Web, qui se présente sous la ## Avertissements / informations importantes -L'IFM est généralement verrouillé dans son propre répertoire (`/home/yunohost.app.ifm`), vous ne pouvez donc pas aller sur d'autres répertoires. Vous pouvez changer cela en définissant `env[IFM_ROOT_DIR] = /home/yunohost.app.ifm` dans la configuration PHP `/etc/php/7.3/fpm/pool.d/ifm.conf` L.434 en vous aidant de cette [documentation](https://github.com/misterunknown/ifm/wiki/Configuration). +L'IFM est généralement verrouillé dans son propre répertoire (`/home/yunohost.app/ifm`), vous ne pouvez donc pas aller sur d'autres répertoires. Vous pouvez changer cela en définissant `env[IFM_ROOT_DIR] = /home/yunohost.app/ifm` dans la configuration PHP `/etc/php/7.3/fpm/pool.d/ifm.conf` L.434 en vous aidant de cette [documentation](https://github.com/misterunknown/ifm/wiki/Configuration). ## Documentations et ressources * Site officiel de l'app : https://github.com/misterunknown/ifm From a042dc35ecb184f8e7443e104f140f894e9fd8bf Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sat, 28 Aug 2021 23:16:19 +0200 Subject: [PATCH 4/5] Update restore --- scripts/restore | 2 -- 1 file changed, 2 deletions(-) diff --git a/scripts/restore b/scripts/restore index 4d8ef9b..4d41443 100755 --- a/scripts/restore +++ b/scripts/restore @@ -35,8 +35,6 @@ datadir=$(ynh_app_setting_get --app=$app --key=datadir) #================================================= ynh_script_progression --message="Validating restoration parameters..." --weight=1 -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 4027edb7ef5a07a42c35d4963ffe76aa7f00f0a4 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sat, 28 Aug 2021 23:17:47 +0200 Subject: [PATCH 5/5] Update manifest.json --- manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index b06be1d..f7ea83f 100644 --- a/manifest.json +++ b/manifest.json @@ -20,7 +20,7 @@ "email": "" }, "requirements": { - "yunohost": ">= 4.2.8" + "yunohost": ">= 4.2.7" }, "multi_instance": true, "services": [