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,323 Commits 194 Branches 964 Tags
032d21bd13fac0d877d9690e27eae82e3f447ea8
Commit Graph

1323 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Adam Bradley
032d21bd13 removed ios7 theme 2014-01-10 23:39:04 -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
Max Lynch
28bf244d83 Removed failing nav router test 2014-01-10 16:30:37 -06:00
Adam Bradley
d03cd38120 dist rebuild v0.9.19-alpha 2014-01-10 15:34:08 -06:00
Adam Bradley
603e5231ab KOALA! 2014-01-10 15:26:29 -06: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
Max Lynch
7840c1bca9 Merge pull request #386 from malixsys/patch-1 
removed superfluous addedPadding
 2014-01-10 11:57:52 -08: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
621d42e03b Rebuild 2014-01-10 10:02:23 -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
42ce4e2e63 Merge pull request #382 from mrmusa/master 
Make loading element appear above tabs, items, etc
 2014-01-10 07:59:03 -08:00
Max Lynch
e385a4d3c6 Rebuild 2014-01-10 09:54:06 -06: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
434fa154ae tab nav view testing 2014-01-10 09:06:41 -06:00
Adam Bradley
915e7a9376 trim after its time to go 2014-01-10 09:03:22 -06:00
Musa Siddeeq
7eb93e639e Make loading element appear above tabs, items, etc 2014-01-09 16:42:04 -05: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
Adam Bradley
fe0862a126 .reverse for .nav-title-slide-ios7 2014-01-07 19:52:55 -06:00
Max Lynch
c0cee27747 Fixed #372 - navbar flash on initial load 2014-01-07 19:52:42 -06:00
Adam Bradley
1b07a7a87a add angular-ui-router to dist 2014-01-07 19:52:30 -06:00
Adam Bradley
f71fc76e94 remove nav-router 2014-01-07 19:51:27 -06:00
Adam Bradley
cfdefd452e update w/ ui-router 2014-01-07 19:50:39 -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
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