2
0

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

Peter Spicer caa02ee8db ! Quick reply might be permanently on, but there's no need to show it if the user doesn't have permission to see it. 11 жил өмнө
Packages 1e5c36c0bc Forgot to signoff 11 жил өмнө
Smileys c8e62fe029 ! Fix many of the phpdocumentor errors with our docblock's 12 жил өмнө
Sources 2a346928a4 ! We don't need to process avatar sizing on the message or board indexes now... 11 жил өмнө
Themes caa02ee8db ! Quick reply might be permanently on, but there's no need to show it if the user doesn't have permission to see it. 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 13 жил өмнө
other 9858a699f5 ! And let's fix the upgrader to update the old option choices to the new one. 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 9ef51ae4cb ! Not only was this not legal, it wasn't even being used - good thing too, since the images in question don't exist any more either. 11 жил өмнө
agreement.txt a18e888838 10610 13 жил өмнө
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 c80826f1d0 ! Cleanliness is good. 11 жил өмнө
favicon.ico a18e888838 10610 13 жил өмнө
index.php a74da85cb1 ! Happy New Year everyone! 11 жил өмнө
ssi_examples.php c80826f1d0 ! Cleanliness is good. 11 жил өмнө
ssi_examples.shtml b17452c904 ! update ssi_examples shtml ... we are not longer rc4 or llc :P 12 жил өмнө
subscriptions.php a74da85cb1 ! Happy New Year everyone! 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.