Bump version + Changelog

akirk · Jun 5, 2024 · 6a505fa · 6a505fa
1 parent 5131473
commit 6a505fa
Show file tree

Hide file tree

Showing 4 changed files with 42 additions and 22 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,10 @@
+### 2.9.3
+- Fix Rewrite for Categories ([#322])
+- Show Comments and the Form on Permalink pages ([#321])
+- Don't allow to follow any local URL to prevent loops ([#320])
+- Enable Mastodon Apps Updates: Cache the post when replying to it ([#318]), Map back the canonical user id to a user ([#317])
+- Allow a dot in the ActivityPub username ([#316])
+
 ### 2.9.2
 - Fix Friend Request notification setting saving ([#313])
 - Add a Stats Widget ([#297])
@@ -234,7 +241,12 @@
 - Add Emoji reactions
 - Add blog to blog messaging
 
-[Send to E-Reader plugin]: https://github.com/akirk/friends-send-to-e-reader
+[#322]: https://github.com/akirk/friends/pull/322
+[#321]: https://github.com/akirk/friends/pull/321
+[#320]: https://github.com/akirk/friends/pull/320
+[#318]: https://github.com/akirk/friends/pull/318
+[#317]: https://github.com/akirk/friends/pull/317
+[#316]: https://github.com/akirk/friends/pull/316
 [#313]: https://github.com/akirk/friends/pull/313
 [#297]: https://github.com/akirk/friends/pull/297
 [#310]: https://github.com/akirk/friends/pull/310
@@ -322,3 +334,4 @@
 [#107]: https://github.com/akirk/friends/pull/107
 [activitypub#213]: https://github.com/pfefferle/wordpress-activitypub/pull/213
 [activitypub#172]: https://github.com/pfefferle/wordpress-activitypub/pull/172
+[Send to E-Reader plugin]: https://github.com/akirk/friends-send-to-e-reader
diff --git a/README.md b/README.md
@@ -5,7 +5,7 @@
 - Requires at least: 5.0
 - Tested up to: 6.5
 - License: GPL-2.0-or-later
-- Stable tag: 2.9.2
+- Stable tag: 2.9.3
 
 Your own WordPress at the center of your online activity. Follow friends and other websites and establish friendship relationships between blogs.
 
@@ -94,6 +94,13 @@ There is a cache of your friends post in form of a Custom Post Type friend_post
 
 ## Changelog
 
+### 2.9.3
+- Fix Rewrite for Categories ([#322])
+- Show Comments and the Form on Permalink pages ([#321])
+- Don't allow to follow any local URL to prevent loops ([#320])
+- Enable Mastodon Apps Updates: Cache the post when replying to it ([#318]), Map back the canonical user id to a user ([#317])
+- Allow a dot in the ActivityPub username ([#316])
+
 ### 2.9.2
 - Fix Friend Request notification setting saving ([#313])
 - Add a Stats Widget ([#297])
@@ -109,12 +116,12 @@ There is a cache of your friends post in form of a Custom Post Type friend_post
 ### 2.9.0
 - Fix issues discovered by the plugin check plugin ([#301])
 
-### 2.8.9
-- One more fix to the update routine for previous version
-
-### 2.8.8
-- Fix update routine for previous version
-
+[#322]: https://github.com/akirk/friends/pull/322
+[#321]: https://github.com/akirk/friends/pull/321
+[#320]: https://github.com/akirk/friends/pull/320
+[#318]: https://github.com/akirk/friends/pull/318
+[#317]: https://github.com/akirk/friends/pull/317
+[#316]: https://github.com/akirk/friends/pull/316
 [#313]: https://github.com/akirk/friends/pull/313
 [#297]: https://github.com/akirk/friends/pull/297
 [#310]: https://github.com/akirk/friends/pull/310

diff --git a/bin/release.sh b/bin/release.sh
@@ -35,18 +35,6 @@ fi
 echo -ne "\033[32m✔\033[0m "
 echo "svn up to date"
 
-git diff-files --quiet
-if [ $? -eq 1 ]; then
-	echo -ne "\033[31m✘\033[0m "
-	echo "Unstaged changes in git"
-	echo
-	echo ❯ git status
-	git status
-	return
-fi
-echo -ne "\033[32m✔\033[0m "
-echo "No unstaged changes in git"
-
 git tag | egrep -q ^$FRIENDS_VERSION\$
 if [ $? -eq 0 ]; then
 	echo -ne "\033[31m✘\033[0m "
@@ -109,6 +97,18 @@ echo -ne "\033[32m✔\033[0m "
 echo "No unknown files in svn"
 echo
 
+git diff-files --quiet
+if [ $? -eq 1 ]; then
+	echo -ne "\033[31m✘\033[0m "
+	echo "Unstaged changes in git"
+	echo
+	echo ❯ git status
+	git status
+	return
+fi
+echo -ne "\033[32m✔\033[0m "
+echo "No unstaged changes in git"
+
 echo -ne "\033[32m✔\033[0m "
 echo "All looks good, ready to tag and commit!"
 echo -n ❯ git push

diff --git a/friends.php b/friends.php
@@ -3,7 +3,7 @@
  * Plugin name: Friends
  * Plugin author: Alex Kirk
  * Plugin URI: https://github.com/akirk/friends
- * Version: 2.9.2
+ * Version: 2.9.3
  * Requires PHP: 5.6
 
  * Description: A social network between WordPresses. Privacy focused, by itself a self-hosted RSS++ reader with notifications.
@@ -25,7 +25,7 @@
 define( 'FRIENDS_PLUGIN_DIR', plugin_dir_path( __FILE__ ) );
 define( 'FRIENDS_PLUGIN_BASENAME', plugin_basename( __FILE__ ) );
 define( 'FRIENDS_PLUGIN_FILE', plugin_dir_path( __FILE__ ) . '/' . basename( __FILE__ ) );
-define( 'FRIENDS_VERSION', '2.9.2' );
+define( 'FRIENDS_VERSION', '2.9.3' );
 
 require_once __DIR__ . '/libs/Mf2/Parser.php';