appleguy 6c0ec8b423 Merge pull request #1579 from Xinchi/ASVideoNode ...

Removing an unnecessary assertion in ASVideoNode

2016-04-21 20:45:59 -07:00

..

Details

Merge pull request #1559 from garrettmoon/upstream-GIF-Cleanup

2016-04-19 16:43:49 -07:00

Layout

Small improvements for ASLayoutSpec

2016-04-15 07:11:24 -07:00

Private

Merge pull request #1273 from aaronschubert0/tvOS

2016-04-20 13:29:31 -07:00

TextKit

Merge pull request #1536 from garrettmoon/upstream-renderer-lock

2016-04-15 20:57:32 -07:00

_ASTransitionContext.h

…

_ASTransitionContext.m

…

ASButtonNode.h

Fix merge conflicts

2016-04-19 09:02:07 +01:00

ASButtonNode.mm

Fix merge conflicts

2016-04-19 09:02:07 +01:00

ASCellNode.h

…

ASCellNode.m

remove check for self.isNodeLoaded to fix layout issues of ASCellNodes in an ASCollectionView when being resized after calling setNeedsLayout()

2016-04-21 16:13:57 -04:00

ASCellNode+Internal.h

…

ASCollectionNode.h

…

ASCollectionNode.mm

Improve setting special properties for certain classes directly to the UIView

2016-04-19 10:50:22 -07:00

ASCollectionNode+Beta.h

…

ASCollectionView.h

…

ASCollectionView.mm

Addressed comments

2016-04-19 16:13:30 -07:00

ASCollectionViewLayoutFacilitatorProtocol.h

…

ASCollectionViewProtocols.h

…

ASContextTransitioning.h

…

ASControlNode.h

Fix merge conflicts

2016-04-19 09:02:07 +01:00

ASControlNode.mm

Fix merge conflicts

2016-04-19 09:02:07 +01:00

ASControlNode+Subclasses.h

…

ASDisplayNode.h

…

ASDisplayNode.mm

Merge pull request #1273 from aaronschubert0/tvOS

2016-04-20 13:29:31 -07:00

ASDisplayNode+Beta.h

…

ASDisplayNode+Subclasses.h

[ASMapNode] snapshot can be triggered before layout and cause exception (e.g. setAnnotations)

2016-04-14 23:05:35 -07:00

ASDisplayNodeExtras.h

Use __kindof annotation for subside traversal methods that filter based on class

2016-04-12 17:24:28 -07:00

ASDisplayNodeExtras.mm

Use __kindof annotation for subside traversal methods that filter based on class

2016-04-12 17:24:28 -07:00

ASEditableTextNode.h

…

ASEditableTextNode.mm

…

ASEqualityHashHelpers.mm

…

ASImageNode.h

[ASImageNode] Adjust category naming for AnimatedImage properties to fix compiler warnings.

2016-04-21 12:32:59 -07:00

ASImageNode.mm

Merge pull request #1273 from aaronschubert0/tvOS

2016-04-20 13:29:31 -07:00

ASImageNode+AnimatedImage.mm

Follow up to animated GIF PR

2016-04-19 13:43:41 -07:00

ASMapNode.h

…

ASMapNode.mm

Merge pull request #1543 from aaronschubert0/ASMapNode-Remove-Red-Herring

2016-04-19 16:47:33 -07:00

ASMultiplexImageNode.h

…

ASMultiplexImageNode.mm

Add support for animated GIFs

2016-04-13 14:23:02 -07:00

ASNetworkImageNode.h

…

ASNetworkImageNode.mm

Follow up to animated GIF PR

2016-04-19 13:43:41 -07:00

ASPagerFlowLayout.h

…

ASPagerFlowLayout.m

…

ASPagerNode.h

…

ASPagerNode.m

…

ASRunLoopQueue.h

…

ASRunLoopQueue.mm

…

ASScrollNode.h

…

ASScrollNode.m

…

ASTableNode.h

…

ASTableNode.m

Improve setting special properties for certain classes directly to the UIView

2016-04-19 10:50:22 -07:00

ASTableView.h

…

ASTableView.mm

Addressed comments

2016-04-19 16:13:30 -07:00

ASTableViewInternal.h

…

ASTableViewProtocols.h

…

ASTextNode.h

…

ASTextNode.mm

Fix preexisting code - missing super call

2016-04-17 22:49:14 -07:00

ASTextNode+Beta.h

…

ASVideoNode.h

Fix merge conflicts

2016-04-19 09:02:07 +01:00

ASVideoNode.mm

Removing an unnecessary assertion in ASVideoNode

2016-04-21 15:20:08 -07:00

ASViewController.h

…

ASViewController.m

…

AsyncDisplayKit-Prefix.pch

…

AsyncDisplayKit.h

Follow up to animated GIF PR

2016-04-19 13:43:41 -07:00

AsyncDisplayKit+Debug.h

…

AsyncDisplayKit+Debug.m

…

module.modulemap

…