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,658 Commits 194 Branches 964 Tags
261532db0355b8aabaf162fec8fedfbebad43cd6
Commit Graph

1658 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Adam Bradley
261532db03 Merge branch 'master' into alpha38 2015-10-06 11:15:20 -05:00
Adam Bradley
f1b00c6446 tabs wip 2015-10-05 21:37:56 -05:00
jbavari
f2fd1ea314 chore(gulp): Add gulp src.link to watch files, run src, so users who have npm linked files will update their sass/ts/js 2015-10-05 20:13:22 -06:00
jbavari
67c53955a2 Fix(list): Update list items to show all variations of list + borders 2015-10-05 20:12:36 -06:00
Adam Bradley
04ac079cbc Merge branch 'master' into alpha38 2015-10-05 20:16:20 -05:00
Adam Bradley
26d7fd89d2 fix(): iOS header hairline 2015-10-05 20:15:02 -05:00
Adam Bradley
723a63704b chore(): remove old tabs e2e 2015-10-05 20:06:57 -05:00
Adam Bradley
5e05266052 fix(header): border bottom iOS 2015-10-05 20:05:08 -05:00
Adam Bradley
70810bab38 wip 2015-10-05 19:54:22 -05:00
jbavari
e53649affb Adding repeat-headers e2e to show the header/item border issue 2015-10-05 18:52:59 -06:00
Brandy Carney
058e28c094 refactor(search-bar): Added iOS styling and a close icon 
References #247
 2015-10-05 19:25:33 -04:00
Brandy Carney
2d7969cdf8 fix(item): fixed border left on first item after header 2015-10-05 19:25:33 -04:00
Tim Lancina
8185bfbe12 update IonicView api docs 2015-10-05 17:11:12 -05:00
Adam Bradley
974a70cf0e Merge branch 'master' into alpha38 
Conflicts:
	ionic/components/popup/popup.ts
 2015-10-05 16:43:30 -05:00
jbavari
2bac3a9ef8 style(segment): Remove margin on first and last elements 2015-10-05 15:27:04 -06:00
jbavari
8dcd00b845 Merge remote-tracking branch 'origin/master' into search-bar 2015-10-05 15:23:38 -06:00
Tim Lancina
5c17f82e7f remove ion- component prefixes for now 
Closes #239.
 2015-10-05 16:20:32 -05:00
Tim Lancina
a4327c6bab docs(checkbox): update Angular Forms docs link 2015-10-05 16:20:32 -05:00
Brandy Carney
8bb7a79e93 Merge branch 'search-bar' 2015-10-05 17:06:15 -04:00
jbavari
f9d5e85800 Merge branch 'search-bar' of github.com:driftyco/ionic2 into search-bar 2015-10-05 15:04:24 -06:00
Brandy Carney
0642a46d19 Merge branch 'master' into search-bar 2015-10-05 17:03:16 -04:00
Brandy Carney
0cef1afe20 refactor(search-bar): Added iOS styling and another test page 
References #247
 2015-10-05 17:03:04 -04:00
Adam Bradley
0ae98ad835 Merge branch 'master' into alpha38 2015-10-05 15:25:40 -05:00
Tim Lancina
631472d3c1 nav doc tweaks 2015-10-05 15:24:48 -05:00
Tim Lancina
9916c187a9 menu api docs 2015-10-05 15:24:48 -05:00
Adam Bradley
a53efcdeb4 fix(config) 2015-10-05 15:20:47 -05:00
Adam Bradley
194f3e4aad fix(config): set user platform modes 2015-10-05 15:09:16 -05:00
Adam Bradley
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
Adam Bradley
6955a8cdba fix(nav): update loader 2015-10-05 11:43:53 -05:00
Brandy Carney
649e76167f fix(popup): Removed button type, it's throwing console errors 
References #183
 2015-10-05 12:41:47 -04:00
Brandy Carney
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
jbavari
3068cd9ec7 Merge branch 'master' into search-bar 2015-10-05 10:06:14 -06:00
Adam Bradley
5560b1303c Merge branch 'master' into alpha38 2015-10-05 11:06:05 -05:00
Adam Bradley
cd319e1cf2 working modals 2015-10-05 11:05:55 -05:00
jbavari
fe1fb5fa3c Chore(scripts): Update npm scripts to assist in linking project and running tests 2015-10-05 10:05:45 -06:00
jbavari
9b4b15d468 Merge branch 'master' into search-bar 2015-10-05 10:00:29 -06:00
jbavari
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
Tim Lancina
7a4f2ea3b1 feat(nav-push): NavPush api docs 2015-10-05 10:50:01 -05:00
Adam Bradley
dc8c2e76b0 overlay wip 2015-10-04 22:48:18 -05:00
Adam Bradley
657e7175ef Merge branch 'master' into alpha38 2015-10-04 22:36:50 -05:00
Adam Bradley
3324f3cc90 refactor(overlay): actionsheet/popup 2015-10-04 22:35:54 -05:00
Tim Lancina
13e146b3e5 fix tab tabs 2015-10-04 16:05:58 -05:00
Tim Lancina
45329851f5 chore(tabs): more tabs api docs 2015-10-04 16:03:36 -05:00
Tim Lancina
43a4a71629 chore(tab): tab api docs 2015-10-04 16:03:03 -05:00
Tim Lancina
2483b1ee08 chore(nav): add [root] description to api doc 2015-10-04 16:02:40 -05:00
Tim Lancina
7a954c3f1e container that contains lol 2015-10-04 14:12:26 -05:00
Tim Lancina
39c17ca5c5 chore(tabs): tabs API docs 2015-10-04 14:11:29 -05:00
Tim Lancina
3d6dbe3c9a tweak nav docs 2015-10-04 14:11:09 -05:00
Adam Bradley
dfe19a962d use title service 2015-10-04 11:45:32 -05:00
Adam Bradley
2b86705f54 bootstrap refactor wip 2015-10-04 00:20:41 -05:00