From 5b15a94084184d53fb21d43b38975cccf7579b03 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Fri, 24 Dec 2021 09:49:05 +0100 Subject: [PATCH 1/8] Update restore --- scripts/restore | 8 -------- 1 file changed, 8 deletions(-) diff --git a/scripts/restore b/scripts/restore index 5bf710d..dbf3f14 100644 --- a/scripts/restore +++ b/scripts/restore @@ -30,14 +30,6 @@ app=$YNH_APP_INSTANCE_NAME domain=$(ynh_app_setting_get --app=$app --key=domain) path_url=$(ynh_app_setting_get --app=$app --key=path) -#================================================= -# CHECK IF THE APP CAN BE RESTORED -#================================================= -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}" - #================================================= # STANDARD RESTORATION STEPS #================================================= From a7f096cdf743517853a19049078acf574001722d Mon Sep 17 00:00:00 2001 From: Florent Date: Fri, 31 Dec 2021 11:11:28 +0100 Subject: [PATCH 2/8] Die with message if upgrade is impossible (#58) --- scripts/upgrade | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/scripts/upgrade b/scripts/upgrade index 48e752b..78a4120 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -27,6 +27,11 @@ nextcloud_domain=$(ynh_app_setting_get --app="$app" --key=nextcloud_domain) #================================================= ynh_script_progression --message="Ensuring downward compatibility..." --weight=2 +if ynh_compare_current_package_version --comparison le --version 6.4.10~ynh2 +then + ynh_die --message="Upgrade from version 6.4.10 is not possible. You must uninstall and reinstall Collabora package manually" +fi + # If db_name doesn't exist, create it if [ -z "$path_url" ]; then path_url="/" From 7b9ac74d0807d4fb39122e3e1995c5671905ffd7 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sun, 20 Feb 2022 18:11:52 +0100 Subject: [PATCH 3/8] Update manifest.json --- manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index d7e2d1e..c6a3133 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.0.6~ynh1", + "version": "21.11.2.2~ynh1", "url": "https://collaboraoffice.com", "upstream": { "license": "MPL-2.0", From a454f1db924253c60124b8317b087bbaa36e09c4 Mon Sep 17 00:00:00 2001 From: Yunohost-Bot <> Date: Sun, 20 Feb 2022 17:12:32 +0000 Subject: [PATCH 4/8] 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 0a2cee7..d1edbd7 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.0.6~ynh1 +**Shipped version:** 21.11.2.2~ynh1 diff --git a/README_fr.md b/README_fr.md index 2cb5c9b..18b5333 100644 --- a/README_fr.md +++ b/README_fr.md @@ -23,7 +23,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.0.6~ynh1 +**Version incluse :** 21.11.2.2~ynh1 From c64d9dac7ac6c68ed703c8d73d0b4695227c8e86 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sat, 12 Mar 2022 14:20:30 +0100 Subject: [PATCH 5/8] Update manifest.json --- manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index c6a3133..a6d7d20 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.2.2~ynh1", + "version": "21.11.2.4~ynh1", "url": "https://collaboraoffice.com", "upstream": { "license": "MPL-2.0", From 5cddb9fdf0d32a7ca6b0a5469427c85af20dcf5b Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sat, 12 Mar 2022 13:21:37 +0000 Subject: [PATCH 6/8] 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 d1edbd7..0eb8d6f 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.2.2~ynh1 +**Shipped version:** 21.11.2.4~ynh1 diff --git a/README_fr.md b/README_fr.md index 18b5333..94116a3 100644 --- a/README_fr.md +++ b/README_fr.md @@ -23,7 +23,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.2.2~ynh1 +**Version incluse :** 21.11.2.4~ynh1 From 09f3dc3ca48b98110e24ff76b7e6f1b1ddb5a1bd Mon Sep 17 00:00:00 2001 From: Thomas <51749973+Thovi98@users.noreply.github.com> Date: Mon, 2 May 2022 20:42:17 +0200 Subject: [PATCH 7/8] Update manifest.json --- manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index a6d7d20..0cec0ce 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.2.4~ynh1", + "version": "21.11.4.1~ynh1", "url": "https://collaboraoffice.com", "upstream": { "license": "MPL-2.0", From 636dcb55e0e9fc8034fcc39b9bc29d79d269b5f9 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Wed, 11 May 2022 05:38:38 +0000 Subject: [PATCH 8/8] 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 0eb8d6f..6498ffc 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.2.4~ynh1 +**Shipped version:** 21.11.4.1~ynh1 diff --git a/README_fr.md b/README_fr.md index 94116a3..44c837f 100644 --- a/README_fr.md +++ b/README_fr.md @@ -23,7 +23,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.2.4~ynh1 +**Version incluse :** 21.11.4.1~ynh1