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

Arantor 5497ec1fb8 Merge pull request #713 from Arantor/release-2.1 před 11 roky
Packages c8e62fe029 ! Fix many of the phpdocumentor errors with our docblock's před 12 roky
Smileys c8e62fe029 ! Fix many of the phpdocumentor errors with our docblock's před 12 roky
Sources cdd86791de ! I have no idea why drafts are disabled by default, that seems insane. But even if you do want them disabled, it shouldn't require going to the Core Features page to do it, should really be from the Drafts page. And, so it is. před 11 roky
Themes 4799df97b3 ! It's bugged me for a while that we call it 'Boards' when it also manages categories. před 11 roky
attachments c8e62fe029 ! Fix many of the phpdocumentor errors with our docblock's před 12 roky
avatars ab4aa21af9 ! Removed wolf icon due to the fact that it's someone else's logo as per #558. před 11 roky
cache a18e888838 10610 před 12 roky
other a3866a1594 ! Add Yandex to the list of search engines known to the system. před 11 roky
.gitattributes 3e46fa2644 More PHP 5.5 fixes found while working on 2.0 PHP 5.5 Combat před 11 roky
.gitignore 7cc1428fdc Fixed login on upgrade not working on first try. před 11 roky
DCO.txt b486a1e52a Adding a Developer's Certifcate of Origin to be used when submitting contributions. před 12 roky
README.md 10f8066483 Update README.md with instructions on how to contribute (sorry for the direct commit...) před 12 roky
SSI.php aec98628cb ! Oops, that shouldn't have been Wedge style code. před 11 roky
agreement.txt a18e888838 10610 před 12 roky
contributors.txt b6b5123f21 ! Clean up the formatting of the contributors file a little and add something we're using that I forgot to add. před 11 roky
favicon.ico a18e888838 10610 před 12 roky
index.php 5d594b0d9e Disregard -> Unwatch před 11 roky
ssi_examples.php 2c50939f27 Copyright update per BoD před 11 roky
ssi_examples.shtml b17452c904 ! update ssi_examples shtml ... we are not longer rc4 or llc :P před 12 roky
subscriptions.php 2c50939f27 Copyright update per BoD před 11 roky

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

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