Brandy Carney 67f0d3c7dd Merge remote-tracking branch 'origin/master' ...

# Conflicts:
#	ionic/components/segment/segment.ts

2015-12-16 15:47:07 -05:00

..

action-sheet

docs()

2015-12-14 15:06:06 -05:00

app

Merge remote-tracking branch 'origin/master' into WIP-api-demos

2015-12-16 11:13:03 -06:00

badge

refactor(sass): moved all mode files to the top level component directory and renamed to include the directory name

2015-12-09 17:20:11 -05:00

blur

docs(blur, config): api clean up

2015-12-15 11:48:03 -05:00

button

docs()

2015-12-14 18:13:29 -05:00

card

refactor(toggle): renamed ion-switch to ion-toggle

2015-12-10 14:50:52 -06:00

checkbox

fix(aria): aria label/id updates

2015-12-14 21:34:40 -06:00

content

docs() id, content, bootstrap, item, item-sliding

2015-12-15 16:57:54 -05:00

grid

import mode globals in all mode components

2015-12-04 21:34:27 -06:00

icon

docs()

2015-12-14 18:13:29 -05:00

item

docs()item-sliding and lists

2015-12-16 15:28:26 -05:00

list

docs()item-sliding and lists

2015-12-16 15:28:26 -05:00

menu

Merge remote-tracking branch 'origin/master' into WIP-api-demos

2015-12-16 11:13:03 -06:00

modal

fix(transition): default to ios-transition if animation not found

2015-12-11 08:38:27 -06:00

nav

fix(keyboard): close keyboard after transition

2015-12-16 10:49:24 -06:00

navbar

Merge remote-tracking branch 'origin/master' into WIP-api-demos

2015-12-16 11:13:03 -06:00

overlay

Merge branch 'master' into searchbar-fix

2015-12-10 17:55:44 -05:00

popup

chore(upgrad): ng alpha52 and case-sensitive templates

2015-12-10 22:52:55 -06:00

radio

Merge remote-tracking branch 'origin/master' into WIP-api-demos

2015-12-16 11:13:03 -06:00

scroll

Merge remote-tracking branch 'origin/master' into WIP-api-demos

2015-12-16 11:13:03 -06:00

searchbar

fix(searchbar): add click events back for safari

2015-12-14 12:37:37 -05:00

segment

Merge remote-tracking branch 'origin/master'

2015-12-16 15:47:07 -05:00

show-hide-when

docs(demos): camelCase

2015-12-16 13:35:49 -06:00

slides

fix(slides): change event emitter from next to emit

2015-12-16 15:43:59 -05:00

tabs

fix(attr): use pascalCase for config component

2015-12-15 09:56:20 -06:00

tap-click

Merge branch 'master' into searchbar-fix

2015-12-10 17:55:44 -05:00

text-input

docs(): labels, keyboard

2015-12-16 14:00:28 -05:00

toggle

fix(aria): aria label/id updates

2015-12-14 21:34:40 -06:00

toolbar

Merge remote-tracking branch 'origin/master'

2015-12-16 15:47:07 -05:00

ion.ts

Merge branch 'master' into searchbar-fix

2015-12-10 17:55:44 -05:00