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

Michael Eshom 39186dd0a4 Merge pull request #610 from Oldiesmann/release-2.1 пре 11 година
Packages c8e62fe029 ! Fix many of the phpdocumentor errors with our docblock's пре 12 година
Smileys c8e62fe029 ! Fix many of the phpdocumentor errors with our docblock's пре 12 година
Sources d50f6467bf Remove extra tab пре 11 година
Themes 57a4abf2fb Merge pull request #605 from Grudge/release-2.1 пре 11 година
attachments c8e62fe029 ! Fix many of the phpdocumentor errors with our docblock's пре 12 година
avatars 75a0617d30 Merge pull request #226 from emanuele45/new_avatars пре 12 година
cache a18e888838 10610 пре 13 година
other 5cc1c63840 Fixes 583 пре 11 година
.gitignore 7cc1428fdc Fixed login on upgrade not working on first try. пре 11 година
DCO.txt b486a1e52a Adding a Developer's Certifcate of Origin to be used when submitting contributions. пре 12 година
README.md 10f8066483 Update README.md with instructions on how to contribute (sorry for the direct commit...) пре 12 година
SSI.php 189a4c6760 ssi_fetchPosts() not respecting override permissions setting пре 11 година
agreement.txt a18e888838 10610 пре 13 година
favicon.ico a18e888838 10610 пре 13 година
index.php 5d594b0d9e Disregard -> Unwatch пре 11 година
ssi_examples.php 2c50939f27 Copyright update per BoD пре 11 година
ssi_examples.shtml b17452c904 ! update ssi_examples shtml ... we are not longer rc4 or llc :P пре 12 година
subscriptions.php 2c50939f27 Copyright update per BoD пре 11 година

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