Upgraded FuelPHP framework to version 1.7.1.

CONTRIBUTING.md

@@ -110,7 +110,7 @@ keep in mind:
     The best way to do this is to make a branch off of the current version's
     `develop` branch:
 
-        $ git checkout BRANCH_NAME 1.6/develop
+        $ git checkout BRANCH_NAME 1.8/develop
 
     **Note:** If the contribution is submitted to the wrong branch, you will
     be asked to re-submit on the correct branch.
@@ -130,16 +130,16 @@ changes from the original repository.
 When updating your branch, you should use `rebase` and not merge in the
 changes:
 
-1.  Update your `1.6/develop` branch with changes from `upstream`:
+1.  Update your `1.8/develop` branch with changes from `upstream`:
 
-        $ git checkout 1.6/develop
+        $ git checkout 1.8/develop
         $ git fetch upstream
-        $ git merge upstream/1.6/develop
+        $ git merge upstream/1.8/develop
 
-2.  Rebase your branch with the `1.6/develop` branch:
+2.  Rebase your branch with the `1.8/develop` branch:
 
         $ git checkout BRANCH_NAME
-        $ git rebase 1.6/develop
+        $ git rebase 1.8/develop
 
     You may get merge conflicts while running the `rebase` command.  Resolve
     all conflicts, then continue the `rebase`:
@@ -165,9 +165,9 @@ of or do.
 
 1.  After making your changes and committing them locally, you need to
     Rebase your branch with
-    the the `upstream/1.6/develop` branch:
+    the the `upstream/1.8/develop` branch:
 
-        $ git rebase -f upstream/1.6/develop
+        $ git rebase -f upstream/1.8/develop
 
 2.  You will need to Force Push your changes up to GitHub.  This will
     automatically update your Pull Request:

LICENSE.md

@@ -0,0 +1,18 @@
+Copyright (c) 2010-2013 Fuel Development Team
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

README.md

@@ -1,39 +1,38 @@
-# Volcano CRM
+#FuelPHP
 
-## Introduction
+* Version: 1.7
+* [Website](http://fuelphp.com/)
+* [Release Documentation](http://docs.fuelphp.com)
+* [Release API browser](http://api.fuelphp.com)
+* [Development branch Documentation](http://dev-docs.fuelphp.com)
+* [Development branch API browser](http://dev-api.fuelphp.com)
+* [Support Forum](http://fuelphp.com/forums) for comments, discussion and community support
 
-This should help you get started with Volcano CRM.
+## Description
 
-## Installation
-Clone the repo:
+FuelPHP is a fast, lightweight PHP 5.3 framework. In an age where frameworks are a dime a dozen, We believe that FuelPHP will stand out in the crowd.  It will do this by combining all the things you love about the great frameworks out there, while getting rid of the bad.
 
-	$ git clone -b dev ssh://git@code.onesite.com/volcano/crm.git volcano
+## More information
 
-Initialize all submodules:
+For more detailed information, see the [development wiki](https://github.com/fuelphp/fuelphp/wiki).
 
-	$ cd volcano && git submodule update --init --recursive
+##Development Team
 
-Update Composer and dependencies:
+* Harro Verton - Project Manager, Developer ([http://wanwizard.eu/](http://wanwizard.eu/))
+* Frank de Jonge - Developer ([http://frenky.net/](http://frenky.net/))
 
-	$ php composer.phar self-update
-	$ php composer.phar update
+### Want to join?
 
-## Configuration
-Create a new local database.
+The FuelPHP development team is always looking for new team members, who are willing
+to help lift the framework to the next level, and have the commitment to not only
+produce awesome code, but also great documentation, and support to our users.
 
-Update the dev database config (`fuel/app/config/development/db.php`).
+You can not apply for membership. Start by sending in pull-requests, work on outstanding
+feature requests or bugs, and become active in the #fuelphp IRC channel. If your skills
+are up to scratch, we will notice you, and will ask you to become a team member.
 
-Set file permissions and run migrations:
+### Alumni
 
-	$ php oil r setup
-
-For API development and testing, insert a new record into the api_keys table.
-
-Copy the key you inserted and add it to `fuel/app/config/development/api.php` so that you don't have to specify the api_key param when testing locally.
-
-## Usage
-
-#### Deployment
-Deploy code to an environment using Capistrano. Environment (env) can be staging or production.
-
-	$ cap env deploy
+* Jelmer Schreuder - Developer ([http://jelmerschreuder.nl/](http://jelmerschreuder.nl/))
+* Phil Sturgeon - Developer ([http://philsturgeon.co.uk](http://philsturgeon.co.uk))
+* Dan Horrigan - Founder, Developer ([http://dhorrigan.com](http://dhorrigan.com))

composer.json

@@ -18,7 +18,7 @@
     "require": {
         "php": ">=5.3.3",
         "monolog/monolog": "1.5.*",
-    	"fuelphp/upload": "2.0"
+    	"fuelphp/upload": "2.0.1"
     },
     "suggest": {
         "mustache/mustache": "Allow Mustache templating with the Parser package",
@@ -29,5 +29,10 @@
     "config": {
         "vendor-dir": "fuel/vendor"
     },
+    "scripts": {
+        "post-install-cmd": [
+            "php oil r install"
+        ]
+    },
     "minimum-stability": "dev"
 }

docs/.gitignore

@@ -2,3 +2,7 @@
 nbproject
 *.tmproj
 *.swp~
+
+#intellij
+.idea
+