1749 Commits

Author SHA1 Message Date
52bcc24901 docs(demos): actionsheet style and content 2015-10-08 14:55:36 -05:00
3559eb04fb fix(demos): fix icon, modals 2015-10-08 14:30:04 -05:00
e7d1bb9812 Merge remote-tracking branch 'origin/master'
Conflicts:
	demos/component-docs/menus/menus.html
2015-10-08 15:18:24 -04:00
c2d56d8623 refactor(padding): changed padding to attributes
Updated demos. Closes #266
2015-10-08 15:15:20 -04:00
0171f84cc1 docs(demos): use Page instead of IonicView 2015-10-08 14:13:06 -05:00
1016af0c2a docs(demos): add menu demo 2015-10-08 14:13:06 -05:00
8665f65cf0 remove padding from demo 2015-10-08 14:13:06 -05:00
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
a1155b4663 update nav-controller tests to angular test methods 2015-10-08 12:30:30 -05:00
3203fa16a1 use angular2/test_lib for tests 2015-10-08 12:30:30 -05:00
a92ea015bd docs(demos): directly load a page when parent window has url hash 2015-10-08 11:06:11 -05:00
dcebbeaf56 refactor(demos): give each component section its own view 2015-10-08 10:02:51 -05:00
c3eed60d22 :derp: missing comma 2015-10-08 09:36:43 -05:00
f3eca12f6d fix(item): sliding item updates 2015-10-08 09:18:00 -05:00
9bf2ad4fb6 NavController tests 2015-10-07 22:21:06 -05:00
1d3d40cab5 feat(ionicBindings): pass in IonicConfg instance
Closes #258
2015-10-07 21:51:54 -05:00
3658966b29 Merge branch 'alpha38' 2015-10-07 21:09:08 -05:00
5996460b43 Merge branch 'master' into alpha38 2015-10-07 21:06:48 -05:00
62deaa5a2d docs(demos): update android action sheet 2015-10-07 16:56:37 -05:00
e21ea4b8e1 Merge branch 'master' into alpha38 2015-10-07 16:47:23 -05:00
f8cc44e4cf chore(NavController): make zone private 2015-10-07 16:47:16 -05:00
1b20b65f0a refactor(NavController): pass in DI 2015-10-07 16:43:46 -05:00
98db9de633 docs(demos): hide scrollbar 2015-10-07 16:16:49 -05:00
013389d7ca fix(searchbar): set directives 2015-10-07 15:07:50 -05:00
c657bb6d6a alpha39 updates/hacks
Conflicts:
	ionic/components/search-bar/search-bar.ts
	ionic/config/decorators.ts
2015-10-07 14:57:58 -05:00
9fc63fe17d rename lifecycle events view -> page 2015-10-07 14:46:18 -05:00
a3da0fa68f update api docs to say page instead of view 2015-10-07 14:37:19 -05:00
613b438746 update NavRegistry views -> pages 2015-10-07 14:23:16 -05:00
d2d7fc8cea link to Page from IONIC_DIRECTIVES api doc 2015-10-07 14:23:16 -05:00
bb6c8865d1 merge 2015-10-07 13:59:50 -05:00
02f04c7322 Merge branch 'master' into alpha38
Conflicts:
	ionic/config/decorators.ts
2015-10-07 13:56:16 -05:00
26e3554d56 rename IonicView to Page 2015-10-07 13:44:53 -05:00
bbdbe823cd refactor(search-bar): working on animations 2015-10-07 14:38:40 -04:00
8aa3e3e842 docs(demos): add basic popup 2015-10-07 12:49:26 -05:00
ef36fc2455 docs(demos): icon buttons 2015-10-07 12:49:26 -05:00
6c5fd79615 style(blur): Missing comma 2015-10-07 13:06:45 -04:00
4d47aa237e feat(search-bar): Added input blur on the cancelAction function and some awful animation to the cancel button
references #247
2015-10-07 12:59:38 -04:00
ea2647123a change .item-text-wrap css class to [text-wrap] attr 2015-10-07 11:15:54 -05:00
141078f979 fix(popup): hide prompt on alert and confirm 2015-10-07 11:10:38 -05:00
bdaed1b2ca Merge branch 'master' into alpha38
Conflicts:
	ionic/components/search-bar/search-bar.ts
	ionic/config/decorators.ts
2015-10-07 10:59:15 -05:00
0be37b201f rename IonicComponent to ConfigComponent 2015-10-07 10:54:28 -05:00
1befe94802 alpha39 updates 2015-10-07 10:51:08 -05:00
19aa828846 :derp: console logs 2015-10-07 09:31:04 -05:00
ce6dbd1ee2 feat(blur): iOS Blur Directive 2015-10-07 09:28:01 -05:00
17ecb54e52 docs(ionicPlatform): inital pass for platform docs
Closes #257
2015-10-07 10:09:58 -04:00
e4ba21bfe1 docs(ionicConfig): add inital config docs
Close #256
2015-10-07 09:37:02 -04:00
a960069d01 tests(inputs): update e2e switch/checkbox/radio 2015-10-06 22:49:32 -05:00
f7bed3e098 fix(textInputs): register components, don't use Query 2015-10-06 22:20:40 -05:00
d0a077c535 Merge branch 'master' into alpha38 2015-10-06 20:38:12 -05:00
50b6fdea8d Merge branch 'master' into alpha38
Conflicts:
	ionic/components/search-bar/search-bar.ts
	ionic/config/decorators.ts
2015-10-06 20:38:04 -05:00