From a5968de9314138dc145fedc8623a1541bfcc77ae Mon Sep 17 00:00:00 2001 From: Faisal Alvi Date: Mon, 27 Jun 2022 15:35:31 +0530 Subject: [PATCH 1/6] Update CONTRIBUTING.md --- CONTRIBUTING.md | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index b589cdb..c633c1d 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -45,16 +45,17 @@ The `develop` branch is the development branch which means it contains the next ## Release instructions -1. Branch: Starting from `develop`, cut a release branch named `release/X.Y.Z` for your changes. -1. Version bump: Bump the version number in `package-lock.json`, `package.json`, `publisher-media-kit.php`, `readme.txt`, and any other relevant files if it does not already reflect the version being released. Update both the plugin "Version:" property and the plugin `PUBLISHER_MEDIA_KIT_VERSION` constant in `publisher-media-kit.php`. -1. Changelog: Add/update the changelog in `CHANGELOG.md` and `readme.txt`. -1. Props: update `CREDITS.md` file with any new contributors, confirm maintainers are accurate. -1. New files: Check to be sure any new files/paths that are unnecessary in the production version are included in `.distignore`. -1. 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. -1. 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 stable development version. -1. Push: Push your `trunk` branch to GitHub (e.g. `git push origin trunk`). -1. Release: Create a [new release](https://github.com/10up/publisher-media-kit/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/publisher-media-kit/milestone/#?closed=1). -1. SVN: Wait for the [GitHub Action](https://github.com/10up/publisher-media-kit/actions/workflows/dotorg-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. -1. Check WordPress.org: Ensure that the changes are live on https://wordpress.org/plugins/publisher-media-kit/. This may take a few minutes. -1. Close milestone: Edit the [milestone](https://github.com/10up/publisher-media-kit/milestone/#) with release date (in the `Due date (optional)` field) and link to GitHub release (in the `Description` field), then close the milestone. -1. 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`. +- [ ] Branch: Starting from `develop`, cut a release branch named `release/X.Y.Z` for your changes. +- [ ] Version bump: Bump the version number in `package-lock.json`, `package.json`, `publisher-media-kit.php`, `readme.txt`, and any other relevant files if it does not already reflect the version being released. Update both the plugin "Version:" property and the plugin `PUBLISHER_MEDIA_KIT_VERSION` constant in `publisher-media-kit.php`. +- [ ] Changelog: Add/update the changelog in `CHANGELOG.md` and `readme.txt`. (Recommendation to use: https://github.com/10up/changelog-generator) +- [ ] Props: update the `CREDITS.md` file 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/publisher-media-kit/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 stable development version. +- [ ] Push: Push your `trunk` branch to GitHub (e.g. `git push origin trunk`). +- [ ] Release: Create a [new release](https://github.com/10up/publisher-media-kit/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/publisher-media-kit/milestone/#?closed=1). +- [ ] SVN: Wait for the [GitHub Action](https://github.com/10up/publisher-media-kit/actions/workflows/dotorg-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/publisher-media-kit/. This may take a few minutes. +- [ ] Close milestone: Edit the [milestone](https://github.com/10up/publisher-media-kit/milestone/#) with release date (in the `Due date (optional)` field) and link to 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 27bdd98f1d5cc475e9f274e99438a46c59620a1e Mon Sep 17 00:00:00 2001 From: Faisal Alvi Date: Mon, 27 Jun 2022 15:46:12 +0530 Subject: [PATCH 2/6] Update CONTRIBUTING.md --- CONTRIBUTING.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index c633c1d..d4c086e 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -53,6 +53,7 @@ The `develop` branch is the development branch which means it contains the next - [ ] 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 stable development version. +- [ ] 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`). - [ ] Release: Create a [new release](https://github.com/10up/publisher-media-kit/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/publisher-media-kit/milestone/#?closed=1). - [ ] SVN: Wait for the [GitHub Action](https://github.com/10up/publisher-media-kit/actions/workflows/dotorg-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. From d2427ba4fb9a73dababf5ac07185c0df9d4584eb Mon Sep 17 00:00:00 2001 From: Darin Kotter Date: Wed, 13 Jul 2022 13:12:56 -0600 Subject: [PATCH 3/6] Add back the image assets directory and exclude the css, js and svg asset directories only. Change block markup back to reference the assets directory --- .distignore | 4 +++- includes/block-patterns/audience-profiles.php | 2 +- includes/block-patterns/cover-esperanza.php | 2 +- includes/block-patterns/cover.php | 2 +- includes/block-patterns/why-digital.php | 2 +- 5 files changed, 7 insertions(+), 5 deletions(-) diff --git a/.distignore b/.distignore index 474dc6b..a1f3cba 100644 --- a/.distignore +++ b/.distignore @@ -5,7 +5,9 @@ /bin /node_modules /tests -/assets +/assets/css +/assets/js +/assets/svg # Files .distignore diff --git a/includes/block-patterns/audience-profiles.php b/includes/block-patterns/audience-profiles.php index 89e2ab3..6f251ab 100644 --- a/includes/block-patterns/audience-profiles.php +++ b/includes/block-patterns/audience-profiles.php @@ -1,4 +1,4 @@ -

