Inicio Explorar Ayuda
Registro Iniciar sesión
Omnimaga
/
SMF2.1
espejo de [email protected]:Omnimaga/SMF2.1.git
2
0
Fork 0
Archivos Incidencias 0 Wiki

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

Árbol: f8e761ab5f
Ramas Etiquetas
SMF2.1
ZIP TAR.GZ
Michael Eshom f8e761ab5f Merge pull request #1359 from Oldiesmann/release-2.1 hace 10 años
Packages 1e5c36c0bc Forgot to signoff hace 11 años
Smileys c8e62fe029 ! Fix many of the phpdocumentor errors with our docblock's hace 12 años
Sources f8e761ab5f Merge pull request #1359 from Oldiesmann/release-2.1 hace 10 años
Themes 299ec3e34d Merge pull request #1356 from Oldiesmann/release-2.1 hace 10 años
attachments c8e62fe029 ! Fix many of the phpdocumentor errors with our docblock's hace 12 años
avatars ab4aa21af9 ! Removed wolf icon due to the fact that it's someone else's logo as per #558. hace 11 años
cache a18e888838 10610 hace 12 años
custom_avatar d1f27eeada This should do the trick hace 11 años
other 76923ffffb ! Make the top 'login or register' login button be a nice overlay for the login. hace 10 años
.gitattributes 3e46fa2644 More PHP 5.5 fixes found while working on 2.0 PHP 5.5 Combat hace 11 años
.gitignore 7cc1428fdc Fixed login on upgrade not working on first try. hace 11 años
DCO.txt b486a1e52a Adding a Developer's Certifcate of Origin to be used when submitting contributions. hace 12 años
README.md 5c151b89a6 Update the link to git aliases hace 11 años
SSI.php ba0278dbec SMF is HTML5 now, so SSI should be as well. hace 10 años
agreement.txt a18e888838 10610 hace 12 años
contributors.txt b6b5123f21 ! Clean up the formatting of the contributors file a little and add something we're using that I forgot to add. hace 11 años
cron.php 85a770b778 ! Let's make background tasks actually run in the background. This can still be improved, though, to try and avoid some of the concurrent requests but we'll get to that. hace 10 años
favicon.ico a18e888838 10610 hace 12 años
index.php a413bd676d fix merge conflicts hace 10 años
ssi_examples.php ba0278dbec SMF is HTML5 now, so SSI should be as well. hace 10 años
ssi_examples.shtml ba0278dbec SMF is HTML5 now, so SSI should be as well. hace 10 años
subscriptions.php 27e668f1f2 ! Split out paid subs errors in the error log, in case it's useful to someone. hace 10 años

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.