Skip to content

Commit

Permalink
Added a Composer file with license
Browse files Browse the repository at this point in the history
With this commit we add the composer.json and lock file together
with a license file indicating that this project is under the
MIT license (discussed with @akrabat to be sure).

In addition to the above I have prevented the .git folder in the
vendor folder from being committed.

The vendor folder itself will be submitted in a separate commit
to make it easier for a code reviewer to see which changes are
the onces actually needing a review.
  • Loading branch information
mvriel committed Jun 16, 2014
1 parent 98cacc2 commit 74c6ea0
Show file tree
Hide file tree
Showing 4 changed files with 270 additions and 0 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Expand Up @@ -12,3 +12,5 @@
.vagrant
*.swp
build/

vendor/.git
17 changes: 17 additions & 0 deletions LICENSE
@@ -0,0 +1,17 @@
Copyright (c) 2013, Lorna Jane Mitchell
All rights reserved.

Redistribution and use in source and binary forms, with or without modification, are permitted provided that the
following conditions are met:

* Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
* Neither the name of the <ORGANIZATION> nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.

THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
21 changes: 21 additions & 0 deletions composer.json
@@ -0,0 +1,21 @@
{
"name": "joindin/website",
"license": "MIT",
"autoload": {
"psr-0":{
"Application": ["app/src/", "tests/"],
"Event": ["app/src/", "tests/"],
"Search": ["app/src/", "tests/"],
"Talk": ["app/src/", "tests/"],
"User": ["app/src/", "tests/"]
}
},
"preferred-install": "dist",
"minimum-stability": "stable",
"require": {
"predis/predis": "~0.8",
"slim/slim": "~2.4",
"slim/views": "~0.1",
"twig/twig": "~1.15"
}
}
230 changes: 230 additions & 0 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 74c6ea0

Please sign in to comment.