Skip to content

Commit

Permalink
Merge master into page-lifecycle-events branch
Browse files Browse the repository at this point in the history
  • Loading branch information
frandiox committed Aug 20, 2015
2 parents 8e18940 + 8e380ac commit 37aae51
Show file tree
Hide file tree
Showing 28 changed files with 2,974 additions and 558 deletions.
3 changes: 3 additions & 0 deletions CHANGELOG.md
Expand Up @@ -35,6 +35,9 @@ v1.3.8-dev
* ons-tabbar: persistent tabs only throw 'init' event once.
* core: every child element will be wrapped inside an ons-page.
* ons-page: added page lifecycle events API
* ons-fab: Implemented 'fab' component.
* core: Added page attribute expressions.
* ons-carousel: Fixed [#844](https://github.com/OnsenUI/OnsenUI/issues/844).

v1.3.7
----
Expand Down
8 changes: 3 additions & 5 deletions README.md
@@ -1,13 +1,11 @@
# Onsen UI

[![Join us on Gitter](https://badges.gitter.im/Join Chat.svg)](https://gitter.im/OnsenUI/OnsenUI)
[![StackOverflow](http://img.shields.io/badge/stackoverflow-onsen--ui-FF412D.svg )]( http://stackoverflow.com/questions/tagged/onsen-ui)
[![TypeScript definitions on DefinitelyTyped](http://definitelytyped.org/badges/standard-flat.svg)](http://definitelytyped.org)
[![Circle CI](https://circleci.com/gh/OnsenUI/OnsenUI.svg?style=svg)](https://circleci.com/gh/OnsenUI/OnsenUI)

[![Coverage Status](https://coveralls.io/repos/OnsenUI/OnsenUI/badge.svg?branch=master&service=github)](https://coveralls.io/github/OnsenUI/OnsenUI?branch=master)

[![TypeScript definitions on DefinitelyTyped](http://definitelytyped.org/badges/standard-flat.svg)](http://definitelytyped.org)

[![Join us on Gitter](https://img.shields.io/badge/gitter-join%20chat-1dce73.svg)](https://gitter.im/OnsenUI/OnsenUI)

The best place to start with Onsen UI is our [Getting Started](http://onsen.io/guide/getting_started.html) page.

![The Answer to PhoneGap UI Development](https://cloud.githubusercontent.com/assets/9889313/5350569/eec8b870-7efb-11e4-90af-2f4d505e09a8.png)
Expand Down

0 comments on commit 37aae51

Please sign in to comment.