joomla/cms
29
0
Fork 0
mirror of https://github.com/joomla/joomla-cms.git synced 2024-06-24 22:39:31 +00:00
Code Packages Releases Activity

Merge branch '3.10-dev' into 4.0-dev

Browse Source
This commit is contained in:
wilsonge 2021-08-10 09:18:00 +01:00
commit ca951153fd
No known key found for this signature in database
GPG Key ID: EF81319318FC9D04
4 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
.github/CONTRIBUTING.md vendored
View File

@ -6,7 +6,7 @@ You are welcome to submit a contribution for review and possible inclusion in th
2) Follow the [Joomla! Coding Standards](https://developer.joomla.org/coding-standards.html).
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.
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.
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.
4) Report security issues to the Joomla! Security Strike Team (JSST) at security@joomla.org or use the [JSST contact form](https://developer.joomla.org/contact-security-team.html). Please do not use the public tracker for security issues.
@ -14,11 +14,11 @@ If it is a PR, include what the issue is, what the PR is addressing, testing ins
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.
#### Branches
PRs should usually be made to the `staging` branch as this contains the most recent version of the code.
PRs should usually be made to the `4.0-dev` branch as this contains the most recent version of the code.
There are other branches available which serve specific purposes.
| Branch | Purpose |
| ------ | ------- |
| staging | Current codebase. Branch for the next minor Joomla version. New backward compatible features go into this branch. The 3.9.0 release will include the Privacy Tools Suite features. |
| 3.10-dev | Branch for the next minor Joomla version. The 3.10.0 release will only include compatibility features for 4.0. Commits to staging will be applied to this branch as well. |
| 4.0-dev | Branch for the next major Joomla version. New features go into this branch. Commits to staging will be applied to this branch as well. |
| 3.10-dev | Branch for the Joomla 3.x series. The 3.10 series release will only include compatibility features for 4.x as well as bugfixes and security patches. |
| 4.0-dev | Branch for the Joomla 4.0 series. Commits to 3.10-dev will be applied to this branch as well. |
| 4.1-dev | Branch for the next minor Joomla version. New features go into this branch. Commits to 4.0-dev will be applied to this branch as well. |

2
administrator/components/com_installer/src/Model/UpdatesitesModel.php
View File

@ -380,7 +380,7 @@ class UpdatesitesModel extends InstallerModel
{
/**
* Search if the extension exists in the extensions table. Excluding Joomla
* core extensions (id < 10000) and discovered extensions.
* core extensions and discovered but not yet installed extensions.
*/
$name = (string) $manifest->name;

2
administrator/components/com_joomlaupdate/src/Model/UpdateModel.php
View File

@ -1707,6 +1707,6 @@ ENDDATA;
|| $lang->load($extension, $source);
// Translate the extension name if possible
$item->name = Text::_($item->name);
$item->name = strip_tags(Text::_($item->name));
}
}

1
composer.json
View File

@ -8,7 +8,6 @@
],
"homepage": "https://github.com/joomla/joomla-cms",
"license": "GPL-2.0-or-later",
"non-feature-branches": ["staging"],
"config": {
"optimize-autoloader": true,
"platform": {