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

emanuele 6fada65959 Fixed readme install template 11 rokov pred
Packages a18e888838 10610 12 rokov pred
Smileys 78546d1cbc ! include a new set of smiley icons from the fugue icon set 12 rokov pred
Sources 9f6cd00192 text restored and member_is_online changed to member_online_text 11 rokov pred
Themes 9f6cd00192 text restored and member_is_online changed to member_online_text 11 rokov pred
attachments a18e888838 10610 12 rokov pred
avatars 3e19ed176c ! Update avatars/blank.png (was a left over .gif) 12 rokov pred
cache a18e888838 10610 12 rokov pred
other 6fada65959 Fixed readme install template 11 rokov pred
.gitignore cae843eec3 Update .gitignore 12 rokov pred
DCO.txt b486a1e52a Adding a Developer's Certifcate of Origin to be used when submitting contributions. 12 rokov pred
README.md 10f8066483 Update README.md with instructions on how to contribute (sorry for the direct commit...) 11 rokov pred
SSI.php 86d1db0c91 Merge pull request #153 from emanuele45/copyright_2012 11 rokov pred
agreement.txt a18e888838 10610 12 rokov pred
changelog.txt a18e888838 10610 12 rokov pred
favicon.ico a18e888838 10610 12 rokov pred
index.php 02667d6d57 Copyrights changed to 2012 12 rokov pred
ssi_examples.php 02667d6d57 Copyrights changed to 2012 12 rokov pred
ssi_examples.shtml b17452c904 ! update ssi_examples shtml ... we are not longer rc4 or llc :P 12 rokov pred
subscriptions.php 86d1db0c91 Merge pull request #153 from emanuele45/copyright_2012 11 rokov pred

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