1141 Commits

Author SHA1 Message Date
974a70cf0e Merge branch 'master' into alpha38
Conflicts:
	ionic/components/popup/popup.ts
2015-10-05 16:43:30 -05:00
2bac3a9ef8 style(segment): Remove margin on first and last elements 2015-10-05 15:27:04 -06:00
5c17f82e7f remove ion- component prefixes for now
Closes #239.
2015-10-05 16:20:32 -05:00
a4327c6bab docs(checkbox): update Angular Forms docs link 2015-10-05 16:20:32 -05:00
f9d5e85800 Merge branch 'search-bar' of github.com:driftyco/ionic2 into search-bar 2015-10-05 15:04:24 -06:00
0642a46d19 Merge branch 'master' into search-bar 2015-10-05 17:03:16 -04:00
0cef1afe20 refactor(search-bar): Added iOS styling and another test page
References #247
2015-10-05 17:03:04 -04:00
0ae98ad835 Merge branch 'master' into alpha38 2015-10-05 15:25:40 -05:00
631472d3c1 nav doc tweaks 2015-10-05 15:24:48 -05:00
9916c187a9 menu api docs 2015-10-05 15:24:48 -05:00
a53efcdeb4 fix(config) 2015-10-05 15:20:47 -05:00
194f3e4aad fix(config): set user platform modes 2015-10-05 15:09:16 -05:00
b7d1d2debf Merge branch 'master' into alpha38
Conflicts:
	ionic/components/nav/view-controller.ts
	ionic/components/tabs/tab.ts
2015-10-05 11:47:45 -05:00
6955a8cdba fix(nav): update loader 2015-10-05 11:43:53 -05:00
649e76167f fix(popup): Removed button type, it's throwing console errors
References #183
2015-10-05 12:41:47 -04:00
d4c2342414 feat(button): Added ability to give the button a "type" which will be converted to an attribute.
Note this is working for basic buttons but breaks in the popup
currently, that is a TODO. Changed the default to types for the popup
to an empty string. Closes #183
2015-10-05 12:37:50 -04:00
cd319e1cf2 working modals 2015-10-05 11:05:55 -05:00
9b4b15d468 Merge branch 'master' into search-bar 2015-10-05 10:00:29 -06:00
6cc8a43427 Refactor(searchbar): Remove unused variables, remove console.log, and comments in index.tj and main.html 2015-10-05 10:00:17 -06:00
7a4f2ea3b1 feat(nav-push): NavPush api docs 2015-10-05 10:50:01 -05:00
dc8c2e76b0 overlay wip 2015-10-04 22:48:18 -05:00
657e7175ef Merge branch 'master' into alpha38 2015-10-04 22:36:50 -05:00
3324f3cc90 refactor(overlay): actionsheet/popup 2015-10-04 22:35:54 -05:00
13e146b3e5 fix tab tabs 2015-10-04 16:05:58 -05:00
45329851f5 chore(tabs): more tabs api docs 2015-10-04 16:03:36 -05:00
43a4a71629 chore(tab): tab api docs 2015-10-04 16:03:03 -05:00
2483b1ee08 chore(nav): add [root] description to api doc 2015-10-04 16:02:40 -05:00
7a954c3f1e container that contains lol 2015-10-04 14:12:26 -05:00
39c17ca5c5 chore(tabs): tabs API docs 2015-10-04 14:11:29 -05:00
3d6dbe3c9a tweak nav docs 2015-10-04 14:11:09 -05:00
dfe19a962d use title service 2015-10-04 11:45:32 -05:00
2b86705f54 bootstrap refactor wip 2015-10-04 00:20:41 -05:00
5345d10f21 alpha38, first pass 2015-10-03 16:02:24 -05:00
0358d1b162 chore(navController): improve doc wording 2015-10-03 08:51:18 -05:00
8f75a27980 chore(nav): improve doc wording 2015-10-03 08:40:29 -05:00
23a6b39add Fix(demo): Update search list items to have more selections. Add inset to list to avoid the weird bordering look 2015-10-02 23:18:56 -06:00
3215c05f4f Fix(search-bar): Have search bar go through items, provide filter, and filter those from list. Make search bar have valueAccessor it self update update control value to watcher 2015-10-02 23:10:52 -06:00
539edf8ebd chore(nav): more nav docs 2015-10-02 19:46:07 -05:00
5b0eda5be1 refactor(config): get/set/settings and unit tests 2015-10-02 15:23:08 -05:00
46fc56fb95 Fix(demo): Remove ion-view from demos for scoll (basic, pull-to-refresh) and tabs (tab-bar-bottom) 2015-10-02 14:10:05 -06:00
33dc40aad1 Fix(demo): Fix infinite list demo, remove ion-view 2015-10-02 13:12:04 -06:00
d63fbc1787 Merge branch 'master' into sticky-header-chrome 2015-10-02 13:04:49 -06:00
59713e6bb2 Fix(demo): update the sticky list demo, remove ion-view, only have ion-content. 2015-10-02 13:04:35 -06:00
e013c26879 fix(popup): Fix iOS button hover, convert some values to sass variables
Fix indentations of sass values, references #183
2015-10-02 14:55:17 -04:00
34b063550c fix(config): don't hide tab icons for MD 2015-10-02 14:40:58 -04:00
82ef03b346 fix(list): Fix for sticky titles in Chrome/Android. Currently broken 2015-10-02 12:40:22 -06:00
3b2eb8452e chore(popup): Adding API comments for docs for popups
References #183
2015-10-02 14:40:19 -04:00
78224f35ea fix(popup): Fixed iOS styling
References #183
2015-10-02 14:40:18 -04:00
dcc76f7e8d chore(popup): Renaming context to opts
References #183
2015-10-02 14:40:18 -04:00
f158bf95a8 chore(popup): Removing opts variable as it isn't used
Fixing iOS styling. References #183
2015-10-02 14:40:18 -04:00