Adam Bradley 2e6fb5cd04 Merge remote-tracking branch 'origin/master' ...

Conflicts:
	ionic/components/nav/nav-item.js
	ionic/components/view/view.scss

2015-06-02 15:35:57 -05:00

..

action-menu

Action Menu nice

2015-05-30 11:46:01 -05:00

alert

autoprefixer

2015-05-15 21:52:56 -05:00

app

Merge remote-tracking branch 'origin/master'

2015-06-02 15:35:57 -05:00

aside

Form and aside flex

2015-06-01 21:30:36 -05:00

badge

rename src to ionic

2015-04-25 10:59:09 -05:00

button

Button active state

2015-06-02 14:39:11 -05:00

card

Card tweaks

2015-06-01 16:46:08 -05:00

checkbox

update component properties to array

2015-05-29 09:34:08 -05:00

content

Toolbar, view, kitchen sink

2015-05-30 12:46:20 -05:00

form

Default platform to ios

2015-06-01 16:33:49 -05:00

icon

icon aria

2015-05-31 21:45:28 -05:00

item

Card tweaks

2015-06-01 16:46:08 -05:00

layout

autoprefixer

2015-05-15 21:52:56 -05:00

list

Hacker news

2015-05-27 16:57:57 -05:00

modal

Removed Modal Wrapper

2015-05-29 18:28:43 -05:00

nav

Merge remote-tracking branch 'origin/master'

2015-06-02 15:35:57 -05:00

nav-bar

ion-nav-pane

2015-06-02 15:31:18 -05:00

progress

barely making it work

2015-04-30 23:56:15 -05:00

radio

update component properties to array

2015-05-29 09:34:08 -05:00

router

remove ionic view

2015-05-04 09:17:17 -05:00

scroll

i put the break in changes

2015-05-11 22:33:32 -05:00

search-bar

Fixed up search bar

2015-06-02 12:25:28 -05:00

segment

Default platform to ios

2015-06-01 16:33:49 -05:00

slides

Cleanup slidebox

2015-05-21 16:44:50 -05:00

split-view

update component properties to array

2015-05-29 09:34:08 -05:00

switch

autoprefixer

2015-05-15 21:52:56 -05:00

tabs

tabs advanced wip

2015-06-01 10:55:37 -05:00

toolbar

hairline on toolbar

2015-06-02 14:39:33 -05:00

view

Merge remote-tracking branch 'origin/master'

2015-06-02 15:35:57 -05:00