javascript/ionic-framework
1
0
Fork 0
mirror of https://github.com/ionic-team/ionic-framework.git synced 2026-03-13 10:22:08 +08:00
Code Issues Packages Projects Releases Wiki Activity
1,771 Commits 194 Branches 964 Tags
9addec6a7df0eaa5a233b04fae1190ce6e32e4cc
Commit Graph

1771 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Adam Bradley
9addec6a7d Merge branch 'alpha40' 2015-10-09 00:19:31 -05:00
Adam Bradley
8f1a0b40f9 Revert "NavController popTo takes componentType" 
This reverts commit 63aebf8ba8.
 2015-10-09 00:18:02 -05:00
Adam Bradley
17f64370fd fix(navController): fix this.add and _popTo ref 2015-10-09 00:16:25 -05:00
Adam Bradley
72ad5c1fb5 init alpha40 2015-10-08 23:54:50 -05:00
Tim Lancina
b0bc991456 fix navcontroller tests 2015-10-08 22:58:11 -05:00
Tim Lancina
63aebf8ba8 NavController popTo takes componentType 2015-10-08 22:56:17 -05:00
Adam Bradley
b2336550dd chore(): user renderer more for icons 2015-10-08 21:57:10 -05:00
Adam Bradley
f18d114dbe test(button): add block button icon e2e 2015-10-08 21:48:04 -05:00
Adam Bradley
18519d1576 refactor(cssClass): update/cleanup css class usage 2015-10-08 21:32:16 -05:00
Tim Lancina
7ccdfed018 feat(nav-controller): remove method 2015-10-08 20:42:34 -05:00
Tim Lancina
f199e65767 fix(nav-controller): insert should return a promise 2015-10-08 20:42:33 -05:00
Tim Lancina
79185044f3 make some NavController methods private 2015-10-08 20:42:33 -05:00
Adam Bradley
0ef061c232 feat(focusOut): ability to blur focused element, close keyboard 2015-10-08 20:08:17 -05:00
Max Lynch
fa499e00c8 fix(item-group-title): no content required 2015-10-08 16:37:18 -05:00
jbavari
2eaec4ca96 Merge branch 'master' of github.com:driftyco/ionic2 2015-10-08 15:36:33 -06:00
jbavari
e30421645b Style(item-group): Fix spacing for code 2015-10-08 15:36:26 -06:00
Tim Lancina
f0dddefb49 NavController setRoot test 2015-10-08 16:25:48 -05:00
Tim Lancina
79031d3b2a NavController insert test 2015-10-08 16:19:54 -05:00
Tim Lancina
f1387c2cd4 Componet -> Component 2015-10-08 16:03:25 -05:00
Adam Bradley
cf56a370b3 fix(ripple): register tapClick after config/platform 
Closes #267
 2015-10-08 15:56:13 -05:00
Tim Lancina
e7f55042bd navController setViews test 2015-10-08 15:54:32 -05:00
Adam Bradley
b9ae06d442 refactor(input): improve focus handling, alpha39 fixes 2015-10-08 15:50:29 -05:00
Drew Rygh
52bcc24901 docs(demos): actionsheet style and content 2015-10-08 14:55:36 -05:00
Drew Rygh
3559eb04fb fix(demos): fix icon, modals 2015-10-08 14:30:04 -05:00
Brandy Carney
e7d1bb9812 Merge remote-tracking branch 'origin/master' 
Conflicts:
	demos/component-docs/menus/menus.html
 2015-10-08 15:18:24 -04:00
Brandy Carney
c2d56d8623 refactor(padding): changed padding to attributes 
Updated demos. Closes #266
 2015-10-08 15:15:20 -04:00
Drew Rygh
0171f84cc1 docs(demos): use Page instead of IonicView 2015-10-08 14:13:06 -05:00
Drew Rygh
1016af0c2a docs(demos): add menu demo 2015-10-08 14:13:06 -05:00
Drew Rygh
8665f65cf0 remove padding from demo 2015-10-08 14:13:06 -05:00
Brandy Carney
b07a3760e5 refactor(search-bar): Added JS to calculate the margin of the iOS cancel button 
References #247
 2015-10-08 14:04:23 -04:00
Tim Lancina
a1155b4663 update nav-controller tests to angular test methods 2015-10-08 12:30:30 -05:00
Tim Lancina
3203fa16a1 use angular2/test_lib for tests 2015-10-08 12:30:30 -05:00
Drew Rygh
a92ea015bd docs(demos): directly load a page when parent window has url hash 2015-10-08 11:06:11 -05:00
Drew Rygh
dcebbeaf56 refactor(demos): give each component section its own view 2015-10-08 10:02:51 -05:00
Max Lynch
c3eed60d22 :derp: missing comma 2015-10-08 09:36:43 -05:00
Max Lynch
f3eca12f6d fix(item): sliding item updates 2015-10-08 09:18:00 -05:00
Tim Lancina
9bf2ad4fb6 NavController tests 2015-10-07 22:21:06 -05:00
Adam Bradley
1d3d40cab5 feat(ionicBindings): pass in IonicConfg instance 
Closes #258
 2015-10-07 21:51:54 -05:00
Adam Bradley
3658966b29 Merge branch 'alpha38' 2015-10-07 21:09:08 -05:00
Adam Bradley
5996460b43 Merge branch 'master' into alpha38 2015-10-07 21:06:48 -05:00
Drew Rygh
62deaa5a2d docs(demos): update android action sheet 2015-10-07 16:56:37 -05:00
Adam Bradley
e21ea4b8e1 Merge branch 'master' into alpha38 2015-10-07 16:47:23 -05:00
Adam Bradley
f8cc44e4cf chore(NavController): make zone private 2015-10-07 16:47:16 -05:00
Adam Bradley
1b20b65f0a refactor(NavController): pass in DI 2015-10-07 16:43:46 -05:00
Drew Rygh
98db9de633 docs(demos): hide scrollbar 2015-10-07 16:16:49 -05:00
Adam Bradley
013389d7ca fix(searchbar): set directives 2015-10-07 15:07:50 -05:00
Adam Bradley
c657bb6d6a alpha39 updates/hacks 
Conflicts:
	ionic/components/search-bar/search-bar.ts
	ionic/config/decorators.ts
 2015-10-07 14:57:58 -05:00
Tim Lancina
9fc63fe17d rename lifecycle events view -> page 2015-10-07 14:46:18 -05:00
Tim Lancina
a3da0fa68f update api docs to say page instead of view 2015-10-07 14:37:19 -05:00
Tim Lancina
613b438746 update NavRegistry views -> pages 2015-10-07 14:23:16 -05:00