From 46d0b92302249c497b1b6362349674f32fd96247 Mon Sep 17 00:00:00 2001 From: tituspijean Date: Thu, 4 Aug 2022 17:02:40 +0200 Subject: [PATCH 1/2] Fix plugins branch to stable --- scripts/install | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/install b/scripts/install index 2b528a7..39c1463 100644 --- a/scripts/install +++ b/scripts/install @@ -87,7 +87,7 @@ ynh_script_progression --message="Setting up source files..." --weight=5 ynh_app_setting_set --app=$app --key=final_path --value=$final_path -# 1 - Clone stable repo +# 1 - Clone stable repo git clone --quiet https://github.com/friendica/friendica.git -b stable "$final_path" # Reset branch to the level of update we needed pushd "$final_path" @@ -97,8 +97,8 @@ popd # Copy .htaccess-dist to ..htaccess cp -f "$final_path/.htaccess-dist" "$final_path/.htaccess" -# 2 - Clone addons repo -git clone --quiet https://github.com/friendica/friendica-addons.git -b develop "$final_path/addon" +# 2 - Clone addons repo +git clone --quiet https://github.com/friendica/friendica-addons.git -b stable "$final_path/addon" # Reset addons branch to the level of update we needed pushd "$final_path/addon" git reset --hard --quiet $addons_version_commit From 5c5982ae12cfbb57c430a6642c2cf9d820feb186 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sat, 12 Nov 2022 08:19:33 +0000 Subject: [PATCH 2/2] Auto-update README --- README.md | 1 - README_fr.md | 3 +-- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/README.md b/README.md index faa9961..f9ce629 100644 --- a/README.md +++ b/README.md @@ -21,7 +21,6 @@ Friendica connects you effortlessly to a federated communications network of sev **Shipped version:** 2022.06~ynh1 - **Demo:** https://dir.friendica.social/servers ## Screenshots diff --git a/README_fr.md b/README_fr.md index cf3fcc9..6633e87 100644 --- a/README_fr.md +++ b/README_fr.md @@ -19,8 +19,7 @@ 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.06~ynh1 - +**Version incluse :** 2022.06~ynh1 **Démo :** https://dir.friendica.social/servers