Merge branch 'master' into 3.0

This commit is contained in:
Manu Mtz.-Almeida
2017-03-07 20:57:38 +01:00
46 changed files with 1402 additions and 160 deletions

View File

@ -127,6 +127,7 @@ import { HideWhen } from './components/show-hide-when/hide-when';
import { Slide } from './components/slides/slide';
import { Slides } from './components/slides/slides';
import { Spinner } from './components/spinner/spinner';
import { SplitPane } from './components/split-pane/split-pane';
import { Tab } from './components/tabs/tab';
import { Tabs } from './components/tabs/tabs';
import { TabButton } from './components/tabs/tab-button';
@ -241,6 +242,7 @@ export { HideWhen } from './components/show-hide-when/hide-when';
export { Slide } from './components/slides/slide';
export { Slides } from './components/slides/slides';
export { Spinner } from './components/spinner/spinner';
export { SplitPane, RootNode } from './components/split-pane/split-pane';
export { Tab } from './components/tabs/tab';
export { TabButton } from './components/tabs/tab-button';
export { TabHighlight } from './components/tabs/tab-highlight';
@ -313,6 +315,9 @@ export { reorderArray } from './util/util';
export { Animation, AnimationOptions, EffectProperty, EffectState, PlayOptions } from './animations/animation';
export { PageTransition } from './transitions/page-transition';
export { Transition } from './transitions/transition';
export { PlatformConfigToken } from './platform/platform-registry';
export { registerModeConfigs } from './config/mode-registry';
export { IonicGestureConfig } from './gestures/gesture-config';
@ -432,6 +437,7 @@ export { Transition } from './transitions/transition';
Slide,
Slides,
Spinner,
SplitPane,
Tab,
Tabs,
TabButton,
@ -526,6 +532,7 @@ export { Transition } from './transitions/transition';
Slide,
Slides,
Spinner,
SplitPane,
Tab,
Tabs,
TabButton,