Skip to content

Commit

Permalink
Merge branch 'develop' into trunk
Browse files Browse the repository at this point in the history
  • Loading branch information
jeffpaul committed Mar 1, 2022
2 parents 6254f70 + 55d026c commit 40ecf7b
Show file tree
Hide file tree
Showing 15 changed files with 417 additions and 161 deletions.
42 changes: 0 additions & 42 deletions .github/ISSUE_TEMPLATE/1-bug-report.md

This file was deleted.

70 changes: 70 additions & 0 deletions .github/ISSUE_TEMPLATE/1-bug-report.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,70 @@
name: "\U0001F41B Bug report"
description: "Report a bug with this project."
labels: "type:bug"
body:
- type: markdown
attributes:
value: |
Thanks for taking the time to fill out this bug report! Please fill in as much of the template below as you can.
- type: textarea
attributes:
label: Describe the bug
description: Please write a clear and concise description of the bug, including what you expect to happen and what is currently happening.
placeholder: |
Feature '...' is not working properly. I expect '...' to happen, but '...' happens instead
validations:
required: true

- type: textarea
attributes:
label: Steps to Reproduce
description: Please write the steps needed to reproduce the bug.
placeholder: |
1. Go to '...'
2. Click on '...'
3. Scroll down to '...'
4. See error
validations:
required: true

- type: textarea
attributes:
label: Screenshots, screen recording, code snippet
description: |
If possible, please upload a screenshot or screen recording which demonstrates the bug. You can use LIEcap to create a GIF screen recording: https://www.cockos.com/licecap/
Tip: You can attach images or log files by clicking this area to highlight it and then dragging files in.
For small snippets paste it directly here, or you can use GitHub Gist to share multiple code files: https://gist.github.com
Please ensure the shared code can be used by a developer to reproduce the issue—ideally it can be copied into a local development environment or executed in a browser console to help debug the issue
validations:
required: false

- type: textarea
attributes:
label: Environment information
placeholder: |
- Device: <!-- [e.g. MacBook] -->
- OS: <!-- [e.g. MacOS 10.14.3] -->
- Browser and version: <!-- [e.g. Firefox 65.0.1, Chrome 73.0.3683.75, Safari 12.0.3] -->
validations:
required: false

- type: textarea
attributes:
label: WordPress information
placeholder: |
<!-- If your WordPress version is below 5.2, then please provide your WordPress, Plugins, Themes versions here. -->
<!-- If your WordPress version is 5.2 or higher, then please fill out the Site Health Info details below. -->
<details><summary>Site Health info:</summary>
<!-- Go to Tools > Site Health > Info tab, click "Copy site info to clipboard", and paste those details here. -->
</details>
validations:
required: false

- type: checkboxes
id: terms
attributes:
label: Code of Conduct
description: By submitting this issue, you agree to follow our `Code of Conduct` (see the `CODE_OF_CONDUCT.md` file in the repo).
options:
- label: I agree to follow this project's Code of Conduct
required: true
25 changes: 0 additions & 25 deletions .github/ISSUE_TEMPLATE/2-enhancement.md

This file was deleted.

44 changes: 44 additions & 0 deletions .github/ISSUE_TEMPLATE/2-enhancement.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
name: "\U0001F680 Enhancement"
description: "Suggest an idea for this project."
labels: "type:enhancement"
body:
- type: markdown
attributes:
value: |
Thank you for suggesting an idea to make things better. Please fill in as much of the template below as you can.
- type: textarea
attributes:
label: Is your enhancement related to a problem? Please describe.
description: Please describe the problem you are trying to solve.
placeholder: |
I use this project as a `...` and I would like `...` so that `...describe benefit...`.
validations:
required: true

- type: textarea
attributes:
label: Designs
description: |
If applicable, add mockups/screenshots/etc. to help explain your idea.
Tip: You can attach images or videos by clicking this area to highlight it and then dragging files in.
validations:
required: false

- type: textarea
attributes:
label: Describe alternatives you've considered
description: |
Please describe alternative solutions or features you have considered.
placeholder: |
I have also considered `...describe alternative...`, however I feel that my solution described above is better because of `...reason...`.
validations:
required: false

