Adlai Holler a216b17b01 Merge branch 'master' into ImageNodeImprovements ...

Conflicts:
	AsyncDisplayKit/ASNetworkImageNode.mm

2016-04-22 12:36:58 -05: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

Implement async transition

2016-03-11 18:56:58 -08:00

_ASTransitionContext.m

Implement async transition

2016-03-11 18:56:58 -08:00

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

Correct documentation comments

2016-03-24 20:08:03 -07:00

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

[ASCellNode] Upgrades to ASCellNodeVisibilityEvent to ensure it is always synchronized with visibilityDidChange:

2016-03-10 20:21:00 -08:00

ASCollectionNode.h

Correct spelling errors

2016-03-15 21:56:51 -07:00

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

[AsyncDisplayKit] Fix build so we can weak link AVFoundation

2016-03-19 17:54:02 -07:00

ASCollectionView.mm

Addressed comments

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

ASCollectionViewLayoutFacilitatorProtocol.h

[AsyncDisplayKit] Adopt #pragma once, remove last remaining dispatch_sync (UIScreen scale).

2016-03-19 19:56:41 -07:00

ASCollectionViewProtocols.h

…

ASContextTransitioning.h

Correct spelling errors

2016-03-15 21:56:51 -07:00

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

Add a block API to provide an ASLayoutSpec without having to subclass ASDisplayNode

2016-04-20 19:16:54 -07:00

ASDisplayNode.mm

Adjust indention of comment

2016-04-21 07:07:17 -07:00

ASDisplayNode+Beta.h

Add method to cancel layout transitions in progress

2016-03-20 23:17:35 -07:00

ASDisplayNode+Subclasses.h

Add a block API to provide an ASLayoutSpec without having to subclass ASDisplayNode

2016-04-20 19:16:54 -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

Re-declare the default init method in ASEditableTextNode's header

2016-03-27 00:12:49 -07:00

ASEditableTextNode.mm

Merge pull request #1455 from ejensen/scrolls-to-top

2016-03-31 21:19:45 -07:00

ASEqualityHashHelpers.mm

- Use modern Objective-C syntax.

2016-03-15 22:34:29 -07:00

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

Correct spelling errors

2016-03-15 21:56:51 -07:00

ASMultiplexImageNode.mm

Merge branch 'master' into ImageNodeImprovements

2016-04-22 12:36:58 -05:00

ASNetworkImageNode.h

Correct spelling errors

2016-03-15 21:56:51 -07:00

ASNetworkImageNode.mm

Merge branch 'master' into ImageNodeImprovements

2016-04-22 12:36:58 -05:00

ASPagerFlowLayout.h

…

ASPagerFlowLayout.m

Fix conditional

2016-03-25 11:54:56 -07:00

ASPagerNode.h

Correct a few documentation comments for method parameters

2016-03-08 11:56:58 -08:00

ASPagerNode.m

…

ASRunLoopQueue.h

Refactor the run loop implementation code into a proper queue abstraction.

2016-03-07 23:49:50 -08:00

ASRunLoopQueue.mm

Add CFRunLoopWakeUp in processQueue

2016-03-22 20:19:17 -07:00

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

Correct spelling errors

2016-03-15 21:56:51 -07:00

ASTableView.mm

Addressed comments

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

ASTableViewInternal.h

- Use modern Objective-C syntax.

2016-03-15 22:34:29 -07:00

ASTableViewProtocols.h

…

ASTextNode.h

…

ASTextNode.mm

Fix preexisting code - missing super call

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

ASTextNode+Beta.h

Add nullability attributes to ASTextNode+Beta

2016-03-25 22:33:13 -07:00

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

[ASControlNode] hitTestDebug tool refactoring + comments:wq

2016-04-10 00:51:36 -07:00

AsyncDisplayKit+Debug.m

[ASImageNode] More refined naming and documentation for [ASImageNode shouldShowImageScalingOverlay]

2016-03-08 23:30:17 -08:00

module.modulemap

…