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
2,040 Commits 194 Branches 964 Tags
b6a73f08071017e82d471dc12ac94de36649e466
Commit Graph

2040 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Max Lynch
568400ba73 Merge pull request #369 from matiboy/368-use-promise-on-modal 
#368: Use promise on modal creation
 2014-01-07 17:21:33 -08:00
Max Lynch
437317c07c Merge branch 'pr/351' 
Conflicts:
	dist/css/ionic.css
	dist/js/ionic-angular.js
	dist/js/ionic.js
 2014-01-07 19:17:42 -06:00
Max Lynch
c0e11312bb Resize after infinite scroll 2014-01-07 19:08:16 -06:00
Mathieu
45ed9b3757 Return promise object that resolves with the modal object 
Make callback optional
 2014-01-08 09:01:39 +08:00
Max Lynch
0a6cf0a347 Fixed side menu 2014-01-07 18:36:26 -06:00
Max Lynch
6261eda77f Removed some unnecessary tests no long used 2014-01-07 18:29:56 -06:00
Max Lynch
0c78f59262 Force travis rebuild 2014-01-07 18:24:26 -06:00
Max Lynch
bfb4339c5f Merge pull request #367 from driftyco/pr/194 
Cleanups from @sorich87 for side menus, minus some scope destroy stuff
 2014-01-07 16:02:24 -08:00
Max Lynch
8673bf6114 Cleanups minus destroy stuff 2014-01-07 18:00:52 -06:00
Max Lynch
1f7694006e built version number bump 2014-01-07 13:53:13 -06:00
Max Lynch
879f63f402 Fixed loading view width for #364 2014-01-07 13:53:01 -06:00
Adam Bradley
950df2bb3e updated to angular v1.2.7 2014-01-05 15:04:03 -06:00
Adam Bradley
549b2a88d8 Merge pull request #342 from friedreiss/master 
Updated bower, package, component versions.
 2014-01-04 21:24:29 -08:00
Adam Bradley
fd331d9413 closes #339 2014-01-04 23:22:46 -06:00
Adam Bradley
d97db16358 dist updates 2014-01-04 20:49:05 -06:00
Adam Bradley
d281debb1f Merge pull request #357 from xAlien95/patch-1 
renamed slideOutToleft to slideOutToLeft
 2014-01-03 14:06:01 -08:00
Adam Bradley
5f09e643d8 Merge pull request #354 from calendee/fixSlideBoxComments 
Fix slide box comments
 2014-01-03 14:04:45 -08:00
Mathieu
ec9c04befa Cleaner using bind 2014-01-03 14:52:50 +08:00
Mathieu
afa389d9ce Make item type dynamic (similar to ng-class) 2014-01-03 14:48:14 +08:00
Stefano De Carolis
6f8b726ace renamed slideOutToleft to slideOutToLeft 2013-12-31 17:48:29 +01:00
Justin Noel
cf8106a2a2 Fixed split word in description. 
Signed-off-by: Justin Noel <github@calendee.com>
 2013-12-29 22:31:00 -06:00
Justin Noel
ae0ab51d71 Corrected description comments for slide box. 
Signed-off-by: Justin Noel <github@calendee.com>
 2013-12-29 22:28:58 -06:00
Mathieu
2fdc431bc3 Add support for distance attribute in infinite scroll 2013-12-28 12:20:05 +08:00
Mathieu
fed9ff29a9 Add 3 movies in example, looks better 2013-12-28 12:05:09 +08:00
Mathieu
7a1045058c Add a new example including infinite scroll 2013-12-28 11:57:20 +08:00
Mathieu
658649c48d Parse error 2013-12-28 11:53:42 +08:00
Mathieu
197349e77d Bind infinite scroll 2013-12-28 11:50:08 +08:00
Mathieu
7d5f5e6325 Add infinite scroll directive and handle infinite scroll in content directive 2013-12-28 10:43:50 +08:00
Mathieu
29c0fc0c04 Add infinite scroll CSS 2013-12-28 10:38:15 +08:00
Owen Reiss
166a2f1af4 Update package.json 2013-12-21 16:30:36 -08:00
Owen Reiss
21bd90c17f Update bower.json 2013-12-21 16:29:58 -08:00
Owen Reiss
e0bfde70fc Update component.json 2013-12-21 16:29:35 -08:00
Max Lynch
0820277222 Added touch callout none to body 2013-12-19 15:57:20 -06:00
Max Lynch
25c7ec8156 ignore that 2013-12-18 20:40:26 -06:00
Max Lynch
5d5b5b95a5 Fixed #126 - tap header scroll to top 2013-12-18 19:26:22 -06:00
Max Lynch
aa4053b365 Fixed bad test v0.9.18-alpha 2013-12-18 12:23:36 -06:00
Max Lynch
e1ae338b51 Fixed #288, added carousel support to slide box 
Also fixed evevt bubbling and incorrect iOS 7 detection in mobile safari
 2013-12-18 12:21:52 -06:00
Max Lynch
c7b84f5204 Change the default color of the pager icons 2013-12-17 14:37:47 -06:00
Max Lynch
a87006261c Added full container sizing to slide box 2013-12-17 14:17:19 -06:00
Max Lynch
9af5f3c411 recompile ionic-angular 2013-12-17 11:54:05 -06:00
Max Lynch
3ca427501e iOS 7 detection and removed console log 2013-12-17 11:53:51 -06:00
Max Lynch
b4d88225e4 Merge pull request #336 from mallzee/uglify-fix 
Fixes circular dependancy error when uglified
 2013-12-17 09:20:29 -08:00
Jamie Sutherland
9f86324dd7 Fixes circular dependancy error when uglified 2013-12-17 17:02:12 +00:00
Max Lynch
45ef1a540a Minifaction v0.9.17-alpha 2013-12-16 22:36:22 -06:00
Max Lynch
b97900f7e5 Fixed #167 and #312 - nav bar router issues 2013-12-16 21:12:32 -06:00
Max Lynch
6e62d3789a Merge pull request #329 from driftyco/328-slide-box 
Revamped slide box
 2013-12-16 16:24:23 -08:00
Max Lynch
89a3b7538d Fixing up some tests 2013-12-16 18:21:41 -06:00
Adam Bradley
8683f0d1fe create a new issue link 2013-12-16 15:47:34 -06:00
Adam Bradley
65e43df487 upd contributing.md 2013-12-16 15:46:40 -06:00
Adam Bradley
496d66ba1e update contributing.md 2013-12-16 15:45:24 -06:00