Skip to content

Commit c997bcf

Browse files
Merge branch 'develop'
2 parents 0676af6 + 13e2cd2 commit c997bcf

File tree

120 files changed

+20552
-352
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

120 files changed

+20552
-352
lines changed

CHANGELOG.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,12 @@ All notable changes to this project will be documented in this file, per [the Ke
1313
### Security
1414
-->
1515

16+
<!-- ... -->
17+
## [1.9.0] - 2024-10-31
18+
19+
### Changed
20+
* Fixed [timestamps_screenshot] button by @michael-sumner in #51
21+
1622
<!-- ... -->
1723
## [1.8.1] - 2024-10-22
1824

@@ -120,6 +126,7 @@ All notable changes to this project will be documented in this file, per [the Ke
120126
- Initial plugin release
121127

122128
[Unreleased]: https://github.com/scoredetect/timestamps/compare/trunk...develop
129+
[1.9.0]: https://github.com/scoredetect/timestamps/compare/1.8.1...1.9.0
123130
[1.8.1]: https://github.com/scoredetect/timestamps/compare/1.8.0...1.8.1
124131
[1.8.0]: https://github.com/scoredetect/timestamps/compare/1.7.0...1.8.0
125132
[1.7.0]: https://github.com/scoredetect/timestamps/compare/1.6.0...1.7.0

CONTRIBUTING.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,11 @@ The `develop` branch is the development branch which means it contains the next
2626

2727
## Release instructions
2828

29-
Open a [new blank issue](https://github.com/scoredetect/timestamps/issues/new) with `[Release] 1.8.1`, then copy and paste the following items, replacing version numbers and links to the milestone.
29+
Open a [new blank issue](https://github.com/scoredetect/timestamps/issues/new) with `[Release] 1.9.0`, then copy and paste the following items, replacing version numbers and links to the milestone.
3030

31-
- [ ] 1. Branch: Starting from `develop`, cut a release branch named `release/1.8.1` for your changes.
31+
- [ ] 1. Branch: Starting from `develop`, cut a release branch named `release/1.9.0` for your changes.
3232
- [ ] 2. Version bump: Bump the version number in `timestamps.php`, `package.json`, `package-lock.json`, `readme.txt`, and any other relevant files if it does not already reflect the version being released. In `timestamps.php` update both the plugin "Version:" property and the plugin `SDCOM_TIMESTAMPS_VERSION` constant.
33-
- [ ] 3. Changelog: Add/update the changelog in `CHANGELOG.md`, ensuring to link the [1.8.1] release reference in the footer of `CHANGELOG.md` (e.g., https://github.com/scoredetect/timestamps/compare/1.8.1-1...1.8.1).
33+
- [ ] 3. Changelog: Add/update the changelog in `CHANGELOG.md`, ensuring to link the [1.9.0] release reference in the footer of `CHANGELOG.md` (e.g., https://github.com/scoredetect/timestamps/compare/1.9.0-1...1.9.0).
3434
- [ ] 4. Props: Update `CREDITS.md` file with any new contributors, confirm maintainers are accurate.
3535
- [ ] 5. 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.
3636
- [ ] 6. New files: Check to be sure any new files/paths that are unnecessary in the production version are included in `.distignore`.
@@ -42,7 +42,7 @@ Open a [new blank issue](https://github.com/scoredetect/timestamps/issues/new) w
4242
- [ ] 12. [Check the _Build and Tag_ action](https://github.com/scoredetect/timestamps/actions/workflows/build-and-tag.yml): a new tag named with the version number should've been created. It should contain all the built assets.
4343
- [ ] 13. Release: Create a [new release](https://github.com/scoredetect/timestamps/releases/new):
4444
* **Tag**: The tag created in the previous step
45-
* **Release title**: `Version 1.8.1`
45+
* **Release title**: `Version 1.9.0`
4646
* **Description**: Release changelog from `CHANGELOG.md` + `See: https://github.com/scoredetect/timestamps/milestone/#?closed=1`
4747
- [ ] 14. SVN: Wait for the [GitHub Action](https://github.com/scoredetect/timestamps/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.
4848
- [ ] 15. Check WordPress.org: Ensure that the changes are live on https://wordpress.org/plugins/timestamps/. This may take a few minutes.
@@ -51,9 +51,9 @@ Open a [new blank issue](https://github.com/scoredetect/timestamps/issues/new) w
5151

5252
There may be cases where we have an urgent/important fix that ideally gets into a release quickly without any other changes (e.g., a "hotfix") so as to reduce (1) the amount or testing before being confident in the release and (2) to reduce the chance of unintended side effects from the extraneous non-urgent/important changes. In cases where code has previously been merged into `develop` but that ideally is not part of a hotfix, the normal release instructions above will not suffice as they would release all code merged to `develop` alongside the intended urgent/important "hotfix" change(s). In case of needing to release a "hotfix" the following are the recommended steps to take.
5353

54-
1. Branch: Starting from `main`, cut a hotfix release branch named `hotfix/1.8.1` for your hotfix change(s).
54+
1. Branch: Starting from `main`, cut a hotfix release branch named `hotfix/1.9.0` for your hotfix change(s).
5555
1. Version bump: Bump the version number in `timestamps.php`, `package.json`, `readme.txt`, and any other relevant files if it does not already reflect the version being released. In `timestamps.php` update both the plugin "Version:" property and the plugin `SDCOM_TIMESTAMPS_VERSION` constant.
56-
1. Changelog: Add/update the changelog in `CHANGELOG.md` and `readme.txt`, ensuring to link the [1.8.1] release reference in the footer of `CHANGELOG.md` (e.g., https://github.com/scoredetect/timestamps/compare/1.8.1-1...1.8.1).
56+
1. Changelog: Add/update the changelog in `CHANGELOG.md` and `readme.txt`, ensuring to link the [1.9.0] release reference in the footer of `CHANGELOG.md` (e.g., https://github.com/scoredetect/timestamps/compare/1.9.0-1...1.9.0).
5757
1. Props: Update `CREDITS.md` file with any new contributors, confirm maintainers are accurate.
5858
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.
5959
1. New files: Check to be sure any new files/paths that are unnecessary in the production version are included in `.distignore`.

composer.json

Lines changed: 21 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,30 @@
1818
"prefer-stable": true,
1919
"require-dev": {
2020
"10up/phpcs-composer": "3.0.0",
21-
"phpcompatibility/phpcompatibility-wp": "*"
21+
"phpcompatibility/phpcompatibility-wp": "*",
22+
"brianhenryie/strauss": "^0.14.0"
2223
},
2324
"scripts": {
2425
"lint": "phpcs .",
25-
"lint-fix": "phpcbf ."
26+
"lint-fix": "phpcbf .",
27+
"strauss": [ "vendor/bin/strauss" ],
28+
"post-install-cmd": [
29+
"@strauss"
30+
],
31+
"post-update-cmd": [
32+
"@strauss"
33+
]
34+
},
35+
"extra": {
36+
"installer-paths": {
37+
"vendor/{$name}/": ["type:wordpress-plugin", "type:wordpress-theme"]
38+
},
39+
"strauss": {
40+
"target_directory": "vendor-prefixed",
41+
"namespace_prefix": "SDCOM_Timestamps\\Vendor_Prefixed\\",
42+
"classmap_prefix": "SDCOM_Timestamps_Vendor_Prefixed_",
43+
"constant_prefix": "SDCOM_TIMESTAMPS_VENDOR_"
44+
}
2645
},
2746
"config": {
2847
"allow-plugins": {

0 commit comments

Comments
 (0)