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

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

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