Audience Profiles

Female visitors

The average female visitor is
38 years old

Male visitors

The average male visitor is
52 years old

+

Audience Profiles

Female visitors

The average female visitor is
38 years old

Male visitors

The average male visitor is
52 years old

diff --git a/includes/block-patterns/cover-esperanza.php b/includes/block-patterns/cover-esperanza.php index c678cba..a32d389 100644 --- a/includes/block-patterns/cover-esperanza.php +++ b/includes/block-patterns/cover-esperanza.php @@ -1,4 +1,4 @@ -

Media Kit

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer dui
tortor, porttitor ut enim non, iaculis sagittis dolor.

CONTACT US
+

Media Kit

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer dui
tortor, porttitor ut enim non, iaculis sagittis dolor.

CONTACT US
diff --git a/includes/block-patterns/cover.php b/includes/block-patterns/cover.php index b198b52..a8e1313 100644 --- a/includes/block-patterns/cover.php +++ b/includes/block-patterns/cover.php @@ -1,4 +1,4 @@ -

Media Kit

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer dui
tortor, porttitor ut enim non, iaculis sagittis dolor.

CONTACT US
+

Media Kit

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer dui
tortor, porttitor ut enim non, iaculis sagittis dolor.

CONTACT US
diff --git a/includes/block-patterns/why-digital.php b/includes/block-patterns/why-digital.php index f5212d2..f5bea1d 100644 --- a/includes/block-patterns/why-digital.php +++ b/includes/block-patterns/why-digital.php @@ -1,4 +1,4 @@ -

Why you should choose digital

Female visitors

Source

10up is the leading news source in Sacramento. Making it Northern California’s GO-TO choice to stay informed on anything news, weather, sports & entertainment.

Female visitors

Visibility

All ad units across the site have a viewability percentage of 70% of higher, making “above-the-fold” a thing of the past!

Female visitors

Measure

10up has Measurable ROI! Ads on 10up.com have high click-through percentages against industry benchmark rates.

CONTACT US
+

Why you should choose digital

Female visitors

Source

10up is the leading news source in Sacramento. Making it Northern California’s GO-TO choice to stay informed on anything news, weather, sports & entertainment.

Female visitors

Visibility

All ad units across the site have a viewability percentage of 70% of higher, making “above-the-fold” a thing of the past!

Female visitors

Measure

10up has Measurable ROI! Ads on 10up.com have high click-through percentages against industry benchmark rates.

