Adlai Holler 8bb9d173dc Merge branch 'master' into update-objc ...

Conflicts:
	AsyncDisplayKit/ASDisplayNode+Subclasses.h
	AsyncDisplayKit/ASMultiplexImageNode.h
	AsyncDisplayKit/ASViewController.h
	AsyncDisplayKit/Details/ASDataController.h

2015-10-05 13:24:16 -07:00

..

Details

Merge branch 'master' into update-objc

2015-10-05 13:24:16 -07:00

Layout

Merge branch 'master' into update-objc

2015-10-05 13:24:16 -07:00

Private

Improved messages for thread affinity and frame transform identity assertions.

2015-10-04 11:15:57 -07:00

ASCellNode.h

Merge branch 'master' into update-objc

2015-10-05 13:24:16 -07:00

ASCellNode.m

scott's comments

2015-09-15 09:11:19 -07:00

ASCollectionNode.h

More objective-C cleanup

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

ASCollectionNode.m

Restore old ASCollectionNode init

2015-09-16 15:39:06 -07:00

ASCollectionView.h

Merge branch 'master' into update-objc

2015-10-05 13:24:16 -07:00

ASCollectionView.mm

Implementation of Synchronous Concurrency features for AsyncDisplayKit 2.0

2015-09-27 19:14:36 -07:00

ASCollectionViewProtocols.h

Define ASCollectionView interface, ASCollectionViewDataSource and ASCollectionViewDelegate protocols.

2014-11-10 22:56:21 +02: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

More objective-C cleanup

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

ASDisplayNode.mm

Merge pull request #636 from nguyenhuy/fixSetNeedsLayout

2015-10-01 18:08:28 -07:00

ASDisplayNode+Subclasses.h

Merge branch 'master' into update-objc

2015-10-05 13:24:16 -07: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-10-05 13:24:16 -07:00

ASEditableTextNode.mm

Placeholder bug in ASEditableTextNode

2015-09-23 16:11:46 -07:00

ASImageNode.h

More updates

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

ASImageNode.mm

Merge branch 'master' into update-objc

2015-09-20 21:55:54 -07:00

ASMultiplexImageNode.h

Merge branch 'master' into update-objc

2015-10-05 13:24:16 -07:00

ASMultiplexImageNode.mm

Avoid accessing PHImageManager in ASMultiplexImageNode init

2015-10-02 15:41:01 -07:00

ASNetworkImageNode.h

Add nullability annotations for public API

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

ASNetworkImageNode.mm

Implementation of Synchronous Concurrency features for AsyncDisplayKit 2.0

2015-09-27 19:14:36 -07:00

ASScrollNode.h

More objective-C cleanup

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

ASScrollNode.m

Remove -[_ASDisplayView layoutSubviews] and use only -[_ASDisplayLayer layoutSublayers].

2015-06-20 19:40:01 -07:00

ASTableView.h

Merge branch 'master' into update-objc

2015-10-05 13:24:16 -07:00

ASTableView.mm

Implementation of Synchronous Concurrency features for AsyncDisplayKit 2.0

2015-09-27 19:14:36 -07:00

ASTableViewProtocols.h

Add nullability annotations for public API

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

ASTextNode.h

Add some nullables in ASTextNode

2015-09-17 19:56:21 -07:00

ASTextNode.mm

Elevate ceilPixel functions to ASTextNodeTextKitHelpers.h, add ceilSize

2015-09-20 21:17:24 -07:00

ASViewController.h

Merge branch 'master' into update-objc

2015-10-05 13:24:16 -07:00

ASViewController.m

Implementation of Synchronous Concurrency features for AsyncDisplayKit 2.0

2015-09-27 19:14:36 -07:00

AsyncDisplayKit-Prefix.pch

Initial commit.

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

AsyncDisplayKit.h

Rename image request class, add deliveryMode into the request params

2015-09-26 13:40:00 -07:00

module.modulemap

add module.modulemap

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