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

Conflicts:
	AsyncDisplayKit/ASCollectionView.h
	AsyncDisplayKit/ASDisplayNode.h
	AsyncDisplayKit/Details/ASDataController.h
	AsyncDisplayKit/Details/UIView+ASConvenience.h
	AsyncDisplayKit/Layout/ASLayoutSpec.h

2015-10-28 21:10:27 -07:00

..

Details

Merge branch 'master' into update-objc

2015-10-28 21:10:27 -07:00

Layout

Merge branch 'master' into update-objc

2015-10-28 21:10:27 -07:00

Private

release any CGColor's set while the node is in a pending state

2015-10-28 11:01:01 -07:00

ASCellNode.h

Merge branch 'master' into update-objc

2015-10-28 21:10:27 -07:00

ASCellNode.m

Don't invalidateCalculatedLayout when ASTextCellNode's text is changed

2015-10-12 21:48:01 +03: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-28 21:10:27 -07:00

ASCollectionView.mm

Merge pull request #722 from nguyenhuy/RelayoutCellAPI

2015-10-25 21:28:20 -07: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-10-28 21:10:27 -07:00

ASDisplayNode.mm

Remove debugging names of ASDisplayNode and _ASDisplayLayer

2015-10-26 07:44:59 +02: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

Add more deep compares when setting public properties to the same value

2015-10-05 23:48:48 -07:00

ASImageNode.h

More updates

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

ASImageNode.mm

Merge branch 'master' into update-objc

2015-10-13 21:26:20 -07:00

ASMultiplexImageNode.h

Merge branch 'master' into update-objc

2015-10-28 21:10:27 -07:00

ASMultiplexImageNode.mm

Merge pull request #738 from Adlai-Holler/DeprioritizeImageRequests

2015-10-14 12:49:47 -07:00

ASNetworkImageNode.h

Add nullability annotations for public API

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

ASNetworkImageNode.mm

Add more deep compares when setting public properties to the same value

2015-10-05 23:48:48 -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

ASTableView.h

Merge branch 'master' into update-objc

2015-10-28 21:10:27 -07:00

ASTableView.mm

Merge pull request #753 from nguyenhuy/DataControllerSortedTransaction

2015-10-26 13:40:06 -07: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

Add some nullables in ASTextNode

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

ASTextNode.mm

Fixes to baseline stack alignment

2015-10-06 21:41:39 -07:00

ASViewController.h

Merge branch 'master' into update-objc

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

ASViewController.m

Call UIViewController's designated initializer in ASViewController

2015-10-20 16:37:39 -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