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

Arantor 566f16d967 Merge pull request #672 from Arantor/release-2.1 %!s(int64=11) %!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 5b4a8357b9 ! Remove 'recode line endings' UI item. It is a feature that some might depend on but that shouldn't have a UI item; a plugin can add it back if the option really is required but it can remain a hidden setting without any real trouble. This also fixes #600 - it's actually much better IMNSHO to pretend it doesn't exist for users than to confuse them with trying to explain it and if someone *does* need it, we can direct them to turning it on again. %!s(int64=11) %!d(string=hai) anos
Themes f5dd36a67d ! Change the help description not to reference Trillian since Trillian doesn't seem to do RSS any more. Fixes #651. %!s(int64=11) %!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 b97cd6c298 ! Wrong type set in the PGSQL installer. (fixes #665) %!s(int64=11) %!d(string=hai) anos
.gitattributes e5577df480 cherrypick from jdarwood007 #122 %!s(int64=11) %!d(string=hai) anos
.gitignore 7cc1428fdc Fixed login on upgrade not working on first try. %!s(int64=11) %!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 95df1e9203 ! Typo in ManagePermissions code %!s(int64=11) %!d(string=hai) anos
agreement.txt a18e888838 10610 %!s(int64=13) %!d(string=hai) anos
contributors.txt 8afad0752c Corrected missing comma. %!s(int64=11) %!d(string=hai) anos
favicon.ico a18e888838 10610 %!s(int64=13) %!d(string=hai) anos
index.php 5d594b0d9e Disregard -> Unwatch %!s(int64=11) %!d(string=hai) anos
ssi_examples.php 2c50939f27 Copyright update per BoD %!s(int64=11) %!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 2c50939f27 Copyright update per BoD %!s(int64=11) %!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. ;)