From bdd4342177e4dbd99e98102a91f33d210e6bec6f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sun, 17 Dec 2023 15:09:45 +0100 Subject: [PATCH 1/7] fix --- conf/app.src | 4 ++-- manifest.json | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/conf/app.src b/conf/app.src index d15dc8b..4072b1f 100755 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://codeberg.org/zot-archive/osada/archive/54a7f397b4fe6a3b3731a2e37c180d9f2a789756.tar.gz -SOURCE_SUM=927e13e46c32a414fd9beec1a8a1f372778b611f8382add49481bb4664db9fad +SOURCE_URL=https://codeberg.org/zot-archive/osada/archive/dc8537520e0753a98bd2e2eeb1f0a16b50b954c3.tar.gz +SOURCE_SUM=67bcf374d09447bc42d23f14f578d78286a826c4f1528019a02efa45fd926d38 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/manifest.json b/manifest.json index 9be65c0..8e9f26e 100755 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Decentralized publication platform and social network", "fr": "Plateforme de publication décentralisée et un réseau social" }, - "version": "22.06.22~ynh1", + "version": "23.12.17~ynh1", "url": "http://zotlabs.com/osada/", "upstream": { "license": "MIT", @@ -19,7 +19,7 @@ "email": "" }, "requirements": { - "yunohost": ">= 4.3.0" + "yunohost": ">= 11.2" }, "multi_instance": true, "services": [ @@ -40,7 +40,7 @@ }, { "name": "database", - "type": "string", + "type": "select", "ask": { "en": "Choose the database to be used for the Osada]", "fr": "Choisissez la database de Osada" From 512acf623926a3b2730dad1dcc07dca3f02f726a Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sun, 17 Dec 2023 14:09:51 +0000 Subject: [PATCH 2/7] 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 f299244..f088b70 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in ## Overview [Osada](http://zotlabs.com/osada/) uses **Zot6 protocol** which is next version of **zot5 protocol**. Osada has native support for the **ActivityPub protocol** (W3C standard) as well as the more advanced features. It can inter-operate with other social networking applications and projects in either of these spaces, including **Mastodon, Pleroma, Pixelfed, PeerTube, Funkwhale, Zap, Friendica, Hubzilla,** and many more. -**Shipped version:** 22.06.22~ynh1 +**Shipped version:** 23.12.17~ynh1 ## Screenshots diff --git a/README_fr.md b/README_fr.md index 87dd923..16b5145 100644 --- a/README_fr.md +++ b/README_fr.md @@ -19,7 +19,7 @@ Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) po ## Overview [Osada](http://zotlabs.com/osada/) uses **Zot6 protocol** which is next version of **zot5 protocol**. Osada has native support for the **ActivityPub protocol** (W3C standard) as well as the more advanced features. It can inter-operate with other social networking applications and projects in either of these spaces, including **Mastodon, Pleroma, Pixelfed, PeerTube, Funkwhale, Zap, Friendica, Hubzilla,** and many more. -**Version incluse :** 22.06.22~ynh1 +**Version incluse :** 23.12.17~ynh1 ## Captures d’écran From 9fec5de6de6c8d6466f5cc46457f51eeabb52069 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sun, 17 Dec 2023 16:56:47 +0100 Subject: [PATCH 3/7] Update app_addons.src --- conf/app_addons.src | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/app_addons.src b/conf/app_addons.src index 0ab5da7..311c407 100755 --- a/conf/app_addons.src +++ b/conf/app_addons.src @@ -1,5 +1,5 @@ SOURCE_URL=https://codeberg.org/zot-archive/osada-addons/archive/2a39590048b3d93795918f20dc5170e9c2a4bcde.tar.gz -SOURCE_SUM=ba2c83145d98c2948a33eb3250bc29f3116c156f936ca56e7e3051e393804be4 +SOURCE_SUM=67bcf374d09447bc42d23f14f578d78286a826c4f1528019a02efa45fd926d38 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true From e8594b61c9522c13471400cce9332455d8930088 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix=20Pi=C3=A9dallu?= Date: Mon, 26 Feb 2024 15:28:53 +0100 Subject: [PATCH 4/7] =?UTF-8?q?Fix=20shasum=C2=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- conf/app_addons.src | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/conf/app_addons.src b/conf/app_addons.src index 311c407..f6cae21 100755 --- a/conf/app_addons.src +++ b/conf/app_addons.src @@ -1,8 +1,7 @@ SOURCE_URL=https://codeberg.org/zot-archive/osada-addons/archive/2a39590048b3d93795918f20dc5170e9c2a4bcde.tar.gz -SOURCE_SUM=67bcf374d09447bc42d23f14f578d78286a826c4f1528019a02efa45fd926d38 +SOURCE_SUM=ba2c83145d98c2948a33eb3250bc29f3116c156f936ca56e7e3051e393804be4 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true SOURCE_FILENAME= SOURCE_EXTRACT=true - From bad0cecc2f88fb594f4e27f6de079643f530a956 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Mon, 26 Feb 2024 14:28:58 +0000 Subject: [PATCH 5/7] Auto-update README --- README.md | 4 ++-- README_fr.md | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index f088b70..f35c4c2 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ @@ -69,4 +69,4 @@ or sudo yunohost app upgrade osada -u https://github.com/YunoHost-Apps/osada_ynh/tree/testing --debug ``` -**More info regarding app packaging:** +**More info regarding app packaging:** \ No newline at end of file diff --git a/README_fr.md b/README_fr.md index 16b5145..1527dfc 100644 --- a/README_fr.md +++ b/README_fr.md @@ -1,5 +1,5 @@ From dc73e229c65290b734dfdd3e2a84f0318d54fd33 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix=20Pi=C3=A9dallu?= Date: Mon, 26 Feb 2024 15:38:31 +0100 Subject: [PATCH 6/7] =?UTF-8?q?Fix=20shasum=C2=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- conf/app.src | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/app.src b/conf/app.src index 4072b1f..d556888 100755 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ SOURCE_URL=https://codeberg.org/zot-archive/osada/archive/dc8537520e0753a98bd2e2eeb1f0a16b50b954c3.tar.gz -SOURCE_SUM=67bcf374d09447bc42d23f14f578d78286a826c4f1528019a02efa45fd926d38 +SOURCE_SUM=cfed73d7d4648f4fe4e567d533d3d44dce3d36e2423c7ec32e9878f743ce2144 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true From c58e84faaf09308ebd5b853fe554cca412822570 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix=20Pi=C3=A9dallu?= Date: Mon, 26 Feb 2024 17:39:18 +0100 Subject: [PATCH 7/7] Remove test_upgrade_from broken versions --- check_process | 4 ---- 1 file changed, 4 deletions(-) diff --git a/check_process b/check_process index d338021..9160407 100755 --- a/check_process +++ b/check_process @@ -11,10 +11,6 @@ setup_private=0 setup_public=1 upgrade=1 - # 21.05.21~ynh1 - upgrade=1 from_commit=81e4171acaa44520d0f527e6af445f4f33f2bca0 - # 21.05.21~ynh2 - upgrade=1 from_commit=c49f7f56b47a6a00da257ac7e4fd066dba51dcbf backup_restore=1 multi_instance=1 port_already_use=0