21 Commits

Author SHA1 Message Date
8e97c8b30c Merge remote-tracking branch 'origin/master'
Conflicts:
	src/components/app/_scaffolding.scss
2015-04-09 09:51:46 -05:00
e3ba98b7b8 tabs over tabs 2015-04-09 09:50:44 -05:00
8281fb3658 feat(splitView): add initial splitView (this is not final) 2015-04-09 08:37:49 -04:00
1b614634b3 tab updates 2015-04-08 08:12:30 -05:00
065214526f add initial split view, build to es5 2015-04-07 17:09:45 -06:00
02de37eaab remove source references to ionic2/components 2015-04-03 09:25:27 -06:00
f1bfac8ae7 add advanced tabs testg 2015-04-02 15:11:08 -06:00
f924bf2531 refactor(nav-viewport): rename animations to avoid confusion 2015-04-02 10:37:50 -06:00
fd74dc937e feat: initial nav 2015-04-01 19:41:01 -06:00
48f7d6bd26 initial version of switching with animations. needs work for logic 2015-04-01 18:08:24 -06:00
c20e510147 init tabs 2015-04-01 16:03:21 -05:00
54d3418d50 add back button platform config 2015-03-31 10:44:31 -06:00
ace419d505 test nav pushing and popping 2015-03-30 14:19:41 -06:00
d1be210f9f chore(build): make update-angular script actually update angular 2015-03-30 12:12:13 -06:00
b2fa14729a Custom page in nav test 2015-03-29 11:07:48 -06:00
1c15080ab0 View pushes to nav 2015-03-29 10:58:27 -06:00
1b42546a48 Add view to nav test 2015-03-29 10:42:50 -06:00
33c061b572 feat(nav-view): basic structure and example 2015-03-29 10:34:01 -06:00
18d82fb50d change all paths to use ionic2/ 2015-03-27 11:52:38 -06:00
4229fe7559 remove jspm, make e2e paths relative 2015-03-26 17:11:17 -06:00
be076d78cb tabs fixes 2015-03-23 20:02:33 -05:00