- type: checkboxes
id: terms
attributes:
label: Code of Conduct
description: By submitting this issue, you agree to follow our `Code of Conduct` (see the `CODE_OF_CONDUCT.md` file in the repo).
options:
- label: I agree to follow this project's Code of Conduct
required: true
13 changes: 0 additions & 13 deletions .github/ISSUE_TEMPLATE/3-help.md

This file was deleted.

23 changes: 23 additions & 0 deletions .github/ISSUE_TEMPLATE/3-help.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
name: "❓ Need help?"
description: "Ask us a question, we are here to help!"
labels: "type:question"
body:
- type: markdown
attributes:
value: |
If you have a question that is neither a bug report nor an enhancement, then please post it here! Please fill in as much of the template below as you can.
- type: textarea
attributes:
label: Describe your question
description: A clear and concise description of what your question is.
validations:
required: true

- type: checkboxes
id: terms
attributes:
label: Code of Conduct
description: By submitting this issue, you agree to follow our `Code of Conduct` (see the `CODE_OF_CONDUCT.md` file in the repo).
options:
- label: I agree to follow this project's Code of Conduct
required: true
31 changes: 20 additions & 11 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -1,23 +1,22 @@
<!--
### Requirements
Filling out the template is required. Any pull request that does not include enough information to be reviewed in a timely manner may be closed at the maintainers' discretion. All new code requires documentation and tests to ensure against regressions.
Filling out the template is required. Any pull request that does not include enough information to be reviewed in a timely manner may be closed at the maintainers' discretion. All new code requires documentation and tests to ensure against regressions.
-->

### Description of the Change

<!--
We must be able to understand the design of your change from this description. If we can't get a good idea of what the code will be doing from the description here, the pull request may be closed at the maintainers' discretion. Keep in mind that the maintainer reviewing this PR may not be familiar with or have worked with the code here recently, so please walk us through the concepts. Please include screenshots (if appropriate).
We must be able to understand the design of your change from this description. If we can't get a good idea of what the code will be doing from the description here, the pull request may be closed at the maintainers' discretion. Also including any benefits that will be realized by the code change will be helpful. Keep in mind that the maintainer reviewing this PR may not be familiar with or have worked with the code here recently, so please walk us through the concepts. Please include screenshots (if appropriate).
-->

<!-- Enter any applicable Issues here. Example: -->
Closes #

### Alternate Designs

<!-- Explain what other alternates were considered and why the proposed version was selected. -->

### Benefits

<!-- What benefits will be realized by the code change? -->

### Possible Drawbacks

