Skip to content

Commit

Permalink
Merge branch '2.2' into 3.0
Browse files Browse the repository at this point in the history
Signed-off-by: crynobone <crynobone@gmail.com>

Conflicts:
	README.md
  • Loading branch information
crynobone committed Feb 6, 2015
2 parents 2599c4f + f6285cd commit 3e05c19
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 4 deletions.
3 changes: 1 addition & 2 deletions .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,7 @@
/.gitignore export-ignore
/.scrutinizer.yml export-ignore
/.travis.yml export-ignore
/Guardfile export-ignore
/build.xml export-ignore
/phpunit.xml export-ignore
/LICENSE.md export-ignore
/LICENSE export-ignore
/README.md export-ignore
File renamed without changes.
23 changes: 21 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Orchestra Platform View Component
View Component for Orchestra Platform
==============

View Component is Orchestra Platform approach to deliver themeable application that support extensions. The functionality evolves by modifying how `Illuminate\View\ViewFileFinder` would resolve which file, which would first look into the current active theme folder, before resolving it cascading-ly.
Expand All @@ -12,7 +12,16 @@ This would allow extension (or even packages) to have it's own set of view styli
[![Coverage Status](https://img.shields.io/coveralls/orchestral/view/3.0.svg?style=flat)](https://coveralls.io/r/orchestral/view?branch=3.0)
[![Scrutinizer Quality Score](https://img.shields.io/scrutinizer/g/orchestral/view/3.0.svg?style=flat)](https://scrutinizer-ci.com/g/orchestral/view/)

## Quick Installation
## Version Compatibility

Laravel | View
:----------|:----------
4.0.x | 2.0.x
4.1.x | 2.1.x
4.2.x | 2.2.x
5.0.x | 3.0.x

## Installation

To install through composer, simply put the following in your `composer.json` file:

Expand All @@ -24,6 +33,16 @@ To install through composer, simply put the following in your `composer.json` fi
}
```

And then run `composer install` from the terminal.

### Quick Installation

Above installation can also be simplify by using the following command:

composer require "orchestra/view=3.0.*"

## Configuration

Next add the service provider in `config/app.php`.

```php
Expand Down

0 comments on commit 3e05c19

Please sign in to comment.