From 82194e82a72fd71b79736b3f080e30778867b37e Mon Sep 17 00:00:00 2001
From: Kay0u <pierre.moltess@gmail.com>
Date: Sat, 21 Mar 2020 01:38:11 +0100
Subject: [PATCH 01/30] Don't use parentheses

---
 scripts/upgrade | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/upgrade b/scripts/upgrade
index bcc8182..7d35478 100755
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -292,7 +292,7 @@ then
         # Upgrade Nextcloud (SUCCESS = 0, UP_TO_DATE = 3)
         exec_occ maintenance:mode --off
         exec_occ upgrade \
-        || ([ $? -eq 3 ] || ynh_die --message="Unable to upgrade Nextcloud")
+        || [ $? -eq 3 ] || ynh_die --message="Unable to upgrade Nextcloud"
 
         # Get the new current version number
         current_version=$(grep OC_VersionString "$final_path/version.php" | cut -d\' -f2)

From 5d0436199b1675b60d99d8d39ee2f1ac52f1df5f Mon Sep 17 00:00:00 2001
From: Kayou <pierre.moltess@gmail.com>
Date: Tue, 24 Mar 2020 20:56:04 +0100
Subject: [PATCH 02/30] fix caldav/carddav detection

---
 scripts/upgrade | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/scripts/upgrade b/scripts/upgrade
index bcc8182..0f0da06 100755
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -151,9 +151,11 @@ ynh_script_progression --message="Upgrading nginx web server configuration..." -
 ynh_backup_if_checksum_is_different --file="/etc/nginx/conf.d/$domain.d/$app.conf"
 
 # Delete current nginx configuration to be able to check if .well-known is already served.
-ynh_remove_nginx_config $YNH_PHP_VERSION
+ynh_remove_nginx_config
 ynh_app_setting_delete --app=$app --key="checksum__etc_nginx_conf.d_$domain.d_$app.conf"
 
+ynh_systemd_action --service_name=nginx --action=reload
+
 # Check if .well-known is available for this domain
 if is_url_handled --domain="$domain" --path="/.well-known/caldav" || is_url_handled --domain="$domain" --path="/.well-known/carddav"
 then

From 02554f94e5065a9a8c7d4e50d366a5f8f7eb4242 Mon Sep 17 00:00:00 2001
From: Kayou <pierre.moltess@gmail.com>
Date: Tue, 24 Mar 2020 21:13:51 +0100
Subject: [PATCH 03/30] Update _common.sh

---
 scripts/_common.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/scripts/_common.sh b/scripts/_common.sh
index 7b84705..47253f1 100644
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@@ -38,6 +38,9 @@ is_url_handled() {
     # Manage arguments with getopts
     ynh_handle_getopts_args "$@"
 
+    # Wait untils nginx has fully reloaded (avoid curl fail with http2)
+    sleep 2
+
     # Try to get the url with curl, and keep the http code and an eventual redirection url.
     local curl_output="$(curl --insecure --silent --output /dev/null \
       --write-out '%{http_code};%{redirect_url}' https://127.0.0.1$path --header "Host: $domain" --resolve $domain:443:127.0.0.1)"

From d1a2528c43d63760874256d57bca3670b789c39a Mon Sep 17 00:00:00 2001
From: Kay0u <pierre.moltess@gmail.com>
Date: Wed, 25 Mar 2020 01:22:21 +0100
Subject: [PATCH 04/30] Move sleep

---
 scripts/_common.sh | 3 ---
 scripts/upgrade    | 5 ++++-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/scripts/_common.sh b/scripts/_common.sh
index 47253f1..7b84705 100644
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@@ -38,9 +38,6 @@ is_url_handled() {
     # Manage arguments with getopts
     ynh_handle_getopts_args "$@"
 
-    # Wait untils nginx has fully reloaded (avoid curl fail with http2)
-    sleep 2
-
     # Try to get the url with curl, and keep the http code and an eventual redirection url.
     local curl_output="$(curl --insecure --silent --output /dev/null \
       --write-out '%{http_code};%{redirect_url}' https://127.0.0.1$path --header "Host: $domain" --resolve $domain:443:127.0.0.1)"
diff --git a/scripts/upgrade b/scripts/upgrade
index 0f0da06..9045c6f 100755
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -146,7 +146,7 @@ ynh_install_php --phpversion="$YNH_PHP_VERSION" --package="$extra_pkg_dependenci
 #=================================================
 # NGINX CONFIGURATION
 #=================================================
-ynh_script_progression --message="Upgrading nginx web server configuration..." --weight=2
+ynh_script_progression --message="Upgrading nginx web server configuration..." --weight=3
 
 ynh_backup_if_checksum_is_different --file="/etc/nginx/conf.d/$domain.d/$app.conf"
 
@@ -156,6 +156,9 @@ ynh_app_setting_delete --app=$app --key="checksum__etc_nginx_conf.d_$domain.d_$a
 
 ynh_systemd_action --service_name=nginx --action=reload
 
+# Wait untils nginx has fully reloaded
+sleep 1
+
 # Check if .well-known is available for this domain
 if is_url_handled --domain="$domain" --path="/.well-known/caldav" || is_url_handled --domain="$domain" --path="/.well-known/carddav"
 then

From 2d1e0c0c44ba8aecee8a85e46db4bd27484c97bc Mon Sep 17 00:00:00 2001
From: Kay0u <pierre.moltess@gmail.com>
Date: Wed, 25 Mar 2020 13:59:01 +0100
Subject: [PATCH 05/30] wait nginx

---
 scripts/upgrade | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/scripts/upgrade b/scripts/upgrade
index 9045c6f..95ba8fc 100755
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -146,7 +146,7 @@ ynh_install_php --phpversion="$YNH_PHP_VERSION" --package="$extra_pkg_dependenci
 #=================================================
 # NGINX CONFIGURATION
 #=================================================
-ynh_script_progression --message="Upgrading nginx web server configuration..." --weight=3
+ynh_script_progression --message="Upgrading nginx web server configuration..." --weight=2
 
 ynh_backup_if_checksum_is_different --file="/etc/nginx/conf.d/$domain.d/$app.conf"
 
@@ -154,10 +154,8 @@ ynh_backup_if_checksum_is_different --file="/etc/nginx/conf.d/$domain.d/$app.con
 ynh_remove_nginx_config
 ynh_app_setting_delete --app=$app --key="checksum__etc_nginx_conf.d_$domain.d_$app.conf"
 
-ynh_systemd_action --service_name=nginx --action=reload
-
 # Wait untils nginx has fully reloaded
-sleep 1
+ynh_systemd_action --service_name=nginx --action=reload --line_match="Reloaded" --log_path="systemd"
 
 # Check if .well-known is available for this domain
 if is_url_handled --domain="$domain" --path="/.well-known/caldav" || is_url_handled --domain="$domain" --path="/.well-known/carddav"

From 05977de8e1378a196c760eb259068e53026aead0 Mon Sep 17 00:00:00 2001
From: Maniack Crudelis <maniackc_dev@crudelis.fr>
Date: Sat, 28 Mar 2020 12:44:22 +0100
Subject: [PATCH 06/30] Add an action to disable maintenance mode

---
 actions.toml                        |  8 +++++
 scripts/actions/disable_maintenance | 52 +++++++++++++++++++++++++++++
 2 files changed, 60 insertions(+)
 create mode 100644 actions.toml
 create mode 100755 scripts/actions/disable_maintenance

diff --git a/actions.toml b/actions.toml
new file mode 100644
index 0000000..38c52a8
--- /dev/null
+++ b/actions.toml
@@ -0,0 +1,8 @@
+[disable_maintenance]
+name = "Disable the maintenance mode of Nextcloud"
+command = "/bin/bash scripts/actions/disable_maintenance"
+# user = "root"  # optional
+# cwd = "/" # optional
+# accepted_return_codes = [0, 1, 2, 3]  # optional
+accepted_return_codes = [0]
+description = "Disable the maintenance mode of Nextcloud if you're stuck after an upgrade"
diff --git a/scripts/actions/disable_maintenance b/scripts/actions/disable_maintenance
new file mode 100755
index 0000000..0c2c8b2
--- /dev/null
+++ b/scripts/actions/disable_maintenance
@@ -0,0 +1,52 @@
+#!/bin/bash
+
+#=================================================
+# GENERIC STARTING
+#=================================================
+# IMPORT GENERIC HELPERS
+#=================================================
+
+source scripts/_common.sh
+source /usr/share/yunohost/helpers
+
+#=================================================
+# RETRIEVE ARGUMENTS
+#=================================================
+
+app=${YNH_APP_INSTANCE_NAME:-$YNH_APP_ID}
+
+final_path=$(ynh_app_setting_get --app=$app --key=final_path)
+
+#=================================================
+# CHECK IF ARGUMENTS ARE CORRECT
+#=================================================
+
+#=================================================
+# CHECK IF AN ACTION HAS TO BE DONE
+#=================================================
+
+# Check the current status of the maintenance mode
+
+if [ "$(grep "maintenance" "$final_path/config/config.php" | awk '{print $3}' | cut -d',' -f1)" != "true" ]
+then
+    ynh_die --message="Nextcloud isn't currently under maintenance." --ret_code=0
+fi
+
+#=================================================
+# SPECIFIC ACTION
+#=================================================
+# DISABLE THE MAINTENANCE MODE
+#=================================================
+
+ynh_script_progression --message="Disabling maintenance mode..." --weight=3
+
+(
+cd "$final_path" && exec_as "$app" \
+    php$YNH_PHP_VERSION occ --no-interaction --no-ansi maintenance:mode --off
+)
+
+#=================================================
+# END OF SCRIPT
+#=================================================
+
+ynh_script_progression --message="Execution completed" --last

From 1f41e28254e293beb1d7a800370eeb852bafbf9e Mon Sep 17 00:00:00 2001
From: Jimmy Monin <jimmy@monin.net>
Date: Sat, 28 Mar 2020 14:23:26 +0100
Subject: [PATCH 07/30] Upgrade to upstream version 18.0.3

---
 README.md                         | 2 +-
 manifest.json                     | 2 +-
 scripts/upgrade.d/upgrade.last.sh | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index f0153fe..f6f7994 100644
--- a/README.md
+++ b/README.md
@@ -13,7 +13,7 @@ own data. A personal cloud which run on your own server. With Nextcloud
 you can synchronize your files over your devices.
 
 
-**Shipped version:** 18.0.2
+**Shipped version:** 18.0.3
 
 ## Screenshots
 
diff --git a/manifest.json b/manifest.json
index 9976a6e..5f79407 100644
--- a/manifest.json
+++ b/manifest.json
@@ -6,7 +6,7 @@
         "en": "Access & share your files, calendars, contacts, mail & more from any device, on your terms",
         "fr": "Consultez et partagez vos fichiers, agendas, carnets d'adresses, emails et bien plus depuis les appareils de votre choix, sous vos conditions"
     },
-    "version": "18.0.2~ynh1",
+    "version": "18.0.3~ynh1",
     "url": "https://nextcloud.com",
     "license": "AGPL-3.0",
     "maintainer": {
diff --git a/scripts/upgrade.d/upgrade.last.sh b/scripts/upgrade.d/upgrade.last.sh
index 24a1692..4da3883 100755
--- a/scripts/upgrade.d/upgrade.last.sh
+++ b/scripts/upgrade.d/upgrade.last.sh
@@ -1,10 +1,10 @@
 #!/bin/bash
 
 # Last available nextcloud version
-next_version="18.0.2"
+next_version="18.0.3"
 
 # Nextcloud tarball checksum sha256
-nextcloud_source_sha256="d033660923dd27106ec64bff0e3afa2f595bd1b9661b7ea7882a1a33006ecb81"
+nextcloud_source_sha256="7b67e709006230f90f95727f9fa92e8c73a9e93458b22103293120f9cb50fd72"
 
 # This function will only be executed upon applying the last upgrade referenced above
 last_upgrade_operations () {

From 9b7b2e766213d85104e59090cb5ad0fb5b9052bf Mon Sep 17 00:00:00 2001
From: Maniack Crudelis <maniackcrudelis@users.noreply.github.com>
Date: Sun, 29 Mar 2020 13:49:09 +0200
Subject: [PATCH 08/30] Update README.md

---
 README.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index f0153fe..0f3fcc1 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # Nextcloud for YunoHost
 
-[![Integration level](https://dash.yunohost.org/integration/nextcloud.svg)](https://dash.yunohost.org/appci/app/nextcloud)  
+[![Integration level](https://dash.yunohost.org/integration/nextcloud.svg)](https://dash.yunohost.org/appci/app/nextcloud) ![](https://ci-apps.yunohost.org/ci/badges/nextcloud.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/nextcloud.maintain.svg)  
 [![Install Nextcloud with YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=nextcloud)
 
 > *This package allow you to install Nextcloud quickly and simply on a YunoHost server.  
@@ -36,13 +36,13 @@ you can synchronize your files over your devices.
 In addition to Nextcloud core features, the following are made available with
 this package:
 
- * Integrate with YunoHost users and SSO - i.e. logout button
+ * Integrate with YunoHost users and SSO - i.e logout button
  * Allow one user to be the administrator (set at the installation)
  * Allow multiple instances of this application
  * Optionally access the user home folder from Nextcloud files (set at the
    installation, the sharing is enabled by default)
  * Serve `/.well-known` paths for CalDAV and CardDAV on the domain only if it's
-   not already served - i.e. by Baïkal
+   not already served - i.e by Baïkal
 
 #### Multi-users support
 

From 31ae53dc0e72d735df337996da6522178c44ad25 Mon Sep 17 00:00:00 2001
From: lapineige <lapineige@users.noreply.github.com>
Date: Sun, 29 Mar 2020 17:54:49 +0200
Subject: [PATCH 09/30] Documentation link + how to use occ command

- Add a link to Nextcloud documentation
- Explain how to use occ command with Yunohost config
---
 README.md | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/README.md b/README.md
index 0f3fcc1..a5e3778 100644
--- a/README.md
+++ b/README.md
@@ -68,6 +68,14 @@ Following symlinks is not allowed ('/home/yunohost.multimedia/user/Share' -> '/h
 
 ## Additionnal informations
 
+#### `occ` command usage
+
+If you need/want to use Nextcloud `occ` command¹, you need to be in `/var/www/nextcloud/` folder, then use `sudo -u nextcloud php7.3 occ` instead of `occ` (as an alternative, you can use `/var/www/nextcloud/occ` to run the command from another directory).
+
+*NB: you may need to adapt `php7.3` to the php version that Nextcloud is using. Since Nextcloud 18 Yunohost use php7.3, before it was php7.0.*
+
+¹ See https://docs.nextcloud.com/server/18/admin_manual/configuration_server/occ_command.html. Use this only if you know what you're doing :)
+
 #### Migrate from ownCloud
 
 **This is not considered as stable yet, please do it with care and only for
@@ -104,6 +112,7 @@ sudo yunohost app ssowatconf
 
  * Report a bug: https://github.com/YunoHost-Apps/nextcloud_ynh/issues
  * Nextcloud website: https://nextcloud.com/
+ * Nextcloud documentation:  https://docs.nextcloud.com/
  * Nextcloud repository: https://github.com/nextcloud/server
  * YunoHost website: https://yunohost.org/
 

From fb648fc9cf436b98ea95859aab2942b429709961 Mon Sep 17 00:00:00 2001
From: Maniack Crudelis <maniackcrudelis@users.noreply.github.com>
Date: Wed, 1 Apr 2020 17:38:30 +0200
Subject: [PATCH 10/30] Fix nginx conf

---
 conf/nginx.conf | 30 ++++++++++++++++++------------
 1 file changed, 18 insertions(+), 12 deletions(-)

diff --git a/conf/nginx.conf b/conf/nginx.conf
index 8f2b3fb..c4b73e1 100644
--- a/conf/nginx.conf
+++ b/conf/nginx.conf
@@ -4,18 +4,24 @@ location = /.well-known/carddav {
 location = /.well-known/caldav {
   return 301 https://$server_name__PATH__/remote.php/dav;
 }
-location = /.well-known/host-meta {
-  return 301 $scheme://$host:$server_port__PATH__/public.php?service=host-meta;
-}
-location = /.well-known/host-meta.json {
-  return 301 $scheme://$host:$server_port__PATH__/public.php?service=host-meta-json;
-}
-location = /.well-known/webfinger {
-  return 301 $scheme://$host:$server_port__PATH__/public.php?service=webfinger;
-}
-location = /.well-known/nodeinfo {
-  return 301 $scheme://$host:$server_port__PATH__/public.php?service=nodeinfo;
-}
+
+# The following 2 rules are only needed for the user_webfinger app.
+# Uncomment it if you're planning to use this app.
+#location = /.well-known/host-meta {
+#  return 301 $scheme://$host:$server_port__PATH__/public.php?service=host-meta;
+#}
+#location = /.well-known/host-meta.json {
+#  return 301 $scheme://$host:$server_port__PATH__/public.php?service=host-meta-json;
+#}
+
+# The following 2 rules are only needed for the Social app.
+# Uncomment it if you're planning to use this app.
+#location = /.well-known/webfinger {
+#  return 301 $scheme://$host:$server_port__PATH__/public.php?service=webfinger;
+#}
+#location = /.well-known/nodeinfo {
+#  return 301 $scheme://$host:$server_port__PATH__/public.php?service=nodeinfo;
+#}
 
 #sub_path_only rewrite ^__PATH__$ __PATH__/ permanent;
 location ^~ __PATH__/ {

From 51dfabee8ba04108789e04198a6eca5f1782566a Mon Sep 17 00:00:00 2001
From: Maniack Crudelis <maniackcrudelis@users.noreply.github.com>
Date: Thu, 16 Apr 2020 01:54:00 +0200
Subject: [PATCH 11/30] Update config.json

---
 conf/config.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/conf/config.json b/conf/config.json
index 2e7aca8..7d24587 100644
--- a/conf/config.json
+++ b/conf/config.json
@@ -10,7 +10,8 @@
       "port": "6379",
       "timeout": "0.0",
       "password": ""
-     }
+     },
+    "hashing_default_password": true
   },
   "apps": {
     "user_ldap": {

From a60ddbf573c8c431a1c001783ecaf7f46497c759 Mon Sep 17 00:00:00 2001
From: lapineige <lapineige@users.noreply.github.com>
Date: Fri, 17 Apr 2020 09:54:11 +0200
Subject: [PATCH 12/30] fix typo + minor improvement

Co-Authored-By: JimboJoe <jimmy@monin.net>
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index a5e3778..6163a54 100644
--- a/README.md
+++ b/README.md
@@ -72,7 +72,7 @@ Following symlinks is not allowed ('/home/yunohost.multimedia/user/Share' -> '/h
 
 If you need/want to use Nextcloud `occ` command¹, you need to be in `/var/www/nextcloud/` folder, then use `sudo -u nextcloud php7.3 occ` instead of `occ` (as an alternative, you can use `/var/www/nextcloud/occ` to run the command from another directory).
 
-*NB: you may need to adapt `php7.3` to the php version that Nextcloud is using. Since Nextcloud 18 Yunohost use php7.3, before it was php7.0.*
+*NB: You may need to adapt `php7.3` to the PHP version that Nextcloud is using. Starting from Nextcloud 18, YunoHost uses php7.3, it used before php7.0.*
 
 ¹ See https://docs.nextcloud.com/server/18/admin_manual/configuration_server/occ_command.html. Use this only if you know what you're doing :)
 

From 2d80025a049dc81cbf07589fc18a1c2132099c71 Mon Sep 17 00:00:00 2001
From: lapineige <lapineige@users.noreply.github.com>
Date: Fri, 17 Apr 2020 09:54:31 +0200
Subject: [PATCH 13/30] minor spacing improvement

Co-Authored-By: JimboJoe <jimmy@monin.net>
---
 README.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 6163a54..4a7ad2d 100644
--- a/README.md
+++ b/README.md
@@ -74,7 +74,8 @@ If you need/want to use Nextcloud `occ` command¹, you need to be in `/var/www/n
 
 *NB: You may need to adapt `php7.3` to the PHP version that Nextcloud is using. Starting from Nextcloud 18, YunoHost uses php7.3, it used before php7.0.*
 
-¹ See https://docs.nextcloud.com/server/18/admin_manual/configuration_server/occ_command.html. Use this only if you know what you're doing :)
+¹ See https://docs.nextcloud.com/server/18/admin_manual/configuration_server/occ_command.html
+ Use this only if you know what you're doing :)
 
 #### Migrate from ownCloud
 

From e2b06801ae9a254ce03a9c43885e8604d89590da Mon Sep 17 00:00:00 2001
From: lapineige <lapineige@users.noreply.github.com>
Date: Fri, 17 Apr 2020 09:55:49 +0200
Subject: [PATCH 14/30] adapte to multiple instance

Co-Authored-By: JimboJoe <jimmy@monin.net>
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 4a7ad2d..bde855b 100644
--- a/README.md
+++ b/README.md
@@ -70,7 +70,7 @@ Following symlinks is not allowed ('/home/yunohost.multimedia/user/Share' -> '/h
 
 #### `occ` command usage
 
-If you need/want to use Nextcloud `occ` command¹, you need to be in `/var/www/nextcloud/` folder, then use `sudo -u nextcloud php7.3 occ` instead of `occ` (as an alternative, you can use `/var/www/nextcloud/occ` to run the command from another directory).
+If you need/want to use Nextcloud `occ` command¹, you need to be in `/var/www/nextcloud/` folder (or `/var/www/nextcloud__n/` depending on your instance number in case of multiple concurrent installations), then use `sudo -u nextcloud php7.3 occ` instead of `occ` (as an alternative, you can use `/var/www/nextcloud/occ` to run the command from another directory).
 
 *NB: You may need to adapt `php7.3` to the PHP version that Nextcloud is using. Starting from Nextcloud 18, YunoHost uses php7.3, it used before php7.0.*
 

From 2243f24465619bdf4acc811cbdebd4cad65c195a Mon Sep 17 00:00:00 2001
From: lapineige <lapineige@users.noreply.github.com>
Date: Sat, 18 Apr 2020 11:27:35 +0200
Subject: [PATCH 15/30] Explain how to use OnlyOffice

 + minor readme reorganisation (it seems to be more a "configuration" thing)
---
 README.md | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index bde855b..7edceec 100644
--- a/README.md
+++ b/README.md
@@ -24,13 +24,23 @@ you can synchronize your files over your devices.
 * [YunoHost demo](https://demo.yunohost.org/nextcloud/)
 * [Official demo](https://demo.nextcloud.com/)
 
-## Configuration
-
 ## Documentation
 
  * Official documentation: https://docs.nextcloud.com/server/18/user_manual/
  * YunoHost documentation: https://github.com/YunoHost/doc/blob/master/app_nextcloud_fr.md
 
+## Configuration
+
+#### Configure OnlyOffice integration
+
+Starting from Nextcloud 18, it features a direct integration of OnlyOffice (an online rich text document editor) thought a Nextcloud app.
+To install and configure it:
+- Install *Community Document Server* application in your Nextcloud
+- Then in Settings -> OnlyOffice (`https://yourdomain.tld/nextcloud/settings/admin/onlyoffice`), you need to configure its URL with `https://yourdomain.tld/nextcloud/index.php/apps/documentserver_community/`. Keep others server parameters empty. Save it.
+- You can also configure with file formats should be openned by OnlyOffice.
+- Here you go :) You should be able to create new type of documents and open them.
+
+
 ## YunoHost specific features
 
 In addition to Nextcloud core features, the following are made available with

From c402cc819b0e247b8a90a432c1fb133f575b6953 Mon Sep 17 00:00:00 2001
From: lapineige <lapineige@users.noreply.github.com>
Date: Sat, 18 Apr 2020 11:32:07 +0200
Subject: [PATCH 16/30] OnlyOffice: add architecture support information

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 7edceec..1cff9bf 100644
--- a/README.md
+++ b/README.md
@@ -40,6 +40,7 @@ To install and configure it:
 - You can also configure with file formats should be openned by OnlyOffice.
 - Here you go :) You should be able to create new type of documents and open them.
 
+*NB: OnlyOffice is only available for x86 architecture - **ARM** (Raspberry Pi, …) is **not** supported*
 
 ## YunoHost specific features
 

From ad396b04afd73f18409f5a9d9eff2e5e696deb87 Mon Sep 17 00:00:00 2001
From: lapineige <lapineige@users.noreply.github.com>
Date: Fri, 24 Apr 2020 14:39:13 +0200
Subject: [PATCH 17/30] OnlyOffice doc: improve clarity

---
 README.md | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 1cff9bf..3f825dd 100644
--- a/README.md
+++ b/README.md
@@ -35,8 +35,9 @@ you can synchronize your files over your devices.
 
 Starting from Nextcloud 18, it features a direct integration of OnlyOffice (an online rich text document editor) thought a Nextcloud app.
 To install and configure it:
-- Install *Community Document Server* application in your Nextcloud
-- Then in Settings -> OnlyOffice (`https://yourdomain.tld/nextcloud/settings/admin/onlyoffice`), you need to configure its URL with `https://yourdomain.tld/nextcloud/index.php/apps/documentserver_community/`. Keep others server parameters empty. Save it.
+- Install *Community Document Server* application in your Nextcloud. That's the part that runs OnlyOffice server.
+- Install OnlyOffice application. That's the client part that will connect to an OnlyOffice server.
+- Then in Settings -> OnlyOffice (`https://yourdomain.tld/nextcloud/settings/admin/onlyoffice`), you need to configure its URL with `https://yourdomain.tld/nextcloud/index.php/apps/documentserver_community/` (an URL might be defined by default, but is not always correct). Keep others server parameters empty. Save it.
 - You can also configure with file formats should be openned by OnlyOffice.
 - Here you go :) You should be able to create new type of documents and open them.
 

From dda72665c3238b0f83602ef2fdce1cb33c5a8e28 Mon Sep 17 00:00:00 2001
From: Jimmy Monin <jimmy@monin.net>
Date: Sat, 25 Apr 2020 10:33:17 +0200
Subject: [PATCH 18/30] Upgrade to upstream version 18.0.4

---
 README.md                         | 2 +-
 manifest.json                     | 2 +-
 scripts/upgrade.d/upgrade.last.sh | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 1ce4ca2..9ed1ae5 100644
--- a/README.md
+++ b/README.md
@@ -13,7 +13,7 @@ own data. A personal cloud which run on your own server. With Nextcloud
 you can synchronize your files over your devices.
 
 
-**Shipped version:** 18.0.3
+**Shipped version:** 18.0.4
 
 ## Screenshots
 
diff --git a/manifest.json b/manifest.json
index 5f79407..c3cc160 100644
--- a/manifest.json
+++ b/manifest.json
@@ -6,7 +6,7 @@
         "en": "Access & share your files, calendars, contacts, mail & more from any device, on your terms",
         "fr": "Consultez et partagez vos fichiers, agendas, carnets d'adresses, emails et bien plus depuis les appareils de votre choix, sous vos conditions"
     },
-    "version": "18.0.3~ynh1",
+    "version": "18.0.4~ynh1",
     "url": "https://nextcloud.com",
     "license": "AGPL-3.0",
     "maintainer": {
diff --git a/scripts/upgrade.d/upgrade.last.sh b/scripts/upgrade.d/upgrade.last.sh
index 4da3883..6a77d34 100755
--- a/scripts/upgrade.d/upgrade.last.sh
+++ b/scripts/upgrade.d/upgrade.last.sh
@@ -1,10 +1,10 @@
 #!/bin/bash
 
 # Last available nextcloud version
-next_version="18.0.3"
+next_version="18.0.4"
 
 # Nextcloud tarball checksum sha256
-nextcloud_source_sha256="7b67e709006230f90f95727f9fa92e8c73a9e93458b22103293120f9cb50fd72"
+nextcloud_source_sha256="fad8e12632b352247ffc5ae181d4e414d732b9072caa0401774cfdb93a714329"
 
 # This function will only be executed upon applying the last upgrade referenced above
 last_upgrade_operations () {

From f773b2879a423b0db73a83145a0c5587d190cd4a Mon Sep 17 00:00:00 2001
From: Maniack Crudelis <maniackcrudelis@users.noreply.github.com>
Date: Tue, 28 Apr 2020 23:52:37 +0200
Subject: [PATCH 19/30] Update README.md

Small typos
And I removed the link to the doc as the same link is already line 29
---
 README.md | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 3f825dd..6e37910 100644
--- a/README.md
+++ b/README.md
@@ -33,12 +33,12 @@ you can synchronize your files over your devices.
 
 #### Configure OnlyOffice integration
 
-Starting from Nextcloud 18, it features a direct integration of OnlyOffice (an online rich text document editor) thought a Nextcloud app.
+Starting from Nextcloud 18, it features a direct integration of OnlyOffice (an online rich text document editor) through a Nextcloud app.
 To install and configure it:
 - Install *Community Document Server* application in your Nextcloud. That's the part that runs OnlyOffice server.
 - Install OnlyOffice application. That's the client part that will connect to an OnlyOffice server.
 - Then in Settings -> OnlyOffice (`https://yourdomain.tld/nextcloud/settings/admin/onlyoffice`), you need to configure its URL with `https://yourdomain.tld/nextcloud/index.php/apps/documentserver_community/` (an URL might be defined by default, but is not always correct). Keep others server parameters empty. Save it.
-- You can also configure with file formats should be openned by OnlyOffice.
+- You can also configure which file formats should be opened by OnlyOffice.
 - Here you go :) You should be able to create new type of documents and open them.
 
 *NB: OnlyOffice is only available for x86 architecture - **ARM** (Raspberry Pi, …) is **not** supported*
@@ -125,7 +125,6 @@ sudo yunohost app ssowatconf
 
  * Report a bug: https://github.com/YunoHost-Apps/nextcloud_ynh/issues
  * Nextcloud website: https://nextcloud.com/
- * Nextcloud documentation:  https://docs.nextcloud.com/
  * Nextcloud repository: https://github.com/nextcloud/server
  * YunoHost website: https://yunohost.org/
 

From a442cc41ebd53ccaaec02f6d21a1a4c26a8f4aae Mon Sep 17 00:00:00 2001
From: Maniack Crudelis <maniackcrudelis@users.noreply.github.com>
Date: Wed, 29 Apr 2020 00:08:33 +0200
Subject: [PATCH 20/30] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 6e37910..696e918 100644
--- a/README.md
+++ b/README.md
@@ -27,7 +27,7 @@ you can synchronize your files over your devices.
 ## Documentation
 
  * Official documentation: https://docs.nextcloud.com/server/18/user_manual/
- * YunoHost documentation: https://github.com/YunoHost/doc/blob/master/app_nextcloud_fr.md
+ * YunoHost documentation: https://github.com/YunoHost/doc/blob/master/app_nextcloud.md
 
 ## Configuration
 

From 4c17d94ddf4ce991756948f2383ae63e6e08e2ae Mon Sep 17 00:00:00 2001
From: saimyx <44293594+Saimyx@users.noreply.github.com>
Date: Wed, 29 Apr 2020 13:45:37 +0200
Subject: [PATCH 21/30] Create README_fr.md

---
 README_fr.md | 119 +++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 119 insertions(+)
 create mode 100644 README_fr.md

diff --git a/README_fr.md b/README_fr.md
new file mode 100644
index 0000000..a3a0f5e
--- /dev/null
+++ b/README_fr.md
@@ -0,0 +1,119 @@
+# Nextcloud pour YunoHost
+
+[![Niveau d'integration](https://dash.yunohost.org/integration/nextcloud.svg)](https://dash.yunohost.org/appci/app/nextcloud) ![](https://ci-apps.yunohost.org/ci/badges/nextcloud.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/nextcloud.maintain.svg)  
+[![Install Nextcloud with YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=nextcloud)
+
+*[Read this readme in english.](./README.md)* 
+
+
+> *Ce package vous permet d'installer Nextcloud 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
+
+[Nextcloud](https://nextcloud.com) vous donne la liberté et le contrôle sur vos données. Un nuage personnel qui tourne sur votre serveur.
+Avec NextCloud vous pouvez synchroniser vos fichiers sur vos appareils.
+
+**Version incluse :** 18.0.4
+
+## Captures d'écran
+
+![](https://raw.githubusercontent.com/nextcloud/screenshots/master/files/Files%20Overview.png)
+
+## Démo
+
+* [Démo YunoHost](https://demo.yunohost.org/nextcloud/)
+* [Démo officielle](https://demo.nextcloud.com/)
+
+## Configuration
+
+## Documentation
+
+ * Documentation officielle : https://docs.nextcloud.com/server/18/user_manual/
+ * Documentation YunoHost : https://github.com/YunoHost/doc/blob/master/app_nextcloud_fr.md
+
+## Caractéristiques spécifiques YunoHost
+
+En plus des fonctionnalités principales de Nextcloud, les fonctionnalités suivantes sont incluses dans ce package :
+
+ * Intégration avec les utilisateurs YunoHost et le SSO - exemple, le bouton de déconnexion
+ * Permet à un utilisateur d'être l'administrateur (choisi à l'installation)
+ * Permet de multiples instances de cette application
+ * Accès optionnel au répertoire home depuis les fichiers Nextcloud (à activer à l'installation, le partage étant activé par défaut)
+ * Utilise le répertoire `/.well-known` pour la synchronisation CalDAV et CardDAV du domaine si aucun autre service ne l'utilise déjà - exemple, baikal
+
+#### Support multi-utilisateurs
+
+#### Architectures supportées
+
+* x86-64b - [![Build Status](https://ci-apps.yunohost.org/ci/logs/nextcloud%20%28Apps%29.svg)](https://ci-apps.yunohost.org/ci/apps/nextcloud/)
+* ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/nextcloud%20%28Apps%29.svg)](https://ci-apps-arm.yunohost.org/ci/apps/nextcloud/)
+
+## Limitations
+
+Pour intégrer le bouton de déconnexion du SSO, nous devons patcher les sources de Nextcloud.
+En attendant un intégration de leur part, la vérification d'intégrité du code source est désactivée pour ne pas avoir de message d'avertissement.
+
+Donc notez que nous avons choisi de désactiver la applications de tierces-parties lors des mises à jour. Ça permet d'éviter une installation de Nextcloud instable - ou qui pourrait planter.
+Vous devrez juste les réactiver manuellement après chaque mise à jour.
+
+Et enfin, le message d'erreur suivant dans les logs de Nextcloud peut être ignoré sans problème :
+```
+Following symlinks is not allowed ('/home/yunohost.multimedia/user/Share' -> '/home/yunohost.multimedia/share/' not inside '/home/yunohost.multimedia/user/')
+```
+
+## Informations supplémentaires
+
+#### Migrer depuis ownCloud
+
+**La migration n'est pas encore considérée comme stable, merci de la faire prudemment et uniquement pour tester !**
+
+//fin de trad -------------------------------------------------------------------------------------
+
+This package handle the migration from ownCloud to Nextcloud. For that, your
+ownCloud application must be **up-to-date** in YunoHost.
+
+You will then have to upgrade your ownCloud application with this repository.
+This can only be done from the command-line interface - e.g. through SSH. Once
+you're connected, you simply have to execute the following:
+
+```bash
+sudo yunohost app upgrade -u https://github.com/YunoHost-Apps/nextcloud_ynh owncloud --debug
+```
+
+The `--debug` option will let you see the full output. If you encounter any
+issue, please paste it.
+
+Note that a cron job will be executed at some time after the end of this
+command. You must wait that before doing any other application operations!
+You should see that Nextcloud is installed after that.
+
+Note that it does not change the application label nor the URL. To rename
+the label, you can execute the following - replace `Nextcloud` with whatever
+you want:
+
+```bash
+sudo yunohost app setting nextcloud label -v "Nextcloud"
+sudo yunohost app ssowatconf
+```
+
+## Links
+
+ * Report a bug: https://github.com/YunoHost-Apps/nextcloud_ynh/issues
+ * Nextcloud website: https://nextcloud.com/
+ * Nextcloud repository: https://github.com/nextcloud/server
+ * YunoHost website: https://yunohost.org/
+
+---
+
+Developers infos
+----------------
+
+Please do your pull request to the [testing branch](https://github.com/YunoHost-Apps/nextcloud_ynh/tree/testing).
+
+To try the testing branch, please proceed like that.
+```
+sudo yunohost app install https://github.com/YunoHost-Apps/nextcloud_ynh/tree/testing --debug
+or
+sudo yunohost app upgrade nextcloud -u https://github.com/YunoHost-Apps/nextcloud_ynh/tree/testing --debug
+```

From 440fa10704533383ef8f885bd51720ea0b54926e Mon Sep 17 00:00:00 2001
From: saimyx <44293594+Saimyx@users.noreply.github.com>
Date: Wed, 29 Apr 2020 14:31:08 +0200
Subject: [PATCH 22/30] Update README_fr.md

---
 README_fr.md | 44 ++++++++++++++++----------------------------
 1 file changed, 16 insertions(+), 28 deletions(-)

diff --git a/README_fr.md b/README_fr.md
index a3a0f5e..97798ac 100644
--- a/README_fr.md
+++ b/README_fr.md
@@ -68,30 +68,20 @@ Following symlinks is not allowed ('/home/yunohost.multimedia/user/Share' -> '/h
 
 **La migration n'est pas encore considérée comme stable, merci de la faire prudemment et uniquement pour tester !**
 
-//fin de trad -------------------------------------------------------------------------------------
-
-This package handle the migration from ownCloud to Nextcloud. For that, your
-ownCloud application must be **up-to-date** in YunoHost.
-
-You will then have to upgrade your ownCloud application with this repository.
-This can only be done from the command-line interface - e.g. through SSH. Once
-you're connected, you simply have to execute the following:
+Ce package gère la migration de OwnCloud vers Nextcloud. Pour ça, l'application OwnCloud doit **être à jour** dans YunoHost.
 
+Vous allez ensuite mettre à niveau votre OwnCloud avec ce dépôt.
+Ça ne peut être fait qu'en ligne de commande - par exemple via SSH. Une fois connecté, vous n'avez plus qu'à exécuter la commande suivante :
 ```bash
 sudo yunohost app upgrade -u https://github.com/YunoHost-Apps/nextcloud_ynh owncloud --debug
 ```
 
-The `--debug` option will let you see the full output. If you encounter any
-issue, please paste it.
+L'option `--debug` va vous permettre de visualiser entièrement les retours de la mise à niveau. Si vous rencontrez un problème, merci de nous le transmettre.
 
-Note that a cron job will be executed at some time after the end of this
-command. You must wait that before doing any other application operations!
-You should see that Nextcloud is installed after that.
-
-Note that it does not change the application label nor the URL. To rename
-the label, you can execute the following - replace `Nextcloud` with whatever
-you want:
+Notez qu'une tâche cron va être exécutée une fois la fin de cette commande. Vous devez attendre qu'elle se fasse avant de faire une autre opération liée aux applications.
+Nous espérons que Nextcloud sera installé après ça.
 
+Notez que ça ne changera pas la label ni l'URL. Pour renommer le label, vous pouvez exécuter la commande suivante (en remplaçant `Nextcloud` par ce que vous voulez) :
 ```bash
 sudo yunohost app setting nextcloud label -v "Nextcloud"
 sudo yunohost app ssowatconf
@@ -99,21 +89,19 @@ sudo yunohost app ssowatconf
 
 ## Links
 
- * Report a bug: https://github.com/YunoHost-Apps/nextcloud_ynh/issues
- * Nextcloud website: https://nextcloud.com/
- * Nextcloud repository: https://github.com/nextcloud/server
- * YunoHost website: https://yunohost.org/
-
+ * Signaler un bug : https://github.com/YunoHost-Apps/nextcloud_ynh/issues
+ * Site web de Nextcloud : https://nextcloud.com/
+ * Dpôt de Nextcloud : https://github.com/nextcloud/server
+ * Site web de YunoHost : https://yunohost.org/
+ 
 ---
-
-Developers infos
+Informations pour les développeurs
 ----------------
 
-Please do your pull request to the [testing branch](https://github.com/YunoHost-Apps/nextcloud_ynh/tree/testing).
-
-To try the testing branch, please proceed like that.
+Merci de faire votre « pull request » sur la [branche de test](https://github.com/YunoHost-Apps/nextcloud_ynh/tree/testing).
+Pour tester la branche de test, faites comme ceci.
 ```
 sudo yunohost app install https://github.com/YunoHost-Apps/nextcloud_ynh/tree/testing --debug
-or
+ou
 sudo yunohost app upgrade nextcloud -u https://github.com/YunoHost-Apps/nextcloud_ynh/tree/testing --debug
 ```

From 8a6d8fbe9df71259e35200cb97cadb8b4dfaa71b Mon Sep 17 00:00:00 2001
From: saimyx <44293594+Saimyx@users.noreply.github.com>
Date: Wed, 29 Apr 2020 15:03:36 +0200
Subject: [PATCH 23/30] Update README_fr.md

---
 README_fr.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README_fr.md b/README_fr.md
index 97798ac..34620dc 100644
--- a/README_fr.md
+++ b/README_fr.md
@@ -1,6 +1,6 @@
 # Nextcloud pour YunoHost
 
-[![Niveau d'integration](https://dash.yunohost.org/integration/nextcloud.svg)](https://dash.yunohost.org/appci/app/nextcloud) ![](https://ci-apps.yunohost.org/ci/badges/nextcloud.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/nextcloud.maintain.svg)  
+[![Niveau d'integration](https://dash.yunohost.org/integration/nextcloud.svg)](https://dash.yunohost.org/appci/app/nextcloud)  
 [![Install Nextcloud with YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=nextcloud)
 
 *[Read this readme in english.](./README.md)* 

From 0ac9fab4ed33bbcd7bfbfff391e7a90bba2b5b27 Mon Sep 17 00:00:00 2001
From: saimyx <44293594+Saimyx@users.noreply.github.com>
Date: Wed, 29 Apr 2020 15:04:13 +0200
Subject: [PATCH 24/30] Update README_fr.md

---
 README_fr.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README_fr.md b/README_fr.md
index 34620dc..faf7d7a 100644
--- a/README_fr.md
+++ b/README_fr.md
@@ -14,7 +14,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour
 [Nextcloud](https://nextcloud.com) vous donne la liberté et le contrôle sur vos données. Un nuage personnel qui tourne sur votre serveur.
 Avec NextCloud vous pouvez synchroniser vos fichiers sur vos appareils.
 
-**Version incluse :** 18.0.4
+**Version incluse :** 18.0.2
 
 ## Captures d'écran
 

From 651efbd63cf24f5fc2e39c62f32740d980a88233 Mon Sep 17 00:00:00 2001
From: saimyx <44293594+Saimyx@users.noreply.github.com>
Date: Wed, 29 Apr 2020 15:05:50 +0200
Subject: [PATCH 25/30] Update README_fr.md

---
 README_fr.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README_fr.md b/README_fr.md
index faf7d7a..fb7980a 100644
--- a/README_fr.md
+++ b/README_fr.md
@@ -40,7 +40,7 @@ En plus des fonctionnalités principales de Nextcloud, les fonctionnalités suiv
  * Permet à un utilisateur d'être l'administrateur (choisi à l'installation)
  * Permet de multiples instances de cette application
  * Accès optionnel au répertoire home depuis les fichiers Nextcloud (à activer à l'installation, le partage étant activé par défaut)
- * Utilise le répertoire `/.well-known` pour la synchronisation CalDAV et CardDAV du domaine si aucun autre service ne l'utilise déjà - exemple, baikal
+ * Utilise le répertoire `/.well-known` pour la synchronisation CalDAV et CardDAV du domaine si aucun autre service ne l'utilise déjà -par exemple, baikal
 
 #### Support multi-utilisateurs
 

From c0e4da8f1837c5584a991dd936066be7811a7f25 Mon Sep 17 00:00:00 2001
From: saimyx <44293594+Saimyx@users.noreply.github.com>
Date: Wed, 29 Apr 2020 15:06:32 +0200
Subject: [PATCH 26/30] lien readme-fr

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index f0153fe..4c46132 100644
--- a/README.md
+++ b/README.md
@@ -3,6 +3,7 @@
 [![Integration level](https://dash.yunohost.org/integration/nextcloud.svg)](https://dash.yunohost.org/appci/app/nextcloud)  
 [![Install Nextcloud with YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=nextcloud)
 
+*[Lire ce readme en français.](./README_fr.md)*
 > *This package allow you to install Nextcloud quickly and simply on a YunoHost server.  
 If you don't have YunoHost, please see [here](https://yunohost.org/#/install) to know how to install and enjoy it.*
 

From 829645c30ee43607c038a4e81a033792f828586f Mon Sep 17 00:00:00 2001
From: Maniack Crudelis <maniackcrudelis@users.noreply.github.com>
Date: Wed, 29 Apr 2020 16:01:28 +0200
Subject: [PATCH 27/30] Fix typo and phrasing

---
 README_fr.md | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/README_fr.md b/README_fr.md
index fb7980a..4dba008 100644
--- a/README_fr.md
+++ b/README_fr.md
@@ -1,7 +1,7 @@
 # Nextcloud pour YunoHost
 
-[![Niveau d'integration](https://dash.yunohost.org/integration/nextcloud.svg)](https://dash.yunohost.org/appci/app/nextcloud)  
-[![Install Nextcloud with YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=nextcloud)
+[![Niveau d'integration](https://dash.yunohost.org/integration/nextcloud.svg)](https://dash.yunohost.org/appci/app/nextcloud) ![](https://ci-apps.yunohost.org/ci/badges/nextcloud.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/nextcloud.maintain.svg)  
+[![Installer Nextcloud avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=nextcloud)
 
 *[Read this readme in english.](./README.md)* 
 
@@ -14,7 +14,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour
 [Nextcloud](https://nextcloud.com) vous donne la liberté et le contrôle sur vos données. Un nuage personnel qui tourne sur votre serveur.
 Avec NextCloud vous pouvez synchroniser vos fichiers sur vos appareils.
 
-**Version incluse :** 18.0.2
+**Version incluse :** 18.0.4
 
 ## Captures d'écran
 
@@ -40,7 +40,7 @@ En plus des fonctionnalités principales de Nextcloud, les fonctionnalités suiv
  * Permet à un utilisateur d'être l'administrateur (choisi à l'installation)
  * Permet de multiples instances de cette application
  * Accès optionnel au répertoire home depuis les fichiers Nextcloud (à activer à l'installation, le partage étant activé par défaut)
- * Utilise le répertoire `/.well-known` pour la synchronisation CalDAV et CardDAV du domaine si aucun autre service ne l'utilise déjà -par exemple, baikal
+ * Utilise l'adresse `/.well-known` pour la synchronisation CalDAV et CardDAV du domaine si aucun autre service ne l'utilise déjà - par exemple, baikal
 
 #### Support multi-utilisateurs
 
@@ -54,7 +54,7 @@ En plus des fonctionnalités principales de Nextcloud, les fonctionnalités suiv
 Pour intégrer le bouton de déconnexion du SSO, nous devons patcher les sources de Nextcloud.
 En attendant un intégration de leur part, la vérification d'intégrité du code source est désactivée pour ne pas avoir de message d'avertissement.
 
-Donc notez que nous avons choisi de désactiver la applications de tierces-parties lors des mises à jour. Ça permet d'éviter une installation de Nextcloud instable - ou qui pourrait planter.
+Notez également que nous avons choisi de désactiver les applications tierces-parties lors des mises à jour. Ça permet d'éviter une installation de Nextcloud instable - ou qui pourrait planter.
 Vous devrez juste les réactiver manuellement après chaque mise à jour.
 
 Et enfin, le message d'erreur suivant dans les logs de Nextcloud peut être ignoré sans problème :
@@ -79,9 +79,9 @@ sudo yunohost app upgrade -u https://github.com/YunoHost-Apps/nextcloud_ynh ownc
 L'option `--debug` va vous permettre de visualiser entièrement les retours de la mise à niveau. Si vous rencontrez un problème, merci de nous le transmettre.
 
 Notez qu'une tâche cron va être exécutée une fois la fin de cette commande. Vous devez attendre qu'elle se fasse avant de faire une autre opération liée aux applications.
-Nous espérons que Nextcloud sera installé après ça.
+Vous devriez constater que Nextcloud sera installé après ça.
 
-Notez que ça ne changera pas la label ni l'URL. Pour renommer le label, vous pouvez exécuter la commande suivante (en remplaçant `Nextcloud` par ce que vous voulez) :
+Notez que ça ne changera pas le label ni l'URL. Pour renommer le label, vous pouvez exécuter la commande suivante (en remplaçant `Nextcloud` par ce que vous voulez) :
 ```bash
 sudo yunohost app setting nextcloud label -v "Nextcloud"
 sudo yunohost app ssowatconf
@@ -91,15 +91,15 @@ sudo yunohost app ssowatconf
 
  * Signaler un bug : https://github.com/YunoHost-Apps/nextcloud_ynh/issues
  * Site web de Nextcloud : https://nextcloud.com/
- * Dpôt de Nextcloud : https://github.com/nextcloud/server
+ * Dépôt de Nextcloud : https://github.com/nextcloud/server
  * Site web de YunoHost : https://yunohost.org/
  
 ---
 Informations pour les développeurs
 ----------------
 
-Merci de faire votre « pull request » sur la [branche de test](https://github.com/YunoHost-Apps/nextcloud_ynh/tree/testing).
-Pour tester la branche de test, faites comme ceci.
+Merci de faire votre « pull request » sur la [branche testing](https://github.com/YunoHost-Apps/nextcloud_ynh/tree/testing).
+Pour tester la branche testing, faites comme ceci.
 ```
 sudo yunohost app install https://github.com/YunoHost-Apps/nextcloud_ynh/tree/testing --debug
 ou

From 77fcef8ae71c17e4612a3f6b7fd9f2c8323ada79 Mon Sep 17 00:00:00 2001
From: lapineige <lapineige@users.noreply.github.com>
Date: Wed, 29 Apr 2020 23:03:29 +0200
Subject: [PATCH 28/30] Documentation pour OnlyOffice

Pour s'aligner avec https://github.com/YunoHost-Apps/nextcloud_ynh/pull/278
---
 README_fr.md | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/README_fr.md b/README_fr.md
index 4dba008..1adf19e 100644
--- a/README_fr.md
+++ b/README_fr.md
@@ -25,12 +25,24 @@ Avec NextCloud vous pouvez synchroniser vos fichiers sur vos appareils.
 * [Démo YunoHost](https://demo.yunohost.org/nextcloud/)
 * [Démo officielle](https://demo.nextcloud.com/)
 
-## Configuration
-
 ## Documentation
 
  * Documentation officielle : https://docs.nextcloud.com/server/18/user_manual/
  * Documentation YunoHost : https://github.com/YunoHost/doc/blob/master/app_nextcloud_fr.md
+ 
+## Configuration
+
+#### Configurer l'intégration d'OnlyOffice
+
+À partir de sa version 18, Nextcloud intégre une intégration directe de OnlyOffice (un éditeur de texte enrichi en ligne) via une application Nextcloud.
+Pour l'installer et le configurer:
+    - Installez l'application *Community Document Server* dans votre Nextcloud. C'est la partie qui fait tourner un serveur OnlyOffice.
+    - Installez l'application *OnlyOffice*. C'est la partie cliente qui va se connecter au serveur OnlyOffice.
+    - Ensuite dans les Paramètres -> OnlyOffice (`https://yourdomain.tld/nextcloud/settings/admin/onlyoffice`), vous devez le configurer avec l'URL suivante `https://yourdomain.tld/nextcloud/index.php/apps/documentserver_community/` (une URL peut-être préremplie, mais elle n'est pas toujours correcte). Veuillez noter la présence de **`/index.php/`**. Laissez les autres paramètres vides. Sauvegardez.
+    - Vous pouvez aussi configurer quels formats de fichier s'ouvrent avec OnlyOffice.
+    - Et voilà :) Vous devriez pouvoir créer de nouveaux types de documents, et les ouvrir.
+    
+   *NB: OnlyOffice n'est disponible que sous architecture x86 - **ARM** (Raspberry Pi, …) n'est **pas** supporté*
 
 ## Caractéristiques spécifiques YunoHost
 

From 490d27b1df66d1ee22e62925acf468c9f308ea1e Mon Sep 17 00:00:00 2001
From: lapineige <lapineige@users.noreply.github.com>
Date: Wed, 29 Apr 2020 23:06:29 +0200
Subject: [PATCH 29/30] Make the URL change clearer

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 696e918..86ff788 100644
--- a/README.md
+++ b/README.md
@@ -37,7 +37,7 @@ Starting from Nextcloud 18, it features a direct integration of OnlyOffice (an o
 To install and configure it:
 - Install *Community Document Server* application in your Nextcloud. That's the part that runs OnlyOffice server.
 - Install OnlyOffice application. That's the client part that will connect to an OnlyOffice server.
-- Then in Settings -> OnlyOffice (`https://yourdomain.tld/nextcloud/settings/admin/onlyoffice`), you need to configure its URL with `https://yourdomain.tld/nextcloud/index.php/apps/documentserver_community/` (an URL might be defined by default, but is not always correct). Keep others server parameters empty. Save it.
+- Then in Settings -> OnlyOffice (`https://yourdomain.tld/nextcloud/settings/admin/onlyoffice`), you need to configure its URL with `https://yourdomain.tld/nextcloud/index.php/apps/documentserver_community/` (an URL might be defined by default, but is not always correct). Please note the **`/index.php/`**. Keep others server parameters empty. Save it.
 - You can also configure which file formats should be opened by OnlyOffice.
 - Here you go :) You should be able to create new type of documents and open them.
 

From 307255b541e7c8d174da31e6f8a4399fecf5ee03 Mon Sep 17 00:00:00 2001
From: Kay0u <pierre@kayou.io>
Date: Mon, 4 May 2020 19:16:33 +0200
Subject: [PATCH 30/30] use only YNH_APP_INSTANCE_NAME

---
 scripts/actions/disable_maintenance | 2 +-
 scripts/config                      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/actions/disable_maintenance b/scripts/actions/disable_maintenance
index 0c2c8b2..0ea0edb 100755
--- a/scripts/actions/disable_maintenance
+++ b/scripts/actions/disable_maintenance
@@ -13,7 +13,7 @@ source /usr/share/yunohost/helpers
 # RETRIEVE ARGUMENTS
 #=================================================
 
-app=${YNH_APP_INSTANCE_NAME:-$YNH_APP_ID}
+app=$YNH_APP_INSTANCE_NAME
 
 final_path=$(ynh_app_setting_get --app=$app --key=final_path)
 
diff --git a/scripts/config b/scripts/config
index b0314f0..d06b98b 100644
--- a/scripts/config
+++ b/scripts/config
@@ -14,7 +14,7 @@ source _ynh_add_fpm_config
 # RETRIEVE ARGUMENTS
 #=================================================
 
-app=${YNH_APP_INSTANCE_NAME:-$YNH_APP_ID}
+app=$YNH_APP_INSTANCE_NAME
 
 #=================================================
 # LOAD VALUES