<!-- What are the possible side-effects or negative impacts of the code change? -->
Expand All @@ -38,7 +37,7 @@ Describe the actions you performed (e.g., commands you ran, text you typed, butt

<!--- Go over all the following points, and put an `x` in all the boxes that apply. -->
<!--- If you're unsure about any of these, don't hesitate to ask. We're here to help! -->
- [ ] I have read the [**CONTRIBUTING**](https://github.com/globeandmail/sophi-for-wordpress/blob/develop/CONTRIBUTING.md) document.
- [ ] I have read the [**CONTRIBUTING**](/CONTRIBUTING.md) document.
- [ ] My code follows the code style of this project.
- [ ] My change requires a change to the documentation.
- [ ] I have updated the documentation accordingly.
Expand All @@ -47,10 +46,20 @@ Describe the actions you performed (e.g., commands you ran, text you typed, butt

<!-- _NOTE: these things are not required to open a PR and can be done afterwards / while the PR is open._ -->

### Applicable Issues
### Changelog Entry

<!-- Enter any applicable Issues here -->
<!--
Add sample CHANGELOG.md entry for this PR, noting whether this is something being Added / Changed / Deprecated / Removed / Fixed / or Security related.
Example:
> Added - New feature
> Changed - Existing functionality
> Deprecated - Soon-to-be removed feature
> Removed - Feature
> Fixed - Bug fix
> Security - Vulnerability
-->

### Changelog Entry
### Credits

<!-- Add sample CHANGELOG.md entry for this PR, noting whether this is something being Added / Changed / Deprecated / Removed / Fixed / or Security related. -->
<!-- Please list any and all contributors on this PR and any linked issue so that they can be added to this projects CREDITS.md file. -->
Props @
8 changes: 8 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,13 @@ All notable changes to this project will be documented in this file, per [the Ke

## [Unreleased] - TBD

## [1.0.10] - 2022-02-28
### Changed
- Sets the default timeout of the first Sophi request and the cron request to 3 seconds (props [@oscarssanchez](https://github.com/oscarssanchez), [@barryceelen](https://github.com/barryceelen), [@felipeelia](https://github.com/felipeelia), [@tott](https://github.com/tott) via [#198](https://github.com/globeandmail/sophi-for-wordpress/pull/198)).

### Security
- Update dependency `snowplow/snowplow-tracker` from 0.4.0 to 0.5.0 (props [@renovate](https://github.com/apps/renovate) via [#186](https://github.com/globeandmail/sophi-for-wordpress/pull/186)).

## [1.0.9] - 2022-02-18
### Added
- `hostname` and `path` fields to schema (props [@Rahmon](https://github.com/Rahmon), [@dinhtungdu](https://github.com/dinhtungdu) via [#164](https://github.com/globeandmail/sophi-for-wordpress/pull/164)).
Expand Down Expand Up @@ -118,6 +125,7 @@ All notable changes to this project will be documented in this file, per [the Ke
- Initial public release! 🎉

[Unreleased]: https://github.com/globeandmail/sophi-for-wordpress/compare/trunk...develop
[1.0.10]: https://github.com/globeandmail/sophi-for-wordpress/compare/1.0.9...1.0.10
[1.0.9]: https://github.com/globeandmail/sophi-for-wordpress/compare/1.0.8...1.0.9
[1.0.8]: https://github.com/globeandmail/sophi-for-wordpress/compare/1.0.7...1.0.8
[1.0.7]: https://github.com/globeandmail/sophi-for-wordpress/compare/1.0.6...1.0.7
Expand Down
2 changes: 1 addition & 1 deletion CREDITS.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ The following individuals are responsible for curating the list of issues, respo

Thank you to all the people who have already contributed to this repository via bug reports, code, design, ideas, project management, translation, testing, etc.

[Jeffrey Paul (@jeffpaul)](https://github.com/jeffpaul), [Tung Du (@dinhtungdu)](https://github.com/dinhtungdu), [Darin Kotter (@dkotter)](https://github.com/dkotter), [Helen Hou-Sandí (@helen)](https://github.com/helen), [Diana Padron (@dianapadron)](https://profiles.wordpress.org/dianapadron), [Jozsef Kozo (@kojraai)](https://github.com/kojraai), [Barry Ceelen (@barryceelen)](https://github.com/barryceelen), [Ramon Ahnert (@Rahmon)](https://github.com/Rahmon), [Felipe Elia (@felipeelia)](https://github.com/felipeelia), [Thorsten Ott (@tott)](https://github.com/tott), [Alasdair McKie (@amckie)](https://github.com/amckie), [Oscar Sanchez S. (@oscarssanchez)](https://github.com/oscarssanchez).
[Jeffrey Paul (@jeffpaul)](https://github.com/jeffpaul), [Tung Du (@dinhtungdu)](https://github.com/dinhtungdu), [Darin Kotter (@dkotter)](https://github.com/dkotter), [Helen Hou-Sandí (@helen)](https://github.com/helen), [Diana Padron (@dianapadron)](https://profiles.wordpress.org/dianapadron), [Jozsef Kozo (@kojraai)](https://github.com/kojraai), [Barry Ceelen (@barryceelen)](https://github.com/barryceelen), [Ramon Ahnert (@Rahmon)](https://github.com/Rahmon), [Felipe Elia (@felipeelia)](https://github.com/felipeelia), [Thorsten Ott (@tott)](https://github.com/tott), [Alasdair McKie (@amckie)](https://github.com/amckie), [Oscar Sanchez S. (@oscarssanchez)](https://github.com/oscarssanchez), [Thorsten Ott (@tott)](https://github.com/tott).

## Libraries

Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
},
"require": {
"php": ">=7.4",
"snowplow/snowplow-tracker": "0.4.0"
"snowplow/snowplow-tracker": "0.5.0"
},
"require-dev": {
"phpunit/phpunit": "8.5.23",
Expand Down
Loading

0 comments on commit 40ecf7b

Please sign in to comment.