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,354 Commits 194 Branches 964 Tags
cd13cf396d4d2fee5856c75113ee355397a4f94b
Commit Graph

329 Commits

Author SHA1 Message Date
Max Lynch
cd13cf396d Added Android back button support to action sheet, modal 2014-01-13 12:03:06 -06:00
Max Lynch
2008a72204 Fixed #242 - modal transition issue on start 2014-01-13 11:42:02 -06:00
Max Lynch
86d6889628 Fixed #380 - rename ionic services to use $ionic prefix 2014-01-13 10:46:41 -06:00
Max Lynch
5c414bbf00 Merge branch 'master' of https://github.com/driftyco/ionic 
Conflicts:
	dist/js/ionic-angular.min.js
 2014-01-13 10:17:45 -06:00
Max Lynch
d90ae2c9af Fixed #279 - transclusion issue with content 2014-01-13 10:17:28 -06:00
Adam Bradley
3a598aa21e switching tabs should not use $animate 2014-01-13 09:37:16 -06:00
Adam Bradley
4f155964dd nav bar hidden by default 2014-01-12 23:00:30 -06:00
Adam Bradley
3124ef3981 update how view's set titles, closes #337 2014-01-12 22:39:10 -06:00
Adam Bradley
8982a8ad40 Merge branch 'master' of https://github.com/driftyco/ionic 
Conflicts:
	dist/js/ionic-angular.min.js
	dist/js/ionic.min.js
 2014-01-12 22:00:48 -06:00
Adam Bradley
d4a9bed1d7 update enteringScope for view transition 2014-01-12 21:56:23 -06:00
matiboy
c4b66bc3d3 Make active slide optional 2014-01-13 11:12:41 +08:00
Max Lynch
ddadc461c0 Possible solution for #327 - platform detect 2014-01-12 20:46:53 -06:00
Max Lynch
8be060124a Merge branch 'master' of https://github.com/driftyco/ionic 
Conflicts:
	dist/js/ionic-angular.min.js
 2014-01-12 20:25:23 -06:00
Max Lynch
c5c68c2bf1 Removed ng-class on list item to not clash with user's use of ng-class 2014-01-12 20:24:44 -06:00
Adam Bradley
944e89acba deregister watches on view destroy 2014-01-12 20:12:53 -06:00
Adam Bradley
ff310600d9 fix view hideNavBar attribute, closes #394 2014-01-12 13:41:00 -06:00
Adam Bradley
71e1f98f19 show/hide back button from view 2014-01-11 23:25:13 -06:00
Adam Bradley
251025e512 clear view history, closes #393 2014-01-11 00:43:41 -06:00
Max Lynch
721048b599 Merge pull request #389 from malixsys/master 
ngRoute no longer needed, $route now provided by ui.router
 2014-01-10 16:52:07 -08:00
M Alix
108507629d ngRoute no longer needed, $route now provided by ui.router 2014-01-10 18:59:41 -05:00
Adam Bradley
a331ef15c9 delete unused nav router stuff 2014-01-10 15:26:13 -06:00
Adam Bradley
6d9dffe8e5 dist build 2014-01-10 15:13:16 -06:00
Adam Bradley
7cbfcc18d8 view-state fixes 2014-01-10 15:08:25 -06:00
M Alix
9ea41b9642 removed superfluous addedPadding 2014-01-10 14:27:41 -05:00
Max Lynch
c9bc2e2eea Fixed #360 - dynamic slidebox sizing 2014-01-10 12:50:56 -06:00
Max Lynch
35abb61493 Fix for #376 - modal scope error on remove 2014-01-10 10:01:34 -06:00
Max Lynch
48393f4f12 Merge pull request #379 from matiboy/290-bind-active-slide 
Feature #290: Two way data binding on active slide index
 2014-01-10 07:59:23 -08:00
Max Lynch
15e7f304f6 Merge branch 'master' of https://github.com/driftyco/ionic 
Conflicts:
	dist/js/ionic-angular.min.js
	dist/js/ionic.min.js
 2014-01-10 09:53:33 -06:00
Max Lynch
cb75c9de96 Fixed #366 - no Android scroll bouncing by default 2014-01-10 09:52:32 -06:00
Adam Bradley
915e7a9376 trim after its time to go 2014-01-10 09:03:22 -06:00
Adam Bradley
ead7224a1e angular-ui router 2014-01-09 11:12:39 -06:00
Adam Bradley
cd65a8dc7b v0.9.19 2014-01-09 09:49:37 -06:00
matiboy
16c1ed5745 Add binding to active slide, setting on change and watch on scope 2014-01-09 19:18:35 +08:00
Adam Bradley
9f952c3a50 view state wip 2014-01-08 22:37:03 -06:00
Adam Bradley
77fe96d2a4 remove navRouter, add viewState 2014-01-07 20:03:55 -06:00
Adam Bradley
3b3c649071 put some template changes in compile 2014-01-07 20:03:33 -06:00
Max Lynch
c0cee27747 Fixed #372 - navbar flash on initial load 2014-01-07 19:52:42 -06:00
Adam Bradley
f71fc76e94 remove nav-router 2014-01-07 19:51:27 -06:00
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
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