ホーム エクスプローラ ヘルプ
登録 サインイン
Omnimaga
/
SMF2.1
同期ミラー [email protected]:Omnimaga/SMF2.1.git
2
0
フォーク 0
ファイル 課題 0 Wiki

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

ツリー: 26234d3530
ブランチ タグ
SMF2.1
ZIP TAR.GZ
emanuele 26234d3530 If we have to do it, better do it properly: in reference to #193 better check if $user_info['is_guest'] actually exists 12 年 前
Packages c8e62fe029 ! Fix many of the phpdocumentor errors with our docblock's 12 年 前
Smileys c8e62fe029 ! Fix many of the phpdocumentor errors with our docblock's 12 年 前
Sources 26234d3530 If we have to do it, better do it properly: in reference to #193 better check if $user_info['is_guest'] actually exists 12 年 前
Themes 47d787f3fe Merge branch 'release-2.1' of https://github.com/SimpleMachines/SMF2.1 12 年 前
attachments c8e62fe029 ! Fix many of the phpdocumentor errors with our docblock's 12 年 前
avatars 75a0617d30 Merge pull request #226 from emanuele45/new_avatars 12 年 前
cache a18e888838 10610 12 年 前
other 47d787f3fe Merge branch 'release-2.1' of https://github.com/SimpleMachines/SMF2.1 12 年 前
.gitignore cae843eec3 Update .gitignore 12 年 前
DCO.txt b486a1e52a Adding a Developer's Certifcate of Origin to be used when submitting contributions. 12 年 前
README.md 10f8066483 Update README.md with instructions on how to contribute (sorry for the direct commit...) 12 年 前
SSI.php 5efaf7a21a Revert "Copyright correction." 12 年 前
agreement.txt a18e888838 10610 12 年 前
changelog.txt a18e888838 10610 12 年 前
favicon.ico a18e888838 10610 12 年 前
index.php 5efaf7a21a Revert "Copyright correction." 12 年 前
ssi_examples.php 5efaf7a21a Revert "Copyright correction." 12 年 前
ssi_examples.shtml b17452c904 ! update ssi_examples shtml ... we are not longer rc4 or llc :P 12 年 前
subscriptions.php 5efaf7a21a Revert "Copyright correction." 12 年 前

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. ;)