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

Arantor eddcdefe80 Merge pull request #1113 from Arantor/release-2.1 11 年之前
Packages 1e5c36c0bc Forgot to signoff 11 年之前
Smileys c8e62fe029 ! Fix many of the phpdocumentor errors with our docblock's 12 年之前
Sources eddcdefe80 Merge pull request #1113 from Arantor/release-2.1 11 年之前
Themes bb8f476129 ! Tweak language strings to reflect 2.1's support for ImageMagick. Also, don't warn about missing ImageMagick functionality if MagickWand is installed. 11 年之前
attachments c8e62fe029 ! Fix many of the phpdocumentor errors with our docblock's 12 年之前
avatars ab4aa21af9 ! Removed wolf icon due to the fact that it's someone else's logo as per #558. 11 年之前
cache a18e888838 10610 12 年之前
other 39858b06d0 ! attachmentEncryptFilenames isn't used any more, so clean it up. Fixes #594 11 年之前
.gitattributes 3e46fa2644 More PHP 5.5 fixes found while working on 2.0 PHP 5.5 Combat 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 5c151b89a6 Update the link to git aliases 11 年之前
SSI.php eb3788837f ! This doesn't play nice with MySQLi. Let's be safe out there. 11 年之前
agreement.txt a18e888838 10610 12 年之前
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 年之前
cron.php 16f9ef60f9 ! In the wake of removing a bunch of icon images and using CSS, it seemed appropriate to have a quick breeze through looking for rogue $settings entries. There's still more but this is the first wave that can be done easily. 11 年之前
favicon.ico a18e888838 10610 12 年之前
index.php b5bb3fb944 ! Let's actually assign a copyright year for SMF outside the language files that we can target with patches should we need to. About time we did this. 11 年之前
ssi_examples.php 079791b7f1 oops! couple more fixes 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

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.