Adam Bradley 974a70cf0e Merge branch 'master' into alpha38 ...

Conflicts:
	ionic/components/popup/popup.ts

2015-10-05 16:43:30 -05:00

..

action-sheet

refactor(overlay): actionsheet/popup

2015-10-04 22:35:54 -05:00

app

refactor(overlay): actionsheet/popup

2015-10-04 22:35:54 -05:00

badge

list/item/button/card css overhaul

2015-08-25 13:17:29 -05:00

button

Merge branch 'master' into alpha38

2015-10-05 11:47:45 -05:00

card

chore(): rename annotations to decorators

2015-09-22 13:15:10 -05:00

checkbox

remove ion- component prefixes for now

2015-10-05 16:20:32 -05:00

content

remove ion- component prefixes for now

2015-10-05 16:20:32 -05:00

form

remove ion- component prefixes for now

2015-10-05 16:20:32 -05:00

grid

css cleanup

2015-09-05 21:02:45 -05:00

icon

refactor(config): get/set/settings and unit tests

2015-10-02 15:23:08 -05:00

item

Merge branch 'master' into alpha38

2015-10-05 16:43:30 -05:00

list

Merge branch 'master' into alpha38

2015-10-05 16:43:30 -05:00

menu

menu api docs

2015-10-05 15:24:48 -05:00

modal

remove ion- component prefixes for now

2015-10-05 16:20:32 -05:00

nav

nav doc tweaks

2015-10-05 15:24:48 -05:00

nav-bar

use title service

2015-10-04 11:45:32 -05:00

overlay

working modals

2015-10-05 11:05:55 -05:00

popup

remove ion- component prefixes for now

2015-10-05 16:20:32 -05:00

radio

remove ion- component prefixes for now

2015-10-05 16:20:32 -05:00

scroll

Merge branch 'master' into alpha38

2015-10-05 16:43:30 -05:00

search-bar

Merge branch 'search-bar' of github.com:driftyco/ionic2 into search-bar

2015-10-05 15:04:24 -06:00

segment

Merge branch 'master' into alpha38

2015-10-05 16:43:30 -05:00

show-hide-when

alpha38, first pass

2015-10-03 16:02:24 -05:00

slides

chore(): rename annotations to decorators

2015-09-22 13:15:10 -05:00

switch

remove ion- component prefixes for now

2015-10-05 16:20:32 -05:00

tabs

Merge branch 'master' into alpha38

2015-10-05 16:43:30 -05:00

tap-click

bootstrap refactor wip

2015-10-04 00:20:41 -05:00

text-input

refactor(config): get/set/settings and unit tests

2015-10-02 15:23:08 -05:00

toolbar

feat(segment): default styles and header fit

2015-10-02 11:25:40 -05:00

ion.ts

refactor(config): get/set/settings and unit tests

2015-10-02 15:23:08 -05:00