Skip to content

Commit

Permalink
Rename of repository from "SMF2.1" to just "SMF"
Browse files Browse the repository at this point in the history
Signed-off-by: Jon Stovell <jonstovell@gmail.com>
  • Loading branch information
Sesquipedalian committed May 9, 2022
1 parent c714e36 commit 14d13ef
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 15 deletions.
18 changes: 6 additions & 12 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
# [SMF](https://www.simplemachines.org)
[![Build Status](https://travis-ci.org/SimpleMachines/SMF2.1.svg?branch=release-2.1)](https://travis-ci.org/SimpleMachines/SMF2.1)
![Build Status](https://github.com/SimpleMachines/SMF/actions/workflows/php.yml/badge.svg)
![CrowdIn Status](https://github.com/SimpleMachines/SMF/actions/workflows/crowdin_wf.yml/badge.svg)

This is a SMF 2.1 development repository.
This the development repository for Simple Machines Forum.
The software is licensed under [BSD 3-clause license](https://opensource.org/licenses/BSD-3-Clause).

Contributions to documentation are licensed under [CC-by-SA 3](https://creativecommons.org/licenses/by-sa/3.0). Third party libraries or sets of images are under their own licenses.
Expand All @@ -14,9 +15,7 @@ Please see the [Developer's Certificate of Origin](https://github.com/SimpleMach
by signing off your contributions, you acknowledge that you can and do license your submissions under the license of the project.

## Branches organization:
* ***master*** - is the main branch, only used to merge in a "final release"
* ***development*** - is the branch where the development of the "next" version/s happens
* ***release-2.1*** - is the branch where bug fixes for the version 2.1 are applied
* ***release-2.1*** - is the branch where updates for version 2.1 are applied

## How to contribute:
* fork the repository. If you are not used to Github, please check out [fork a repository](https://help.github.com/fork-a-repo).
Expand All @@ -27,16 +26,11 @@ by signing off your contributions, you acknowledge that you can and do license y
* send a pull request to us.

## How to submit a pull request:
* If you want to send a bug fix for the version 2.1, send it to the branch ***release-2.1***
* If you want to send a new feature, use the branch ***development***
* You should never send any pull request against the master branch
For more information, the ideal branching we would like to follow is the one described in [this article](http://nvie.com/posts/a-successful-git-branching-model/)

Please, feel free to play around. That's what we're doing. ;)
* If you want to send a bug fix for version 2.1, send it to the branch ***release-2.1***

## Security matters:

Lastly, if you have a security issue you would like to notify us about regarding SMF - not just for 2.1, but for any version -
please file a [security report](https://www.simplemachines.org/about/smf/security.php) on our website: https://www.simplemachines.org/about/smf/security.php

This will enable the team to review it and prepare patches as appropriate before exploits are widely known, which helps keep everyone safe.
This will enable the team to review it and prepare patches as appropriate before exploits are widely known, which helps keep everyone safe.
2 changes: 1 addition & 1 deletion Themes/default/languages/Who.english.php
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,7 @@
$txt['credits_groups_translators'] = 'Language Translators';
$txt['credits_translators_message'] = 'Thank you for your efforts which make it possible for people all around the world to use SMF';
$txt['credits_groups_consultants'] = 'Consulting Developers';
$txt['credits_code_contributors'] = 'everyone who <a href="https://github.com/SimpleMachines/SMF2.1/graphs/contributors">contributed on GitHub</a>';
$txt['credits_code_contributors'] = 'everyone who <a href="https://github.com/SimpleMachines/SMF/graphs/contributors">contributed on GitHub</a>';
$txt['credits_groups_beta'] = 'Beta Testers';
$txt['credits_beta_message'] = 'The invaluable few who tirelessly find bugs, provide feedback, and drive the developers crazier';
$txt['credits_groups_founder'] = 'Founding Father of SMF';
Expand Down
4 changes: 2 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"name": "simplemachines/smf2.1",
"name": "simplemachines/smf",
"repositories": [
{
"url": "https://github.com/SimpleMachines/BuildTools.git",
Expand All @@ -16,4 +16,4 @@
"php": "7.0.2"
}
}
}
}

0 comments on commit 14d13ef

Please sign in to comment.