Skip to content

Commit 9dd4c95

Browse files
rdeutzbrianteeman
andauthored
update content for Contributing.md (#43478)
* update content * Update .github/CONTRIBUTING.md Co-authored-by: Brian Teeman <[email protected]> * Update .github/CONTRIBUTING.md Co-authored-by: Brian Teeman <[email protected]> * Update .github/CONTRIBUTING.md Co-authored-by: Brian Teeman <[email protected]> --------- Co-authored-by: Brian Teeman <[email protected]>
1 parent 92cad14 commit 9dd4c95

File tree

1 file changed

+10
-7
lines changed

1 file changed

+10
-7
lines changed

.github/CONTRIBUTING.md

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,19 +7,22 @@ You are welcome to submit a contribution for review and possible inclusion in th
77
2) Follow the [Joomla! Coding Standards](https://developer.joomla.org/coding-standards.html).
88

99
3) When filing an issue or opening a PR, please include a clear title and description. The title should be a short summary of an issue and, if possible, should include a reference to an open issue. For example, `Invalid Query in com_admin (Ref #1234)` would be sufficient. All issues and PRs should include a description with as much detail as possible.
10-
If it is a PR, include what the issue is, what the PR is addressing, testing instructions and environmental information (PHP version, database driver and version, and other data you can retrieve from your site's system information view) in case the issue is specific to certain environments. If additional information is needed, please be prepared to provide it as our community members review your submission.
10+
If it is a PR, include what the issue is, what the PR is addressing, testing instructions and environmental information (PHP version, database driver and version, and other data you can retrieve from your site's system information view) in case the issue is specific to certain environments. If additional information is needed, please be prepared to provide it as our community members review your submission.
1111

1212
4) Report security issues to the Joomla! Security Strike Team (JSST) at [email protected] or use the [JSST contact form](https://developer.joomla.org/contact-security-team.html). Please do not use the public tracker for security issues.
1313

14+
5) If you have a feature request, then please open a discussion to define the feature request and discuss possible solutions. Discussions can be converted into issues when the request is defined sufficiently that a developer can start coding the feature. In this process you will get feedback from the maintainers, if the feature is something for the Joomla core distribution or not.
15+
1416
Please be patient as not all items will be tested immediately (remember, all bug testing for the Joomla! CMS is done by volunteers) and be receptive to feedback about your code.
1517

1618
#### Branches
17-
PRs should usually be made to the `4.3-dev` branch as this contains the most recent version of the code.
18-
There are other branches available which serve specific purposes.
19+
While 4.4 is in maintenance mode, ie we are still fixing bugs, PRs should be made to the `4.4-dev` branch. Merged bugfixes will be upmerged into the current 5.x branch. If a bug is only in the 5.x series the PR should be made to the current 5.x branch (currently 5.1).
20+
1921

2022
| Branch | Purpose |
2123
| ------ | ------- |
22-
| 3.10-dev | Branch for the Joomla 3.x series. The 3.10 series release will now only include security patches. |
23-
| 4.3-dev | Branch for the current minor Joomla version.|
24-
| 4.4-dev | Branch for the next minor Joomla version. Commits to 4.3-dev will be applied to this branch as well. |
25-
| 5.0-dev | Branch for the next major Joomla version. New features go into this branch. |
24+
| 4.4-dev | Branch for the current 4.x Joomla version. Currently in maintenance mode |
25+
| 5.1-dev | Branch for the current 5.x Joomla version. Bugfix only for 5.x go into this branch. |
26+
| 5.2-dev | Branch for the next minor 5.x Joomla version. New features go into this branch. |
27+
| 6.0-dev | Branch for the next major Joomla version. New features that include a b/c break have to go into this branch. |
28+

0 commit comments

Comments
 (0)