Adlai Holler 69767d558e Merge branch 'master' into update-objc ...

Conflicts:
	AsyncDisplayKit/Private/ASDisplayNode+FrameworkPrivate.h

2015-12-22 00:28:21 -05:00

..

Details

Merge branch 'master' into update-objc

2015-12-22 00:28:21 -05:00

Layout

Merge branch 'master' into update-objc

2015-12-22 00:28:21 -05:00

Private

Merge branch 'master' into update-objc

2015-12-22 00:28:21 -05:00

TextKit

Merge branch 'master' into update-objc

2015-12-22 00:28:21 -05:00

ASButtonNode.h

Adding ASButtonNode. Simple but flexible, add features as desired!

2015-10-31 15:12:05 -07:00

ASButtonNode.mm

Adding ASButtonNode. Simple but flexible, add features as desired!

2015-10-31 15:12:05 -07:00

ASCellNode.h

Merge branch 'master' into update-objc

2015-12-22 00:28:21 -05:00

ASCellNode.m

Merge branch 'master' into update-objc

2015-12-22 00:28:21 -05:00

ASCollectionNode.h

Merge branch 'master' into update-objc

2015-12-22 00:28:21 -05:00

ASCollectionNode.m

Merge branch 'master' into update-objc

2015-12-22 00:28:21 -05:00

ASCollectionView.h

Merge branch 'master' into update-objc

2015-11-24 16:40:03 -08:00

ASCollectionView.mm

Ensure an empty array is returned if visibleNodes is called before any nodes are complete.

2015-12-06 21:45:46 -08:00

ASCollectionViewProtocols.h

…

ASControlNode.h

…

ASControlNode.m

…

ASControlNode+Subclasses.h

…

ASDisplayNode.h

Merge branch 'master' into update-objc

2015-12-22 00:28:21 -05:00

ASDisplayNode.mm

Merge pull request #968 from facebook/LockHandlingOnRemoveFromSupernode

2015-12-21 20:55:54 -08:00

ASDisplayNode+Beta.h

Expose recursivelyEnsureDisplay

2015-12-10 19:42:17 -08:00

ASDisplayNode+Subclasses.h

Merge branch 'master' into update-objc

2015-12-13 10:05:03 -08:00

ASDisplayNodeExtras.h

Merge branch 'master' into update-objc

2015-12-13 10:05:03 -08:00

ASDisplayNodeExtras.mm

Merge branch 'master' into update-objc

2015-12-13 10:05:03 -08:00

ASEditableTextNode.h

Merge branch 'master' into update-objc

2015-11-02 09:36:46 -08:00

ASEditableTextNode.mm

make ASEditableTextNode's textView clip to bounds

2015-12-11 18:53:10 -08:00

ASEqualityHashHelpers.mm

Convert naming of hash helpers to AS namespace

2015-11-30 06:53:50 -08:00

ASImageNode.h

…

ASImageNode.mm

Merge branch 'master' into update-objc

2015-11-02 09:36:46 -08:00

ASMapNode.h

Merge branch 'master' into update-objc

2015-12-22 00:28:21 -05:00

ASMapNode.mm

Further clean up for ASDK 2.0

2015-12-16 10:20:13 +00:00

ASMultiplexImageNode.h

Add NSObjectProtocol requirement to ASImageIdentifier

2015-11-13 12:02:09 -08:00

ASMultiplexImageNode.mm

Introduced ASHierarchyState. Created ASDisplayNode+FrameworkPrivate.h. Fixed deadlock.

2015-12-05 22:20:16 -08:00

ASNetworkImageNode.h

Merge branch 'master' into update-objc

2015-11-02 09:36:46 -08:00

ASNetworkImageNode.mm

Introduced ASHierarchyState. Created ASDisplayNode+FrameworkPrivate.h. Fixed deadlock.

2015-12-05 22:20:16 -08:00

ASPagerNode.h

Add scroll to page helper to ASPagerNode

2015-12-21 09:07:48 -06:00

ASPagerNode.m

Add scroll to page helper to ASPagerNode

2015-12-21 09:07:48 -06:00

ASScrollNode.h

…

ASScrollNode.m

…

ASTableNode.h

Modify ASTableNode initializer

2015-11-05 08:59:41 -08:00

ASTableNode.m

Substantially improve behavior of nested Table & Collection Nodes

2015-11-14 15:25:35 -08:00

ASTableView.h

Merge branch 'master' into update-objc

2015-11-24 16:40:03 -08:00

ASTableView.mm

Enable node detection for tableHeaderView and tableFooterView on ASTableView.

2015-12-18 21:58:58 -08:00

ASTableViewInternal.h

Inject an ASDataController class to ASTableView, for testing purposes

2015-10-26 13:52:49 +02:00

ASTableViewProtocols.h

…

ASTextNode.h

Merge branch 'master' into update-objc

2015-12-22 00:28:21 -05:00

ASTextNode.mm

[ASTextNode] Renderer should not be invalidated if bounds size matches calculatedSize, even if it doesn't match constrainedSize.

2015-12-17 22:12:29 -08:00

ASViewController.h

Merge branch 'master' into update-objc

2015-11-02 09:36:46 -08:00

ASViewController.m

Introduced ASHierarchyState. Created ASDisplayNode+FrameworkPrivate.h. Fixed deadlock.

2015-12-05 22:20:16 -08:00

AsyncDisplayKit-Prefix.pch

…

AsyncDisplayKit.h

Add ASPagerNode to framework header

2015-12-16 17:53:21 -08:00

module.modulemap

…