Skip to content
This repository

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

branch: release-2.1

Merge pull request #1523 from Oldiesmann/release-2.1

! That ) WAS supposed to be there after all...
latest commit 75831bd7c4
Michael Eshom Oldiesmann authored
Octocat-spinner-32 Packages Forgot to signoff November 05, 2013
Octocat-spinner-32 Smileys ! Fix many of the phpdocumentor errors with our docblock's October 10, 2012
Octocat-spinner-32 Sources Merge pull request #1509 from Antes/small-fix April 10, 2014
Octocat-spinner-32 Themes - Trailing whitespace April 12, 2014
Octocat-spinner-32 attachments ! Fix many of the phpdocumentor errors with our docblock's October 10, 2012
Octocat-spinner-32 avatars ! Removed wolf icon due to the fact that it's someone else's logo as … October 08, 2013
Octocat-spinner-32 cache Revert "Added integration hooks for knownInts and knownFloats" July 23, 2012
Octocat-spinner-32 custom_avatar This should do the trick December 25, 2013
Octocat-spinner-32 other ! That ) WAS supposed to be there after all... April 16, 2014
Octocat-spinner-32 .gitattributes More PHP 5.5 fixes found while working on 2.0 PHP 5.5 Combat October 05, 2013
Octocat-spinner-32 .gitignore Fixed login on upgrade not working on first try. August 11, 2013
Octocat-spinner-32 DCO.txt Revert "Added integration hooks for knownInts and knownFloats" July 23, 2012
Octocat-spinner-32 README.md Update the link to git aliases December 05, 2013
Octocat-spinner-32 SSI.php SMF is HTML5 now, so SSI should be as well. January 27, 2014
Octocat-spinner-32 agreement.txt Revert "Added integration hooks for knownInts and knownFloats" July 23, 2012
Octocat-spinner-32 contributors.txt ! Clean up the formatting of the contributors file a little and add s… October 12, 2013
Octocat-spinner-32 cron.php ! PostgreSQL doesn't like sorting by non-integer constants February 07, 2014
Octocat-spinner-32 favicon.ico Revert "Added integration hooks for knownInts and knownFloats" July 23, 2012
Octocat-spinner-32 index.php Add support for static and normal methods in smf_main() April 01, 2014
Octocat-spinner-32 ssi_examples.php SMF is HTML5 now, so SSI should be as well. January 27, 2014
Octocat-spinner-32 ssi_examples.shtml SMF is HTML5 now, so SSI should be as well. January 27, 2014
Octocat-spinner-32 subscriptions.php ! Split out paid subs errors in the error log, in case it's useful to… January 18, 2014
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.

Something went wrong with that request. Please try again.