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

Rick Kerkhof 80dcdfddc8 Changed path of star images per emanueles request %!s(int64=12) %!d(string=hai) anos
Packages c8e62fe029 ! Fix many of the phpdocumentor errors with our docblock's %!s(int64=12) %!d(string=hai) anos
Smileys c8e62fe029 ! Fix many of the phpdocumentor errors with our docblock's %!s(int64=12) %!d(string=hai) anos
Sources 80dcdfddc8 Changed path of star images per emanueles request %!s(int64=12) %!d(string=hai) anos
Themes 80dcdfddc8 Changed path of star images per emanueles request %!s(int64=12) %!d(string=hai) anos
attachments c8e62fe029 ! Fix many of the phpdocumentor errors with our docblock's %!s(int64=12) %!d(string=hai) anos
avatars 75a0617d30 Merge pull request #226 from emanuele45/new_avatars %!s(int64=12) %!d(string=hai) anos
cache a18e888838 10610 %!s(int64=13) %!d(string=hai) anos
other a4e04d7c6c Another bit of themes during upgrade %!s(int64=12) %!d(string=hai) anos
.gitignore 8314cf2ef6 this should fix preview without javascript...yeah, I know... :P %!s(int64=12) %!d(string=hai) anos
DCO.txt b486a1e52a Adding a Developer's Certifcate of Origin to be used when submitting contributions. %!s(int64=12) %!d(string=hai) anos
README.md 10f8066483 Update README.md with instructions on how to contribute (sorry for the direct commit...) %!s(int64=12) %!d(string=hai) anos
SSI.php 6ac2d0d926 Fixed undefined variable in SSI [Bug 4992] %!s(int64=12) %!d(string=hai) anos
agreement.txt a18e888838 10610 %!s(int64=13) %!d(string=hai) anos
changelog.txt a18e888838 10610 %!s(int64=13) %!d(string=hai) anos
favicon.ico a18e888838 10610 %!s(int64=13) %!d(string=hai) anos
index.php f9567030ac Fixing things I broke... %!s(int64=12) %!d(string=hai) anos
ssi_examples.php 5efaf7a21a Revert "Copyright correction." %!s(int64=12) %!d(string=hai) anos
ssi_examples.shtml b17452c904 ! update ssi_examples shtml ... we are not longer rc4 or llc :P %!s(int64=12) %!d(string=hai) anos
subscriptions.php 1724ca6169 Spaces and tabs at the end of the lines %!s(int64=12) %!d(string=hai) anos

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. ;)