Skip to content

Commit

Permalink
Merge branch '2.0'
Browse files Browse the repository at this point in the history
Conflicts:
	README.md

Signed-off-by: crynobone <crynobone@gmail.com>
  • Loading branch information
crynobone committed Oct 21, 2013
2 parents 781ecac + 2be4cd5 commit 9b3cedb
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 2 deletions.
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@ Orchestra Platform Widget Component
[![Latest Stable Version](https://poser.pugx.org/orchestra/widget/v/stable.png)](https://packagist.org/packages/orchestra/widget)
[![Total Downloads](https://poser.pugx.org/orchestra/widget/downloads.png)](https://packagist.org/packages/orchestra/widget)
[![Build Status](https://travis-ci.org/orchestral/widget.png?branch=master)](https://travis-ci.org/orchestral/widget)
[![Coverage Status](https://coveralls.io/repos/orchestral/widget/badge.png?branch=master)](https://coveralls.io/r/orchestral/widget?branch=master)
[![Coverage Status](https://coveralls.io/repos/orchestral/widget/badge.png?branch=master)](https://coveralls.io/r/orchestral/widget?branch=master)
[![Scrutinizer Quality Score](https://scrutinizer-ci.com/g/orchestral/widget/badges/quality-score.png?s=c45e8b240b7aedd08eaf70a0061c2b1d25c04f09)](https://scrutinizer-ci.com/g/orchestral/widget/)

## Quick Installation

Expand Down
6 changes: 5 additions & 1 deletion docs/changes.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,10 @@ Widget Change Log

## Version 2.0

### v2.0.4

* Implement [PSR-2](https://github.com/php-fig/fig-standards/blob/master/accepted/PSR-2-coding-style-guide.md) coding standard.

### v2.0.3

* Add `Orchestra\Widget\Drivers::is()` to allow direct manipulation of `Illuminate\Support\Fluent` through `Orchestra\Support\Nesty::is()` API.
Expand All @@ -25,6 +29,6 @@ Widget Change Log
### v2.0.0

* Migrate `Orchestra\Widget` from Orchestra Platform 1.2.
* Change the way `Orchestra\Widget` handle positional insert; `before` to `<`, `after` to `>` and `child-of` to `^`.
* Change the way `Orchestra\Widget` handle positional insert; `before` to `<`, `after` to `>` and `child-of` to `^`.
* Implements `ArrayIterator`, eliminate the requirement to use `$widget->getItems()`.
* Move `Orchestra\Widget\Nesty` to `Orchestra\Support\Nesty`.

0 comments on commit 9b3cedb

Please sign in to comment.