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

Arantor d73e8ab71f Merge pull request #1268 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 fdb9dd1e7f ! And this should remove the rest of send-topic. Just not needed any more. 11 年之前
Themes 79278cfb55 ! Shorten what's in the alerts pane as well, should fix #1243. Feedback for other languages is appreciated. 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 年之前
custom_avatar d1f27eeada This should do the trick 11 年之前
other b91c7e097a ! This tinyint actually needs to be an int. Because this is a new-to-2.1 feature this should NOT be separately handled by the upgrader (i.e. the upgrader should NOT go out of its way to fix this). You may need to update your test installations by hand. 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 29539361c5 ! A search on $user_info yielded some we're not using (since they were either the last entry in a file or there were two consecutive matches in the search results where there were no lines in between that mentioned $user_info) 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 fdb9dd1e7f ! And this should remove the rest of send-topic. Just not needed any more. 11 年之前
ssi_examples.php 9ec80ef05d The ' />' method of closing so-called 'void' tags is no longer required in HTML5, per #1215 11 年之前
ssi_examples.shtml b17452c904 ! update ssi_examples shtml ... we are not longer rc4 or llc :P 12 年之前
subscriptions.php 27e668f1f2 ! Split out paid subs errors in the error log, in case it's useful to someone. 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.