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
3,426 Commits 194 Branches 964 Tags
90a96bd120b557200475788519759b378caffe4e
Commit Graph

3426 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Adam Bradley
90a96bd120 Merge branch 'master' of https://github.com/driftyco/ionic 2014-12-06 21:15:29 -06:00
Adam Bradley
9289f9ccd9 style(): set $bar-height to $bar-subheader-height 2014-12-06 21:15:20 -06:00
Adam Bradley
45fb47fd2e Merge branch 'arturokunder-variable-subheader-height' 2014-12-06 21:12:37 -06:00
Adam Bradley
871f79541c Merge branch 'variable-subheader-height' of https://github.com/arturokunder/ionic into arturokunder-variable-subheader-height 2014-12-06 21:09:40 -06:00
Adam Bradley
da8dadd8e1 Merge pull request #2669 from kevnk/patch-1 
style(): use $button-border-radius on button-bar buttons
 2014-12-06 21:01:40 -06:00
Adam Bradley
4fc92c6ef5 refactor(backButton): update activated state 2014-12-05 14:28:46 -06:00
Andrew
4986a42bd7 test(): remove ddescribe 2014-12-05 12:40:35 -07:00
Andrew
8d7c8903bb feat($ionicLoading): allow options.hideOnStateChange 
Closes #2676
 2014-12-05 12:39:55 -07:00
Max Lynch
6edebbb689 feat(tabs): add active color state 2014-12-05 12:10:15 -06:00
Adam Bradley
c86962fbfb fix(tabs): slide box within modal within tabs 2014-12-05 11:40:00 -06:00
Adam Bradley
3bcda3f2f1 fix(modal): align header title after viewable 2014-12-04 15:11:15 -06:00
Andrew
8fe58b4a24 amend(slideBox): check index validity when select happens 2014-12-04 13:42:17 -07:00
Andrew
ee1d5d9ce8 fix(slideBox): if selected binding is string, parse to integer 2014-12-04 13:33:21 -07:00
Max Lynch
e44c2b5228 Fixed cheeky assignment 2014-12-04 14:14:22 -06:00
Max Lynch
f471f56f74 feat(platforms): allow overriding platform in querystring 2014-12-04 14:10:14 -06:00
Adam Bradley
b1c51ab712 refactor($compileProvider): always add $scope to element 
Parts of Ionic requires that $scope data is attached to the element. We
do not want to disable adding $scope data to the $element when
$compileProvider.debugInfoEnabled(false) is used.
 2014-12-04 12:14:48 -06:00
Adam Bradley
69b1a03dbf refactor(clickBlock): only use click block when animating 2014-12-04 08:56:20 -06:00
Kevin Kirchner
41ef7bf262 Using $button-border-radius on button-bar buttons 2014-12-04 07:29:59 -06:00
Adam Bradley
6a1c53301c fix(sideMenu): enable menu w/ different historyId back view 2014-12-03 23:28:00 -06:00
Adam Bradley
74cc98039b fix(navBar): calc correct button width before enter 2014-12-03 22:41:53 -06:00
Max Lynch
86ea0473ef fix(bar): move font weight to variable 2014-12-03 17:38:45 -06:00
Max Lynch
48087e4ebf fix(bar): fix title font weight 2014-12-03 17:37:14 -06:00
Max Lynch
05e3ab305e fix(tabs): Fixed font sizes 2014-12-03 17:21:38 -06:00
Adam Bradley
592a916dec Merge pull request #2656 from shprink/patch-1 
docs(ionicConfig): correct ionicConfig example
 2014-12-03 08:40:01 -06:00
Adam Bradley
ab15392f2b test(viewTitle): ionView title attr test 2014-12-03 08:29:26 -06:00
Adam Bradley
096784984f fix(clickBlock): cancel pending show if already hidden 2014-12-03 08:03:30 -06:00
Adam Bradley
6b4963ea6f refactor(transition): no timeout after render 2014-12-03 01:57:51 -06:00
Adam Bradley
d1c92dae14 refactor(activator): activate immediately when not scrolling 2014-12-03 01:54:28 -06:00
Adam Bradley
8a6bf1ab6f refactor(clickBlock): reduce auto expire 2014-12-03 01:52:27 -06:00
Adam Bradley
9513eb60ba style(jscs): code formatting 2014-12-03 01:04:40 -06:00
Adam Bradley
533dcabeb5 chore(update): angular v1.3.5 2014-12-02 23:56:48 -06:00
Adam Bradley
ab99b13be8 fix(tabs): remove cache=false tab view element 2014-12-02 23:49:36 -06:00
Julien Renaux
9bcc89be81 Update ionicConfig.js 
Fix typo on doc
 2014-12-02 23:13:01 +01:00
Adam Bradley
0fd6e915aa fix($ionicTabsDelegate): find active tab instance 2014-12-02 15:43:28 -06:00
Adam Bradley
767362bebd fix(tabs): remove unselected tabs on clearCache 2014-12-02 11:50:28 -06:00
Wesley Cho
0a8eb3914f fix(scrollView): make mousewheel events firefox-compatible 
Closes #2616
 2014-12-01 16:41:47 -07:00
Andrew
0a08c36aa9 docs(slidebox): add comment about why we use !important 2014-12-01 16:33:44 -07:00
Andrew
6bb630341d style(slideBox): make display none important on hidden slides 2014-12-01 16:27:00 -07:00
Andrew
b554ac15d1 style(slideBox): default to display: block, make overridable 2014-12-01 16:14:08 -07:00
Andrew
cd5aaa5df2 feat(slideBox): add on-slide-start callback 2014-12-01 16:10:53 -07:00
Adam Bradley
55b35b5409 feat(ionNavTitle): HTML nav-bar titles 2014-12-01 15:56:35 -06:00
Andrew
73cd0c8563 style(slideBox): fix the fix for scrolling 2014-12-01 14:45:46 -07:00
Andrew
de4ffa39f9 style(slideBox): stop scroll once horizontal dragging is active 2014-12-01 14:43:59 -07:00
Andrew
0981ba9775 test(slidebox): attr quotes 2014-12-01 14:14:17 -07:00
Andrew
b867caa7ca test(slideBox): make test slides more contrasted 2014-12-01 14:13:32 -07:00
Andrew
3f33a3cd1c refactor(slideBox): store/retrieve slide content scope in a more robust manner 2014-12-01 13:18:35 -07:00
Andrew
c950152e83 style(slideBox): add cursor:pointer to slider pager buttons 2014-12-01 13:12:07 -07:00
Andrew
cc7a6fd44c amend(slideBox): when changing by >=2 slides, transition correctly 2014-12-01 13:10:56 -07:00
Andrew
a49e577db8 fix(collectionRepeat): parse collection-item-height/width to int 
Closes #2633.
 2014-12-01 10:58:44 -07:00
Andrew
037d2c368e fix(scrollView): fix null pointer exception on scrollbar 2014-12-01 10:58:44 -07:00