Commit Graph

363 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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 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
a87006261c Added full container sizing to slide box 2013-12-17 14:17:19 -06:00
Max Lynch
3ca427501e iOS 7 detection and removed console log 2013-12-17 11:53:51 -06:00
Jamie Sutherland
9f86324dd7 Fixes circular dependancy error when uglified 2013-12-17 17:02:12 +00: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
496d66ba1e update contributing.md 2013-12-16 15:45:24 -06:00
Max Lynch
b996e9a8c7 SEXY 2013-12-16 15:36:14 -06:00
Max Lynch
4de3403f79 Removing animation from header and stuff 2013-12-16 13:20:38 -06:00
Adam Bradley
b9b842eaf9 option buttons use onTap instead of onClick 2013-12-16 10:38:56 -06:00
Max Lynch
ae1e3392a7 Binding scope on modal obj 2013-12-16 09:55:38 -06:00
Max Lynch
196e015015 More slide stuff working 2013-12-16 09:52:03 -06:00
Max Lynch
8d42f856da Continuous 2013-12-15 21:26:14 -06:00
Max Lynch
b9ebcd86a4 Much better slide box 2013-12-15 21:14:35 -06:00