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

Norv 70db71c098 Merge pull request #221 from norv/master 12 년 전
Packages a18e888838 10610 12 년 전
Smileys 78546d1cbc ! include a new set of smiley icons from the fugue icon set 12 년 전
Sources e170b37ed5 Tweaking copyright line for accuracy. (thank you Thantos) 12 년 전
Themes e170b37ed5 Tweaking copyright line for accuracy. (thank you Thantos) 12 년 전
attachments a18e888838 10610 12 년 전
avatars 3e19ed176c ! Update avatars/blank.png (was a left over .gif) 12 년 전
cache a18e888838 10610 12 년 전
other e170b37ed5 Tweaking copyright line for accuracy. (thank you Thantos) 12 년 전
.gitignore cae843eec3 Update .gitignore 12 년 전
DCO.txt b486a1e52a Adding a Developer's Certifcate of Origin to be used when submitting contributions. 12 년 전
README.md b13edea762 Revert "Update README.md" 12 년 전
SSI.php e170b37ed5 Tweaking copyright line for accuracy. (thank you Thantos) 12 년 전
agreement.txt a18e888838 10610 12 년 전
changelog.txt a18e888838 10610 12 년 전
favicon.ico a18e888838 10610 12 년 전
index.php e170b37ed5 Tweaking copyright line for accuracy. (thank you Thantos) 12 년 전
ssi_examples.php e170b37ed5 Tweaking copyright line for accuracy. (thank you Thantos) 12 년 전
ssi_examples.shtml b17452c904 ! update ssi_examples shtml ... we are not longer rc4 or llc :P 12 년 전
subscriptions.php e170b37ed5 Tweaking copyright line for accuracy. (thank you Thantos) 12 년 전

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