CONTACT US
From 31644a45860e71c3bf1a39dd711f4ec0d1eff788 Mon Sep 17 00:00:00 2001 From: Jeffrey Paul Date: Thu, 14 Jul 2022 12:20:24 -0500 Subject: [PATCH 4/6] add missing release links in CHANGELOG.md --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index f8d2018..cfd4b46 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ All notable changes to this project will be documented in this file, per [the Keep a Changelog standard](http://keepachangelog.com/). Moving forward, this project will (more strictly) adhere to [Semantic Versioning](http://semver.org/). +## [Unreleased] - TBD + ## [1.2.0] - 2022-06-27 ### Added - Dependency security scanning. (props [@jeffpaul.](https://github.com/jeffpaul), [@faisal-alvi](https://github.com/faisal-alvi) via [#84](https://github.com/10up/publisher-media-kit/pull/84)) @@ -43,5 +45,7 @@ All notable changes to this project will be documented in this file, per [the Ke - Initial private plugin release 🎉 [Unreleased]: https://github.com/10up/publisher-media-kit/compare/trunk...develop +[1.2.0]: https://github.com/10up/publisher-media-kit/compare/1.1.0...1.2.0 +[1.1.0]: https://github.com/10up/publisher-media-kit/compare/1.0.0...1.1.0 [1.0.0]: https://github.com/10up/publisher-media-kit/compare/0.9.0...1.0.0 [0.9.0]: https://github.com/10up/publisher-media-kit/tree/0.9.0 From 5977b9da095bd1d3e04282792f6b68dc198ba294 Mon Sep 17 00:00:00 2001 From: Darin Kotter Date: Mon, 18 Jul 2022 14:41:27 -0600 Subject: [PATCH 5/6] Version bumps to 1.2.1 --- package-lock.json | 2 +- package.json | 2 +- publisher-media-kit.php | 4 ++-- readme.txt | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index 92e0562..a2287c7 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "publisher-media-kit", - "version": "1.2.0", + "version": "1.2.1", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 6a91fa2..9de3806 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "publisher-media-kit", - "version": "1.2.0", + "version": "1.2.1", "scripts": { "start": "10up-toolkit start", "watch": "10up-toolkit watch", diff --git a/publisher-media-kit.php b/publisher-media-kit.php index 34acdf7..63efbc2 100755 --- a/publisher-media-kit.php +++ b/publisher-media-kit.php @@ -3,7 +3,7 @@ * Plugin Name: Publisher Media Kit * Plugin URI: https://github.com/10up/publisher-media-kit * Description: Pre-configured Media Kit Page using Gutenberg Block Patterns. - * Version: 1.2.0 + * Version: 1.2.1 * Requires at least: 5.5 * Requires PHP: 7.0 * Author: 10up @@ -17,7 +17,7 @@ */ // Useful global constants. -define( 'PUBLISHER_MEDIA_KIT_VERSION', '1.2.0' ); +define( 'PUBLISHER_MEDIA_KIT_VERSION', '1.2.1' ); define( 'PUBLISHER_MEDIA_KIT_URL', plugin_dir_url( __FILE__ ) ); define( 'PUBLISHER_MEDIA_KIT_PATH', plugin_dir_path( __FILE__ ) ); define( 'PUBLISHER_MEDIA_KIT_BLOCKS_PATH', plugin_dir_path( __FILE__ ) . 'includes/blocks/block-editor/' ); diff --git a/readme.txt b/readme.txt index 34f1968..79e79bf 100644 --- a/readme.txt +++ b/readme.txt @@ -3,7 +3,7 @@ Contributors: 10up, jeffpaul, faisal03 Tags: media kit, audience profiles, digital ad specs, ad rates Requires at least: 5.5 Tested up to: 6.0 -Stable tag: 1.2.0 +Stable tag: 1.2.1 Requires PHP: 7.2 License: GPLv2 or later License URI: https://www.gnu.org/licenses/gpl-2.0.html From dbcf3fb345dc91a9c9022d2cc11cc77348a4b7f9 Mon Sep 17 00:00:00 2001 From: Darin Kotter Date: Mon, 18 Jul 2022 14:48:26 -0600 Subject: [PATCH 6/6] Update changelogs with new PRs --- CHANGELOG.md | 11 ++++++++++- readme.txt | 4 ++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index cfd4b46..e64657b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,9 +4,17 @@ All notable changes to this project will be documented in this file, per [the Ke ## [Unreleased] - TBD +## [1.2.1] - 2022-07-19 + +### Changed +- Updated the `CONTRIBUTING.md` file (props [@faisal-alvi](https://github.com/faisal-alvi), [@jeffpaul](https://github.com/jeffpaul) via [#89](https://github.com/10up/publisher-media-kit/pull/89)) + +### Fixed +- Bring back the `/assets/images` directory to avoid broken images (props [@dkotter](https://github.com/dkotter), [@kmwilkerson](https://github.com/kmwilkerson), [@faisal-alvi](https://github.com/faisal-alvi) via [#91](https://github.com/10up/publisher-media-kit/pull/91)) + ## [1.2.0] - 2022-06-27 ### Added -- Dependency security scanning. (props [@jeffpaul.](https://github.com/jeffpaul), [@faisal-alvi](https://github.com/faisal-alvi) via [#84](https://github.com/10up/publisher-media-kit/pull/84)) +- Dependency security scanning. (props [@jeffpaul](https://github.com/jeffpaul), [@faisal-alvi](https://github.com/faisal-alvi) via [#84](https://github.com/10up/publisher-media-kit/pull/84)) ### Changed - Bump WordPress "tested up to" version 6.0. (props [@ajmaurya99](https://github.com/ajmaurya99), [@faisal-alvi](https://github.com/faisal-alvi), [@vikrampm1](https://github.com/vikrampm1) via [#83](https://github.com/10up/publisher-media-kit/pull/83)) @@ -45,6 +53,7 @@ All notable changes to this project will be documented in this file, per [the Ke - Initial private plugin release 🎉 [Unreleased]: https://github.com/10up/publisher-media-kit/compare/trunk...develop +[1.2.1]: https://github.com/10up/publisher-media-kit/compare/1.2.0...1.2.1 [1.2.0]: https://github.com/10up/publisher-media-kit/compare/1.1.0...1.2.0 [1.1.0]: https://github.com/10up/publisher-media-kit/compare/1.0.0...1.1.0 [1.0.0]: https://github.com/10up/publisher-media-kit/compare/0.9.0...1.0.0 diff --git a/readme.txt b/readme.txt index 79e79bf..43828ce 100644 --- a/readme.txt +++ b/readme.txt @@ -57,6 +57,10 @@ We require WordPress 5.5 and above as this is when `register_block_pattern_categ == Changelog == += 1.2.1 = 2022-07-19 +* **Changed:** Updated the `CONTRIBUTING.md` file (props [@faisal-alvi](https://github.com/faisal-alvi), [@jeffpaul](https://github.com/jeffpaul) via [#89](https://github.com/10up/publisher-media-kit/pull/89)) +* **Fixed:** Bring back the `/assets/images` directory to avoid broken images (props [@dkotter](https://github.com/dkotter), [@kmwilkerson](https://github.com/kmwilkerson), [@faisal-alvi](https://github.com/faisal-alvi) via [#91](https://github.com/10up/publisher-media-kit/pull/91)) + = 1.2.0 = 2022-06-27 * **Added:** Dependency security scanning. (props [@jeffpaul.](https://github.com/jeffpaul), [@faisal-alvi](https://github.com/faisal-alvi)) via [#84](https://github.com/10up/publisher-media-kit/pull/84)) * **Changed:** Bump WordPress "tested up to" version 6.0. (props [@ajmaurya99](https://github.com/ajmaurya99), [@faisal-alvi](https://github.com/faisal-alvi), [@vikrampm1](https://github.com/vikrampm1)) via [#83](https://github.com/10up/publisher-media-kit/pull/83))