Peter 6b0454ccf5 Merge commit 'ec59c3161adb37d4b5b908019250dddce1c27d84' ...

# Conflicts:
#	AsyncDisplayKit/Debug/ASLayoutElementInspectorCell.h
#	AsyncDisplayKit/Debug/ASLayoutElementInspectorCell.m
#	AsyncDisplayKit/Debug/ASLayoutElementInspectorNode.m
#	AsyncDisplayKit/Details/ASFlowLayoutController.h
#	AsyncDisplayKit/Details/ASFlowLayoutController.mm

2017-02-11 17:00:16 +03:00

..

Debug

Merge commit 'ec59c3161adb37d4b5b908019250dddce1c27d84'

2017-02-11 17:00:16 +03:00

Details

Merge commit 'ec59c3161adb37d4b5b908019250dddce1c27d84'

2017-02-11 17:00:16 +03:00

Layout

[Debug] Remove not used code around visualizing layout specs (#2991)

2017-02-10 13:09:09 -08:00

Private

Merge commit 'ec59c3161adb37d4b5b908019250dddce1c27d84'

2017-02-11 17:00:16 +03:00

TextKit

Remove Support for iOS 7 (#2930)

2017-02-01 14:40:37 -08:00

tvOS

Remove Support for iOS 7 (#2930)

2017-02-01 14:40:37 -08:00

_ASTransitionContext.h

Remove Support for iOS 7 (#2930)

2017-02-01 14:40:37 -08:00

_ASTransitionContext.m

Remove Support for iOS 7 (#2930)

2017-02-01 14:40:37 -08:00

ASBlockTypes.h

Remove Support for iOS 7 (#2930)

2017-02-01 14:40:37 -08:00

ASButtonNode.h

Repeal and replace ASControlState (#3005)

2017-02-09 13:10:10 -08:00

ASButtonNode.mm

Repeal and replace ASControlState (#3005)

2017-02-09 13:10:10 -08:00

ASCellNode.h

Merge commit '89156ebbc750a2d28b8d4594ccad62ef4c73127e'

2017-01-18 02:13:01 +03:00

ASCellNode.mm

Merge commit '404795dc02aa57b167223bfaee7c380907022ca1'

2017-02-02 11:46:47 +03:00

ASCellNode+Internal.h

Merge commit 'ec59c3161adb37d4b5b908019250dddce1c27d84'

2017-02-11 17:00:16 +03:00

ASCollectionNode.h

Merge commit 'ec59c3161adb37d4b5b908019250dddce1c27d84'

2017-02-11 17:00:16 +03:00

ASCollectionNode.mm

Merge commit 'ec59c3161adb37d4b5b908019250dddce1c27d84'

2017-02-11 17:00:16 +03:00

ASCollectionNode+Beta.h

Merge commit '404795dc02aa57b167223bfaee7c380907022ca1'

2017-02-02 11:46:47 +03:00

ASCollectionView.h

Merge commit 'ec59c3161adb37d4b5b908019250dddce1c27d84'

2017-02-11 17:00:16 +03:00

ASCollectionView.mm

Merge commit 'ec59c3161adb37d4b5b908019250dddce1c27d84'

2017-02-11 17:00:16 +03:00

ASCollectionViewLayoutFacilitatorProtocol.h

Merge commit '404795dc02aa57b167223bfaee7c380907022ca1'

2017-02-02 11:46:47 +03:00

ASCollectionViewProtocols.h

Merge commit '404795dc02aa57b167223bfaee7c380907022ca1'

2017-02-02 11:46:47 +03:00

ASContextTransitioning.h

…

ASControlNode.h

Repeal and replace ASControlState (#3005)

2017-02-09 13:10:10 -08:00

ASControlNode.mm

[Debug] Remove not used code around visualizing layout specs (#2991)

2017-02-10 13:09:09 -08:00

ASControlNode+Subclasses.h

Remove Support for iOS 7 (#2930)

2017-02-01 14:40:37 -08:00

ASDisplayNode.h

[ASDisplayNode] Add support for setting non-fatal error block (#2993)

2017-02-07 17:13:33 -08:00

ASDisplayNode.mm

Merge commit 'ec59c3161adb37d4b5b908019250dddce1c27d84'

2017-02-11 17:00:16 +03:00

ASDisplayNode+Beta.h

Fix CI that broke due to Yoga merge (#3012)

2017-02-10 11:17:25 -08:00

ASDisplayNode+Deprecated.h

Merge commit '404795dc02aa57b167223bfaee7c380907022ca1'

2017-02-02 11:46:47 +03:00

ASDisplayNode+Subclasses.h

[Yoga] Initial commit for supporting Yoga-powered layout calculation. (#2982)

2017-02-09 16:10:29 -08:00

ASDisplayNode+Yoga.mm

[Yoga] Initial commit for supporting Yoga-powered layout calculation. (#2982)

2017-02-09 16:10:29 -08:00

ASDisplayNodeExtras.h

Use Native convertRect:, convertPoint: Methods to Handle Nil Cases (#2889)

2017-01-11 13:44:35 -08:00

ASDisplayNodeExtras.mm

Remove Support for iOS 7 (#2930)

2017-02-01 14:40:37 -08:00

ASEditableTextNode.h

Remove Support for iOS 7 (#2930)

2017-02-01 14:40:37 -08:00

ASEditableTextNode.mm

Remove Support for iOS 7 (#2930)

2017-02-01 14:40:37 -08:00

ASIGListKitMethodImplementations.h

IGListKit Support II: Electric Boogaloo (#2942)

2017-01-30 11:16:59 -08:00

ASImageNode.h

Merge commit '404795dc02aa57b167223bfaee7c380907022ca1'

2017-02-02 11:46:47 +03:00

ASImageNode.mm

Merge commit '404795dc02aa57b167223bfaee7c380907022ca1'

2017-02-02 11:46:47 +03:00

ASImageNode+AnimatedImage.mm

Remove Support for iOS 7 (#2930)

2017-02-01 14:40:37 -08:00

ASMapNode.h

Merge commit '404795dc02aa57b167223bfaee7c380907022ca1'

2017-02-02 11:46:47 +03:00

ASMapNode.mm

Merge commit '404795dc02aa57b167223bfaee7c380907022ca1'

2017-02-02 11:46:47 +03:00

ASMultiplexImageNode.h

Merge commit '404795dc02aa57b167223bfaee7c380907022ca1'

2017-02-02 11:46:47 +03:00

ASMultiplexImageNode.mm

Merge commit '404795dc02aa57b167223bfaee7c380907022ca1'

2017-02-02 11:46:47 +03:00

ASNavigationController.h

Merge commit '404795dc02aa57b167223bfaee7c380907022ca1'

2017-02-02 11:46:47 +03:00

ASNavigationController.m

Merge commit '404795dc02aa57b167223bfaee7c380907022ca1'

2017-02-02 11:46:47 +03:00

ASNetworkImageNode.h

Merge commit 'ec59c3161adb37d4b5b908019250dddce1c27d84'

2017-02-11 17:00:16 +03:00

ASNetworkImageNode.mm

Merge commit 'ec59c3161adb37d4b5b908019250dddce1c27d84'

2017-02-11 17:00:16 +03:00

ASNodeController+Beta.h

[ASNodeController] Move ASNodeController to beta header (#2966)

2017-02-02 12:51:33 -08:00

ASNodeController+Beta.m

[ASNodeController] Move ASNodeController to beta header (#2966)

2017-02-02 12:51:33 -08:00

ASPagerFlowLayout.h

no message

2016-12-11 22:59:02 +03:00

ASPagerFlowLayout.m

Merge commit '404795dc02aa57b167223bfaee7c380907022ca1'

2017-02-02 11:46:47 +03:00

ASPagerNode.h

Merge commit 'ec59c3161adb37d4b5b908019250dddce1c27d84'

2017-02-11 17:00:16 +03:00

ASPagerNode.m

Merge commit 'ec59c3161adb37d4b5b908019250dddce1c27d84'

2017-02-11 17:00:16 +03:00

ASRunLoopQueue.h

Remove Support for iOS 7 (#2930)

2017-02-01 14:40:37 -08:00

ASRunLoopQueue.mm

Remove Support for iOS 7 (#2930)

2017-02-01 14:40:37 -08:00

ASScrollNode.h

[ASScrollNode] Add .scrollDirection property so that internal content sizing can be easily "unlimited" in the direction of scrolling. (#3001)

2017-02-08 16:39:05 -08:00

ASScrollNode.mm

[ASScrollNode] Add .scrollDirection property so that internal content sizing can be easily "unlimited" in the direction of scrolling. (#3001)

2017-02-08 16:39:05 -08:00

ASSectionController.h

Merge commit '404795dc02aa57b167223bfaee7c380907022ca1'

2017-02-02 11:46:47 +03:00

ASSupplementaryNodeSource.h

Remove Support for iOS 7 (#2930)

2017-02-01 14:40:37 -08:00

ASTabBarController.h

Merge commit '404795dc02aa57b167223bfaee7c380907022ca1'

2017-02-02 11:46:47 +03:00

ASTabBarController.m

Merge commit '404795dc02aa57b167223bfaee7c380907022ca1'

2017-02-02 11:46:47 +03:00

ASTableNode.h

Merge commit '404795dc02aa57b167223bfaee7c380907022ca1'

2017-02-02 11:46:47 +03:00

ASTableNode.mm

Merge commit 'ec59c3161adb37d4b5b908019250dddce1c27d84'

2017-02-11 17:00:16 +03:00

ASTableView.h

Merge commit 'ec59c3161adb37d4b5b908019250dddce1c27d84'

2017-02-11 17:00:16 +03:00

ASTableView.mm

Merge commit 'ec59c3161adb37d4b5b908019250dddce1c27d84'

2017-02-11 17:00:16 +03:00

ASTableViewInternal.h

Merge commit '404795dc02aa57b167223bfaee7c380907022ca1'

2017-02-02 11:46:47 +03:00

ASTableViewProtocols.h

Merge commit '404795dc02aa57b167223bfaee7c380907022ca1'

2017-02-02 11:46:47 +03:00

ASTextNode.h

[2.0] add helpful deprecation messages (#2437)

2016-10-19 14:48:06 -07:00

ASTextNode.mm

Remove Support for iOS 7 (#2930)

2017-02-01 14:40:37 -08:00

ASTextNode+Beta.h

Remove Support for iOS 7 (#2930)

2017-02-01 14:40:37 -08:00

ASVideoNode.h

Merge commit '404795dc02aa57b167223bfaee7c380907022ca1'

2017-02-02 11:46:47 +03:00

ASVideoNode.mm

Merge commit 'ec59c3161adb37d4b5b908019250dddce1c27d84'

2017-02-11 17:00:16 +03:00

ASVideoPlayerNode.h

Merge commit '404795dc02aa57b167223bfaee7c380907022ca1'

2017-02-02 11:46:47 +03:00

ASVideoPlayerNode.mm

Merge commit 'ec59c3161adb37d4b5b908019250dddce1c27d84'

2017-02-11 17:00:16 +03:00

ASViewController.h

Merge commit 'd9209e69c25657586b43a72def4c5ac537956e40' into debug-drawrect

2016-12-12 01:02:23 +03:00

ASViewController.mm

Merge commit 'ec59c3161adb37d4b5b908019250dddce1c27d84'

2017-02-11 17:00:16 +03:00

ASVisibilityProtocols.h

Remove Support for iOS 7 (#2930)

2017-02-01 14:40:37 -08:00

ASVisibilityProtocols.m

Remove Support for iOS 7 (#2930)

2017-02-01 14:40:37 -08:00

AsyncDisplayKit-Prefix.pch

Fix CI that broke due to Yoga merge (#3012)

2017-02-10 11:17:25 -08:00

AsyncDisplayKit.h

Improve TableLayoutController: Simplify, Fix Crash & Improve Perf (#2969)

2017-02-05 18:24:15 -08:00

AsyncDisplayKit.modulemap

no message

2017-02-02 02:59:08 +03:00

AsyncDisplayKit+Debug.h

Merge commit 'ec59c3161adb37d4b5b908019250dddce1c27d84'

2017-02-11 17:00:16 +03:00

AsyncDisplayKit+Debug.m

Merge commit 'ec59c3161adb37d4b5b908019250dddce1c27d84'

2017-02-11 17:00:16 +03:00

IGListAdapter+AsyncDisplayKit.h

IGListKit Support II: Electric Boogaloo (#2942)

2017-01-30 11:16:59 -08:00

IGListAdapter+AsyncDisplayKit.m

Fix a warning preventing pod spec validation. (#2989)

2017-02-06 13:06:52 -08:00

Info.plist

Remove Support for iOS 7 (#2930)

2017-02-01 14:40:37 -08:00

UIImage+ASConvenience.h

[UIImage+ASConvenience] Reorder header and add more documentation. (#3004)

2017-02-09 13:52:36 -08:00

UIImage+ASConvenience.m

[UIImage+ASConvenience] Reorder header and add more documentation. (#3004)

2017-02-09 13:52:36 -08:00