Thoughts, Ideas and bits of code for SMF (2.1)

Michael Eshom 404fd53479 Merge pull request #105 from jdarwood007/no-closing-php 11 years ago
Packages dfe00a8a35 Fixed chmod that somehow got changed, which should resolve #105 11 years ago
Smileys dfe00a8a35 Fixed chmod that somehow got changed, which should resolve #105 11 years ago
Sources 2a7cea57b6 Fixed conflicts 11 years ago
Themes 2a7cea57b6 Fixed conflicts 11 years ago
attachments dfe00a8a35 Fixed chmod that somehow got changed, which should resolve #105 11 years ago
avatars dfe00a8a35 Fixed chmod that somehow got changed, which should resolve #105 11 years ago
cache dfe00a8a35 Fixed chmod that somehow got changed, which should resolve #105 11 years ago
other 2a7cea57b6 Fixed conflicts 11 years ago
.gitignore 2a7cea57b6 Fixed conflicts 11 years ago
DCO.txt b486a1e52a Adding a Developer's Certifcate of Origin to be used when submitting contributions. 12 years ago
README.md b13edea762 Revert "Update README.md" 11 years ago
SSI.php 2a7cea57b6 Fixed conflicts 11 years ago
agreement.txt a18e888838 10610 12 years ago
changelog.txt a18e888838 10610 12 years ago
favicon.ico a18e888838 10610 12 years ago
index.php 2a7cea57b6 Fixed conflicts 11 years ago
ssi_examples.php 9c41d9c990 Revert Copyright Line 11 years ago
ssi_examples.shtml b17452c904 ! update ssi_examples shtml ... we are not longer rc4 or llc :P 12 years ago
subscriptions.php 2a7cea57b6 Fixed conflicts 11 years ago

README.md

SMF, www.simplemachines.org

This is a SMF 2.1 development repository. The software is licensed under BSD 3-clause license.

Contributions to documentation are licensed under CC-by-SA 3. Third party libraries or sets of images, are under their own licenses.

######Notes:

Feel free to fork this repository and make your desired changes.

Please see the Developer's Certificate of Origin in the repository: 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

######How to contribute:

  • fork the repository. If you are not used to Github, please check out fork a repository.
  • branch your repository, to commit the desired changes.
  • sign-off your commits, to acknowledge your submission under the license of the project.
    • an easy way to do so, is to define an alias for the git commit command, which includes -s switch (reference: How to create Git aliases)
  • 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 informations, the ideal branching we would like to follow is the one described in this article

Finally, feel free to play around. That's what we're doing. ;)