From a39e0217a28f0f8741d2ab8ca8e51e2eabd96ec1 Mon Sep 17 00:00:00 2001 From: faisal-alvi Date: Thu, 8 Dec 2022 14:55:06 +0530 Subject: [PATCH 1/6] update the list numbers and add full stops --- readme.txt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/readme.txt b/readme.txt index 0f0b4b16..93bfd5f1 100644 --- a/readme.txt +++ b/readme.txt @@ -17,12 +17,12 @@ Adds an avatar upload field to user profiles if the current user has media permi Just edit a user profile, and scroll down to the new "Avatar" field. The plug-in will take care of cropping and sizing! -1. Stores avatars in the "uploads" folder where all of your other media is kept -1. Has a simple, native interface -1. Fully supports Gravatar and default avatars if no local avatar is set for the user - but also allows you turn off Gravatar -1. Generates the requested avatar size on demand (and stores the new size for efficiency), so it looks great, just like Gravatar! -1. Lets you decide whether lower privilege users (subscribers, contributors) can upload their own avatar -1. Enables rating of local avatars, just like Gravatar +1. Stores avatars in the "uploads" folder where all of your other media is kept. +2. Has a simple, native interface. +3. Fully supports Gravatar and default avatars if no local avatar is set for the user - but also allows you turn off Gravatar. +4. Generates the requested avatar size on demand (and stores the new size for efficiency), so it looks great, just like Gravatar! +5. Lets you decide whether lower privilege users (subscribers, contributors) can upload their own avatar. +6. Enables rating of local avatars, just like Gravatar. == Installation == From 35117a46b84b6a4e23adfecbb4441bc905fbab09 Mon Sep 17 00:00:00 2001 From: faisal-alvi Date: Thu, 8 Dec 2022 15:39:29 +0530 Subject: [PATCH 2/6] update the release steps --- CONTRIBUTING.md | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index b335dddf..b764d194 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -31,16 +31,17 @@ The `develop` branch is the development branch which means it contains the next - [ ] Branch: Starting from `develop`, cut a release branch named `release/X.Y.Z` for your changes. - [ ] Version bump: Bump the version number in `package.json`, `readme.txt`, and `simple-local-avatars.php` if it does not already reflect the version being released. Update both the plugin "Version:" property and the plugin `SLA_VERSION` constant in `simple-local-avatars.php`. - [ ] Changelog: Add/update the changelog in both `CHANGELOG.md` and `readme.txt`. (Recommendation to use: https://github.com/10up/changelog-generator) -- [ ] Props: update `CREDITS.md` with any new contributors, confirm maintainers are accurate. (Recommendation to use: https://github.com/10up/credits-generator) +- [ ] Props: update `CREDITS.md` with any new contributors, and confirm maintainers are accurate. (Recommendation to use: https://github.com/10up/credits-generator) - [ ] New files: Check to be sure any new files/paths that are unnecessary in the production version are included in [.distignore](https://github.com/10up/simple-local-avatars/blob/develop/.distignore). - [ ] Readme updates: Make any other readme changes as necessary. `README.md` is geared toward GitHub and `readme.txt` contains WordPress.org-specific content. The two are slightly different. - [ ] Make sure the release date is added in the `CHANGELOG.md`. - [ ] Merge: Make a non-fast-forward merge from your release branch to `develop` (or merge the pull request), then do the same for `develop` into `trunk` (`git checkout trunk && git merge --no-ff develop`). `trunk` contains the latest stable release. +- [ ] Take the latest ` develop` pull in your local, this is for the merged release PR changes. - [ ] Test: Run through common tasks while on `trunk` to be sure it functions correctly. - [ ] Push: Push your `trunk` branch to GitHub (e.g. `git push origin trunk`). -- [ ] Test the pre-release ZIP locally by downloading it from the **Build release zip** action artifact to ensure the plugin doesn't break after release. +- [ ] Test the pre-release ZIP locally by [downloading](https://github.com/10up/simple-local-avatars/actions/workflows/build-release-zip.yml) it from the **Build release zip** action artifact to ensure the plugin doesn't break after release. - [ ] Release: Create a [new release](https://github.com/10up/simple-local-avatars/releases/new), naming the tag and the release with the new version number, and targeting the `trunk` branch. Paste the changelog from `CHANGELOG.md` into the body of the release and include a link to the [closed issues on the milestone](https://github.com/10up/simple-local-avatars/milestone/#?closed=1). -- [ ] SVN: Wait for the [GitHub Action](https://github.com/10up/simple-local-avatars/actions) to finish deploying to the WordPress.org repository. If all goes well, users with SVN commit access for that plugin will receive an emailed diff of changes. +- [ ] SVN: Wait for the [GitHub Action](https://github.com/10up/simple-local-avatars/actions/workflows/push-deploy.yml) to finish deploying to the WordPress.org repository. If all goes well, users with SVN commit access for that plugin will receive an emailed diff of changes. - [ ] Check WordPress.org: Ensure that the changes are live on https://wordpress.org/plugins/simple-local-avatars/. This may take a few minutes. - [ ] Close the milestone: Edit the [milestone](https://github.com/10up/simple-local-avatars/milestone/#) with the release date (in the `Due date (optional)` field) and link to the GitHub release (in the `Description` field), then close the milestone. - [ ] Punt incomplete items: If any open issues or PRs which were milestoned for `X.Y.Z` do not make it into the release, update their milestone to `X.Y.Z+1`, `X.Y+1.0`, `X+1.0.0` or `Future Release`. From 0e2e7b26231f537dc7340d156c44512d4e8905ff Mon Sep 17 00:00:00 2001 From: faisal-alvi Date: Thu, 8 Dec 2022 15:40:53 +0530 Subject: [PATCH 3/6] bump the stable version --- package-lock.json | 4 ++-- package.json | 2 +- readme.txt | 4 ++-- simple-local-avatars.php | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/package-lock.json b/package-lock.json index d96b1d86..869c644c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "simple-local-avatars", - "version": "2.7.0", + "version": "2.7.1", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "simple-local-avatars", - "version": "2.7.0", + "version": "2.7.1", "license": "GNU General Public License v2.0", "devDependencies": { "@10up/cypress-wp-utils": "github:10up/cypress-wp-utils#build", diff --git a/package.json b/package.json index 8510bd42..627d865a 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "simple-local-avatars", - "version": "2.7.0", + "version": "2.7.1", "description": "Adds an avatar upload field to user profiles. Generates requested sizes on demand just like Gravatar!", "scripts": { "build": "wp-scripts build", diff --git a/readme.txt b/readme.txt index 0f0b4b16..bb4382a2 100644 --- a/readme.txt +++ b/readme.txt @@ -5,7 +5,7 @@ Tags: avatar, gravatar, user photos, users, profile Requires at least: 5.7 Tested up to: 6.1 Requires PHP: 7.4 -Stable tag: 2.7.0 +Stable tag: 2.7.1 License: GPLv2 or later License URI: http://www.gnu.org/licenses/gpl-2.0.html @@ -41,7 +41,7 @@ You can also use `get_simple_local_avatar()` (with the same arguments) to retrei == Changelog == -= 2.7.0] = 2022-12-08 += 2.7.0 = 2022-12-08 * **Added:** Added `Build release zip` GitHub Action (props [@peterwilsoncc](https://github.com/peterwilsoncc), [@faisal-alvi](https://github.com/faisal-alvi) via [#168](https://github.com/10up/simple-local-avatars/pull/168)). * **Changed:** Set plugin defaults on `wp_initialize_site` instead of deprecated action `wpmu_new_blog` (props [@kadamwhite](https://github.com/kadamwhite), [@faisal-alvi](https://github.com/faisal-alvi) via [#156](https://github.com/10up/simple-local-avatars/pull/156)). * **Changed:** Support Level from Active to Stable (props [@jeffpaul](https://github.com/jeffpaul), [@dkotter](https://github.com/dkotter) via [#159](https://github.com/10up/simple-local-avatars/pull/159)). diff --git a/simple-local-avatars.php b/simple-local-avatars.php index 9a640e6a..6f1f004a 100644 --- a/simple-local-avatars.php +++ b/simple-local-avatars.php @@ -3,7 +3,7 @@ * Plugin Name: Simple Local Avatars * Plugin URI: https://10up.com/plugins/simple-local-avatars-wordpress/ * Description: Adds an avatar upload field to user profiles. Generates requested sizes on demand, just like Gravatar! Simple and lightweight. - * Version: 2.7.0 + * Version: 2.7.1 * Requires at least: 5.7 * Requires PHP: 7.4 * Author: Jake Goldman, 10up @@ -20,7 +20,7 @@ require_once dirname( __FILE__ ) . '/includes/class-simple-local-avatars.php'; // Global constants. -define( 'SLA_VERSION', '2.7.0' ); +define( 'SLA_VERSION', '2.7.1' ); define( 'SLA_PLUGIN_URL', plugin_dir_url( __FILE__ ) ); if ( ! defined( 'SLA_IS_NETWORK' ) ) { From c2bfcf2eebd1fd4994edd7a82e6de1a770e5618f Mon Sep 17 00:00:00 2001 From: faisal-alvi Date: Thu, 8 Dec 2022 15:48:13 +0530 Subject: [PATCH 4/6] updated the changelog and readme files --- CHANGELOG.md | 5 +++++ readme.txt | 3 +++ 2 files changed, 8 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 224753b7..ec2d1043 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file, per [the Ke ## [Unreleased] - TBD +## [2.7.1] - 2022-12-08 +### Added +- Added missing files from the last release and changed the readme file to fix the bullet points and added fullstops. + ## [2.7.0] - 2022-12-08 ### Added - Added `Build release zip` GitHub Action (props [@peterwilsoncc](https://github.com/peterwilsoncc), [@faisal-alvi](https://github.com/faisal-alvi) via [#168](https://github.com/10up/simple-local-avatars/pull/168)). @@ -207,6 +211,7 @@ All notable changes to this project will be documented in this file, per [the Ke - Initial release [Unreleased]: https://github.com/10up/simple-local-avatars/compare/trunk...develop +[2.7.0]: https://github.com/10up/simple-local-avatars/compare/2.7.0...2.7.1 [2.7.0]: https://github.com/10up/simple-local-avatars/compare/2.6.0...2.7.0 [2.6.0]: https://github.com/10up/simple-local-avatars/compare/2.5.0...2.6.0 [2.5.0]: https://github.com/10up/simple-local-avatars/compare/2.4.0...2.5.0 diff --git a/readme.txt b/readme.txt index 90bb42ed..3cffeced 100644 --- a/readme.txt +++ b/readme.txt @@ -41,6 +41,9 @@ You can also use `get_simple_local_avatar()` (with the same arguments) to retrei == Changelog == += 2.7.1 = 2022-12-08 +* **Added:** Added missing files from the last release and changed the readme file to fix the bullet points and added fullstops. + = 2.7.0 = 2022-12-08 * **Added:** Added `Build release zip` GitHub Action (props [@peterwilsoncc](https://github.com/peterwilsoncc), [@faisal-alvi](https://github.com/faisal-alvi) via [#168](https://github.com/10up/simple-local-avatars/pull/168)). * **Changed:** Set plugin defaults on `wp_initialize_site` instead of deprecated action `wpmu_new_blog` (props [@kadamwhite](https://github.com/kadamwhite), [@faisal-alvi](https://github.com/faisal-alvi) via [#156](https://github.com/10up/simple-local-avatars/pull/156)). From 5dbf8a8ed1242200adb31c08d8af243709b67652 Mon Sep 17 00:00:00 2001 From: faisal-alvi Date: Thu, 8 Dec 2022 16:06:00 +0530 Subject: [PATCH 5/6] minor fixes in readme files --- CONTRIBUTING.md | 2 +- readme.txt | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index b764d194..8c4938f1 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -35,8 +35,8 @@ The `develop` branch is the development branch which means it contains the next - [ ] New files: Check to be sure any new files/paths that are unnecessary in the production version are included in [.distignore](https://github.com/10up/simple-local-avatars/blob/develop/.distignore). - [ ] Readme updates: Make any other readme changes as necessary. `README.md` is geared toward GitHub and `readme.txt` contains WordPress.org-specific content. The two are slightly different. - [ ] Make sure the release date is added in the `CHANGELOG.md`. -- [ ] Merge: Make a non-fast-forward merge from your release branch to `develop` (or merge the pull request), then do the same for `develop` into `trunk` (`git checkout trunk && git merge --no-ff develop`). `trunk` contains the latest stable release. - [ ] Take the latest ` develop` pull in your local, this is for the merged release PR changes. +- [ ] Merge: Make a non-fast-forward merge from your release branch to `develop` (or merge the pull request), then do the same for `develop` into `trunk` (`git checkout trunk && git merge --no-ff develop`). `trunk` contains the latest stable release. - [ ] Test: Run through common tasks while on `trunk` to be sure it functions correctly. - [ ] Push: Push your `trunk` branch to GitHub (e.g. `git push origin trunk`). - [ ] Test the pre-release ZIP locally by [downloading](https://github.com/10up/simple-local-avatars/actions/workflows/build-release-zip.yml) it from the **Build release zip** action artifact to ensure the plugin doesn't break after release. diff --git a/readme.txt b/readme.txt index 3cffeced..4bced927 100644 --- a/readme.txt +++ b/readme.txt @@ -41,10 +41,10 @@ You can also use `get_simple_local_avatar()` (with the same arguments) to retrei == Changelog == -= 2.7.1 = 2022-12-08 += 2.7.1 - 2022-12-08 = * **Added:** Added missing files from the last release and changed the readme file to fix the bullet points and added fullstops. -= 2.7.0 = 2022-12-08 += 2.7.0 - 2022-12-08 = * **Added:** Added `Build release zip` GitHub Action (props [@peterwilsoncc](https://github.com/peterwilsoncc), [@faisal-alvi](https://github.com/faisal-alvi) via [#168](https://github.com/10up/simple-local-avatars/pull/168)). * **Changed:** Set plugin defaults on `wp_initialize_site` instead of deprecated action `wpmu_new_blog` (props [@kadamwhite](https://github.com/kadamwhite), [@faisal-alvi](https://github.com/faisal-alvi) via [#156](https://github.com/10up/simple-local-avatars/pull/156)). * **Changed:** Support Level from Active to Stable (props [@jeffpaul](https://github.com/jeffpaul), [@dkotter](https://github.com/dkotter) via [#159](https://github.com/10up/simple-local-avatars/pull/159)). From 8399cab56f6fc4e24c7ad74e203f78cb613348f4 Mon Sep 17 00:00:00 2001 From: Darin Kotter Date: Thu, 8 Dec 2022 07:46:22 -0700 Subject: [PATCH 6/6] Some wording tweaks and version change --- CHANGELOG.md | 2 +- CONTRIBUTING.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ec2d1043..a3f2c41e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -211,7 +211,7 @@ All notable changes to this project will be documented in this file, per [the Ke - Initial release [Unreleased]: https://github.com/10up/simple-local-avatars/compare/trunk...develop -[2.7.0]: https://github.com/10up/simple-local-avatars/compare/2.7.0...2.7.1 +[2.7.1]: https://github.com/10up/simple-local-avatars/compare/2.7.0...2.7.1 [2.7.0]: https://github.com/10up/simple-local-avatars/compare/2.6.0...2.7.0 [2.6.0]: https://github.com/10up/simple-local-avatars/compare/2.5.0...2.6.0 [2.5.0]: https://github.com/10up/simple-local-avatars/compare/2.4.0...2.5.0 diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 8c4938f1..0b95b9e0 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -35,7 +35,7 @@ The `develop` branch is the development branch which means it contains the next - [ ] New files: Check to be sure any new files/paths that are unnecessary in the production version are included in [.distignore](https://github.com/10up/simple-local-avatars/blob/develop/.distignore). - [ ] Readme updates: Make any other readme changes as necessary. `README.md` is geared toward GitHub and `readme.txt` contains WordPress.org-specific content. The two are slightly different. - [ ] Make sure the release date is added in the `CHANGELOG.md`. -- [ ] Take the latest ` develop` pull in your local, this is for the merged release PR changes. +- [ ] Before proceeding to the next step, ensure you pull the latest changes from the `develop` branch locally. This will bring in the changes from the merged release PR. - [ ] Merge: Make a non-fast-forward merge from your release branch to `develop` (or merge the pull request), then do the same for `develop` into `trunk` (`git checkout trunk && git merge --no-ff develop`). `trunk` contains the latest stable release. - [ ] Test: Run through common tasks while on `trunk` to be sure it functions correctly. - [ ] Push: Push your `trunk` branch to GitHub (e.g. `git push origin trunk`).