Home Explore Help
Register Sign In
Omnimaga
/
SMF2.1
mirror of [email protected]:Omnimaga/SMF2.1.git
2
0
Fork 0
Files Issues 0 Wiki

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

Tree: cd93836bee
Branches Tags
SMF2.1
ZIP TAR.GZ
Arantor cd93836bee Merge pull request #931 from Arantor/n 11 years ago
Packages 1e5c36c0bc Forgot to signoff 11 years ago
Smileys c8e62fe029 ! Fix many of the phpdocumentor errors with our docblock's 12 years ago
Sources eb972e1090 Merge branch 'release-2.1' of https://github.com/SimpleMachines/SMF2.1 into n 11 years ago
Themes eb972e1090 Merge branch 'release-2.1' of https://github.com/SimpleMachines/SMF2.1 into n 11 years ago
attachments c8e62fe029 ! Fix many of the phpdocumentor errors with our docblock's 12 years ago
avatars ab4aa21af9 ! Removed wolf icon due to the fact that it's someone else's logo as per #558. 11 years ago
cache a18e888838 10610 12 years ago
other eb972e1090 Merge branch 'release-2.1' of https://github.com/SimpleMachines/SMF2.1 into n 11 years ago
.gitattributes 3e46fa2644 More PHP 5.5 fixes found while working on 2.0 PHP 5.5 Combat 11 years ago
.gitignore 7cc1428fdc Fixed login on upgrade not working on first try. 11 years ago
DCO.txt b486a1e52a Adding a Developer's Certifcate of Origin to be used when submitting contributions. 12 years ago
README.md 7ee0ddde24 ! Please do provide security reports at the best place for them. 11 years ago
SSI.php fa453ed6cf ! And another thing that needed updating. 11 years ago
agreement.txt a18e888838 10610 12 years ago
contributors.txt b6b5123f21 ! Clean up the formatting of the contributors file a little and add something we're using that I forgot to add. 11 years ago
cron.php b7538a0eda ! First draft of the background tasks code. Not properly tested. 11 years ago
favicon.ico a18e888838 10610 12 years ago
index.php 4fc59a0173 ! How did I forget a security check? (per #804) 11 years ago
ssi_examples.php 2c50939f27 Copyright update per BoD 11 years ago
ssi_examples.shtml b17452c904 ! update ssi_examples shtml ... we are not longer rc4 or llc :P 12 years ago
subscriptions.php 2c50939f27 Copyright update per BoD 11 years ago

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

Please, feel free to play around. That's what we're doing. ;)

######Security matters:

Lastly, if you have a security issue you would like to notify us about regarding SMF - not just for 2.1, but for any version - please file a security report on our website: http://www.simplemachines.org/about/smf/security.php

This will enable the team to review it and prepare patches as appropriate before exploits are widely known, which helps keep everyone safe.