Mipsi Git Model

Create a feature branch

Create new branch

git checkout master
git pull
git checkout -b myfeature

Once completed committing changes, merge into master

git checkout master
git pull
git merge --no-ff myfeature
git branch -d myfeature
git push origin master

OR create a pull request and let another dev review and merge

git checkout master
git pull
git checkout myfeature
git rebase master

You might have conflicts when rebasing into master. Fix each one and add them:

git add <filename>
<repeat for all conflicts>
git rebase --continue

Once you have rebased successfully you can push the branch to github

git push origin myfeature

Login into github and you will see the branch that you just pushed. Create a pull request and wait for the code to be reviewed.

Versioning

For transparency and insight into our release cycle, and for striving to maintain backward compatibility, Bootstrap will be maintained under the Semantic Versioning guidelines as much as possible.

Releases will be numbered with the follow format:

<major>.<minor>.<patch>

And constructed with the following guidelines:

Breaking backward compatibility bumps the major
New additions without breaking backward compatibility bumps the minor
Bug fixes and misc changes bump the patch

For more information on SemVer, please visit http://semver.org/.

The Git model that we use is explained at: http://nvie.com/posts/a-successful-git-branching-model/

Database SQL

drop schema tutorhero;
create schema tutorhero;
use tutorhero;

CREATE TABLE IF NOT EXISTS `users` (
    `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
    `role` enum('user','admin') NOT NULL DEFAULT 'user',
    `firstname` varchar(100) NOT NULL,
    `lastname` varchar(100) NOT NULL,
    `email` varchar(100) NOT NULL,
    `password` char(40) NOT NULL,
    `about` text NOT NULL,
    `interests` text NOT NULL,
    `gpa` varchar(5) NOT NULL DEFAULT '0',
    `verified` int(2) NOT NULL DEFAULT '0',
    `paid` int(2) NOT NULL DEFAULT '0',
    `recordcheck` int(2) NOT NULL DEFAULT '0',
    `featured` int(2) NOT NULL DEFAULT '0',
    `rate` varchar(10) NOT NULL DEFAULT '0',
    PRIMARY KEY (`id`)
) ENGINE=MyISAM  DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;

CREATE TABLE IF NOT EXISTS `comments` (
    `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
    `user_id` int(10) NOT NULL,
    `email` varchar(100) NOT NULL,
    `comment` text NOT NULL,
    PRIMARY KEY (`id`)
) ENGINE=MyISAM  DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;

CREATE TABLE IF NOT EXISTS `subjects` (
    `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
    `user_id` int(10) NOT NULL,
    `subject` varchar(100) NOT NULL,
    PRIMARY KEY (`id`)
) ENGINE=MyISAM  DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;

INSERT INTO `users` (`id`, `role`, `firstname`, `lastname`, `email`, `password`) VALUES
('1', 'admin', 'admin', 'user', 'admin@admin.com', 'd033e22ae348aeb5660fc2140aec35850c4da997');

INSERT INTO `users` (`id`, `role`, `firstname`, `lastname`, `email`, `password`, `paid` ,`featured`, `rate`, `verified`) VALUES
('2', 'user', 'Matt', 'Smith', 'matt@smith.com', '5ece240085b9ad85b64896082e3761c54ef581de', '1', '1', '25.50', '1');