Adlai Holler dfc098fc20 Merge branch 'master' into update-objc ...

Conflicts:
	AsyncDisplayKit/ASCollectionView.h
	AsyncDisplayKit/ASTableView.h
	AsyncDisplayKit/Details/ASLayoutController.h
	AsyncDisplayKit/Details/ASRangeController.h

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

..

Details

Merge branch 'master' into update-objc

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

Layout

Merge branch 'master' into update-objc

2015-11-13 12:03:30 -08:00

Private

Substantially improve behavior of nested Table & Collection Nodes

2015-11-14 15:25:35 -08: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

touchesCancelled:withEvent: has a nullable touches argument in UIKit for some reason

2015-11-13 12:17:17 -08:00

ASCellNode.m

Merge branch 'master' into update-objc

2015-11-13 12:03:30 -08:00

ASCollectionNode.h

More objective-C cleanup

2015-09-16 15:41:56 -07:00

ASCollectionNode.m

Merge branch 'master' into update-objc

2015-11-18 14:17:09 -08:00

ASCollectionView.h

Merge branch 'master' into update-objc

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

ASCollectionView.mm

Merge pull request #868 from levi/levi/remove-deprecated

2015-11-23 21:24:58 -08:00

ASCollectionViewProtocols.h

Annotate ASCollectionViewProtocols.h

2015-10-05 13:48:09 -07:00

ASControlNode.h

Add nullability annotations for public API

2015-09-16 15:21:35 -07:00

ASControlNode.m

Don’t retain an action’s target in ASControlNode

2015-05-01 13:04:26 -04:00

ASControlNode+Subclasses.h

hitTest:withEvent: return value should be nullable

2015-09-16 16:21:07 -07:00

ASDisplayNode.h

Merge branch 'master' into update-objc

2015-11-13 12:03:30 -08:00

ASDisplayNode.mm

Fix an issue that could cause the view / layer to be created early by -clearContents.

2015-11-19 17:10:06 -08:00

ASDisplayNode+Subclasses.h

touchesCancelled:withEvent: has a nullable touches argument in UIKit for some reason

2015-11-13 12:17:17 -08:00

ASDisplayNodeExtras.h

More objective-C cleanup

2015-09-16 15:41:56 -07:00

ASDisplayNodeExtras.mm

Add nullability annotations for public API

2015-09-16 15:21:35 -07:00

ASEditableTextNode.h

Merge branch 'master' into update-objc

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

ASEditableTextNode.mm

Make textContainerInset configurable for ASEditableTextNode placeholder and typed textViews

2015-10-31 16:37:04 -07:00

ASImageNode.h

More updates

2015-09-16 15:34:24 -07:00

ASImageNode.mm

Merge branch 'master' into update-objc

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

ASMultiplexImageNode.h

Add NSObjectProtocol requirement to ASImageIdentifier

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

ASMultiplexImageNode.mm

Merge branch 'master' into ImageIdentifierEquality

2015-11-23 18:36:02 -08:00

ASNetworkImageNode.h

Merge branch 'master' into update-objc

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

ASNetworkImageNode.mm

Fix retain cycle in basic, cache-less ASNetworkImageNodes

2015-10-30 22:42:05 -07:00

ASScrollNode.h

More objective-C cleanup

2015-09-16 15:41:56 -07:00

ASScrollNode.m

Use long-form view block initializer for better Swift support

2015-10-06 09:34:57 -07:00

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

Merge pull request #868 from levi/levi/remove-deprecated

2015-11-23 21:24:58 -08:00

ASTableViewInternal.h

Inject an ASDataController class to ASTableView, for testing purposes

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

ASTableViewProtocols.h

Add nullability annotations for public API

2015-09-16 15:21:35 -07:00

ASTextNode.h

Merge branch 'master' into update-objc

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

ASTextNode.mm

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

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

ASViewController.h

Merge branch 'master' into update-objc

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

ASViewController.m

Expose ASViewController's constrained size for subclass customization

2015-10-27 11:40:43 -07:00

AsyncDisplayKit-Prefix.pch

Initial commit.

2014-06-26 22:32:55 -07:00

AsyncDisplayKit.h

Imported missing classes in the umbrella header

2015-11-14 15:07:35 +00:00

module.modulemap

add module.modulemap

2015-09-16 20:15:48 -04:00