Skip to content
This repository

Vanilla is an open-source discussion forum for the web. It is built upon Garden, our pluggable application development framework.

Octocat-spinner-32 applications Improvements to comment embedding April 16, 2014
Octocat-spinner-32 cache Format search results as html. February 12, 2012
Octocat-spinner-32 conf Add notification preferences for discussions I've participated in. January 30, 2014
Octocat-spinner-32 js Make sure the session stash has completed before navigating to the em… March 26, 2014
Octocat-spinner-32 library Added drupal password hashing. April 15, 2014
Octocat-spinner-32 locales Format search results as html. February 12, 2012
Octocat-spinner-32 plugins Update class.twitter.plugin.php April 18, 2014
Octocat-spinner-32 resources Rename the scss directories into sass. January 10, 2014
Octocat-spinner-32 themes Merge branch 'master' of github.com:vanillaforums/Garden March 28, 2014
Octocat-spinner-32 uploads Setup error message improvements & setup testing improvements. Added … May 05, 2010
Octocat-spinner-32 .gitignore Ignore .idea June 04, 2013
Octocat-spinner-32 .htaccess Format search results as html. February 12, 2012
Octocat-spinner-32 LICENSE.md Use Markdown version of GPLv2 license March 26, 2014
Octocat-spinner-32 README.md README tweaks March 26, 2014
Octocat-spinner-32 bootstrap.php Move bootstrap.early above the cache enabler. April 07, 2014
Octocat-spinner-32 container.html Fix the callbacks from the parent container to the iframe. June 28, 2013
Octocat-spinner-32 index.php Core: tested functionality, added mobile settings page, styled condit… April 03, 2014
Octocat-spinner-32 login.php Added some common redirects for other forums. May 22, 2012
Octocat-spinner-32 readme.html Format search results as html. February 12, 2012
Octocat-spinner-32 register.php Added some common redirects for other forums. May 22, 2012
Octocat-spinner-32 showpost.php Added comments. February 21, 2012
Octocat-spinner-32 showthread.php Added comments. February 21, 2012
Octocat-spinner-32 viewtopic.php Add viewtopic.php to facilitate phpBB import 301s December 08, 2013
README.md

Vanilla Forums

Welcome! Vanilla was born out of the desire to create flexible, customizable, and downright entertaining community solutions. Vanilla has been used to power over 500,000 community forums around the world and we couldn't be happier that you've decided to use Vanilla to grow yours.

Source Control Ideology

To keep things simple and manageable, we've adopted the git flow branching model in our projects. The creators of git flow have released a short introduction video to explain their model.

master

The master branch of the vanillaforums repository will always contain our latest production (release) code. It should be the most stable source code you can download from us, but also the oldest. New code only gets into master when we release a new version or create a hotfix.

develop

All of our unreleased development work ends up in the develop branch. Sometimes it is committed directly, other times it comes from merged hotfixes against a release, and other times it comes from a merged feature branch. This branch will always contain the most bleeding edge vanillaforums code, so it sometimes has bugs and unfinished features. Use this at your own risk, and avoid deploying it in production.

release

When we're getting ready to tag a release as a beta, we'll branch develop into release. This allows us to feature-freeze the code and more easily commit bug fixes without having to tediously create hotfix branches for every little thing. This code should be of beta or rc quality, for the most part, and is what you should download if you'd like to help us test.

feature/x

Feature branches are work-in-progress branches that contain large chunks of new or modified code for a single feature or refactoring task. They are branched to preserve the stability of the develop branch during fairly destructive code changes.

hotfix/x

Hotfixes are branched from master and exist to fix small bugs that are detected in a release after it has been tagged in master. These branches are usually small and concise, and are merged back into master and develop once they are completed. They should never be new features.

Something went wrong with that request. Please try again.