From 7392fc18abc1eb93b9377bd198e9d86ab3326d2f Mon Sep 17 00:00:00 2001 From: navanchauhan Date: Tue, 31 May 2022 17:48:04 -0600 Subject: [PATCH 1/2] bump to 2022.03 --- manifest.json | 2 +- scripts/_common.sh | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/manifest.json b/manifest.json index 704cf4a..4ca9313 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Social Communication Server", "fr": "Serveur de Communication Social" }, - "version": "2022.02~ynh1", + "version": "2022.03~ynh1", "url": "http://friendi.ca", "upstream": { "license": "AGPL-3.0-only", diff --git a/scripts/_common.sh b/scripts/_common.sh index d831678..8c5cefb 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -5,9 +5,9 @@ #================================================= # commit hashes -# 2021.09 -version_commit="72c4ed95f16e82239924099254a3d8fc9638cd07" -addons_version_commit="dd6bf79e194ed5bdf0a40ee3c5ad76cceb24d31d" +# 2022.03 +version_commit="f660c3894411d5a55ad201b0da8d46715b5b5002" +addons_version_commit="c35a6d58345ef7f99534f465d8453bccdca80450" # dependencies used by the app YNH_PHP_VERSION="7.3" From 2c1116170ff58aabf3213f7de871f1ebe2b6e650 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sat, 11 Jun 2022 06:55:58 +0000 Subject: [PATCH 2/2] Auto-update README --- README.md | 23 ++++++++++++----------- README_fr.md | 29 +++++++++++++++++------------ 2 files changed, 29 insertions(+), 23 deletions(-) diff --git a/README.md b/README.md index 5f68f08..7e0b3ae 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ It shall NOT be edited by hand. # Friendica for YunoHost -[![Integration level](https://dash.yunohost.org/integration/friendica.svg)](https://dash.yunohost.org/appci/app/friendica) ![](https://ci-apps.yunohost.org/ci/badges/friendica.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/friendica.maintain.svg) +[![Integration level](https://dash.yunohost.org/integration/friendica.svg)](https://dash.yunohost.org/appci/app/friendica) ![Working status](https://ci-apps.yunohost.org/ci/badges/friendica.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/friendica.maintain.svg) [![Install Friendica with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=friendica) *[Lire ce readme en français.](./README_fr.md)* @@ -19,13 +19,13 @@ Friendica is a decentralised communications platform that integrates social comm Friendica connects you effortlessly to a federated communications network of several thousand servers, with more than half a million user registrations. You can directly connect to anyone on Friendica, Mastodon, Diaspora, GnuSocial, Pleroma, or Hubzilla, regardless where each user profile is hosted. -**Shipped version:** 2022.02~ynh1 +**Shipped version:** 2022.03~ynh1 **Demo:** https://dir.friendica.social/servers ## Screenshots -![](./doc/screenshots/friendica-vier-profile.png) +![Screenshot of Friendica](./doc/screenshots/friendica-vier-profile.png) ## Disclaimers / important information @@ -51,22 +51,23 @@ Use the YunoHost admin panel to install Friendica by entering the GitHub repo ad ## Documentation and resources -* Official app website: http://friendi.ca -* Official user documentation: https://wiki.friendi.ca/ -* Official admin documentation: https://github.com/friendica/friendica/wiki -* Upstream app code repository: https://github.com/friendica/friendica -* YunoHost documentation for this app: https://yunohost.org/app_friendica -* Report a bug: https://github.com/YunoHost-Apps/friendica_ynh/issues +* Official app website: +* Official user documentation: +* Official admin documentation: +* 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/friendica_ynh/tree/testing). To try the testing branch, please proceed like that. -``` + +``` bash sudo yunohost app install https://github.com/YunoHost-Apps/friendica_ynh/tree/testing --debug or sudo yunohost app upgrade friendica -u https://github.com/YunoHost-Apps/friendica_ynh/tree/testing --debug ``` -**More info regarding app packaging:** https://yunohost.org/packaging_apps \ No newline at end of file +**More info regarding app packaging:** diff --git a/README_fr.md b/README_fr.md index 75f61e5..db5ed87 100644 --- a/README_fr.md +++ b/README_fr.md @@ -1,10 +1,14 @@ + + # Friendica pour YunoHost -[![Niveau d'intégration](https://dash.yunohost.org/integration/friendica.svg)](https://dash.yunohost.org/appci/app/friendica) ![](https://ci-apps.yunohost.org/ci/badges/friendica.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/friendica.maintain.svg) +[![Niveau d'intégration](https://dash.yunohost.org/integration/friendica.svg)](https://dash.yunohost.org/appci/app/friendica) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/friendica.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/friendica.maintain.svg) [![Installer Friendica avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=friendica) *[Read this readme in english.](./README.md)* -*[Lire ce readme en français.](./README_fr.md)* > *Ce package vous permet d'installer Friendica 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.* @@ -15,13 +19,13 @@ Friendica is a decentralised communications platform that integrates social comm Friendica connects you effortlessly to a federated communications network of several thousand servers, with more than half a million user registrations. You can directly connect to anyone on Friendica, Mastodon, Diaspora, GnuSocial, Pleroma, or Hubzilla, regardless where each user profile is hosted. -**Version incluse :** 2022.02~ynh1 +**Version incluse :** 2022.03~ynh1 **Démo :** https://dir.friendica.social/servers ## Captures d'écran -![](./doc/screenshots/friendica-vier-profile.png) +![Capture d'écran de Friendica](./doc/screenshots/friendica-vier-profile.png) ## Avertissements / informations importantes @@ -47,22 +51,23 @@ https://github.com/YunoHost-Apps/friendica_ynh ## Documentations et ressources -* Site officiel de l'app : http://friendi.ca -* Documentation officielle utilisateur : https://wiki.friendi.ca/ -* Documentation officielle de l'admin : https://github.com/friendica/friendica/wiki -* Dépôt de code officiel de l'app : https://github.com/friendica/friendica -* Documentation YunoHost pour cette app : https://yunohost.org/app_friendica -* Signaler un bug : https://github.com/YunoHost-Apps/friendica_ynh/issues +* Site officiel de l'app : +* Documentation officielle utilisateur : +* Documentation officielle de l'admin : +* 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/friendica_ynh/tree/testing). Pour essayer la branche testing, procédez comme suit. -``` + +``` bash sudo yunohost app install https://github.com/YunoHost-Apps/friendica_ynh/tree/testing --debug ou sudo yunohost app upgrade friendica -u https://github.com/YunoHost-Apps/friendica_ynh/tree/testing --debug ``` -**Plus d'infos sur le packaging d'applications :** https://yunohost.org/packaging_apps \ No newline at end of file +**Plus d'infos sur le packaging d'applications :**