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

jdarwood007 2f78a8f68c More PHP 5.5 fixes found while working on 2.0 PHP 5.5 Combat 11 years ago
Packages c8e62fe029 ! Fix many of the phpdocumentor errors with our docblock's 12 years ago
Smileys c8e62fe029 ! Fix many of the phpdocumentor errors with our docblock's 12 years ago
Sources 2f78a8f68c More PHP 5.5 fixes found while working on 2.0 PHP 5.5 Combat 11 years ago
Themes 54e4fbaf5f Merge pull request #662 from Arantor/release-2.1 11 years ago
attachments c8e62fe029 ! Fix many of the phpdocumentor errors with our docblock's 12 years ago
avatars 75a0617d30 Merge pull request #226 from emanuele45/new_avatars 12 years ago
cache a18e888838 10610 12 years ago
other b97cd6c298 ! Wrong type set in the PGSQL installer. (fixes #665) 11 years ago
.gitattributes 3e46fa2644 More PHP 5.5 fixes found while working on 2.0 PHP 5.5 Combat 11 years ago
.gitignore 7cc1428fdc Fixed login on upgrade not working on first try. 11 years ago
DCO.txt b486a1e52a Adding a Developer's Certifcate of Origin to be used when submitting contributions. 12 years ago
README.md 10f8066483 Update README.md with instructions on how to contribute (sorry for the direct commit...) 12 years ago
SSI.php 95df1e9203 ! Typo in ManagePermissions code 11 years ago
agreement.txt a18e888838 10610 12 years ago
favicon.ico a18e888838 10610 12 years ago
index.php 5d594b0d9e Disregard -> Unwatch 11 years ago
ssi_examples.php 2c50939f27 Copyright update per BoD 11 years ago
ssi_examples.shtml b17452c904 ! update ssi_examples shtml ... we are not longer rc4 or llc :P 12 years ago
subscriptions.php 2c50939f27 Copyright update per BoD 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. ;)