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

Conflicts:
	AsyncDisplayKit/ASDisplayNodeExtras.h
	AsyncDisplayKit/Details/ASTextNodeRenderer.h
	AsyncDisplayKit/Details/ASTextNodeShadower.h

2015-12-01 16:45:25 -08:00

..

Details

Merge branch 'master' into update-objc

2015-12-01 16:45:25 -08:00

Layout

Merge branch 'master' into update-objc

2015-12-01 16:45:25 -08:00

Private

Merge pull request #848 from nguyenhuy/JustifyContentSpaceBetweenAndAround

2015-11-29 21:46:42 -08:00

TextKit

Merge branch 'master' into update-objc

2015-12-01 16:45:25 -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 #879 from levi/levi/custom-layout-example

2015-11-29 22:14:31 -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-12-01 16:45:25 -08:00

ASDisplayNode.mm

Add locking for ASInterfaceState. Misc. cleanup.

2015-11-29 14:57:43 -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

Merge branch 'master' into update-objc

2015-12-01 16:45:25 -08:00

ASDisplayNodeExtras.mm

Merge branch 'master' into update-objc

2015-12-01 16:45:25 -08:00

ASEditableTextNode.h

Merge branch 'master' into update-objc

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

ASEditableTextNode.mm

Rename CK classes to AS classes

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

ASEqualityHashHelpers.mm

Convert naming of hash helpers to AS namespace

2015-11-30 06:53:50 -08: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

Scope like a boss

2015-11-29 21:22:37 -08:00

ASNetworkImageNode.h

Merge branch 'master' into update-objc

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

ASNetworkImageNode.mm

Image nodes call fetchData when image source is updated while in fetch range

2015-11-29 17:29:44 -08: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 #837 from levi/levi/cell-selection

2015-11-28 16:56:25 -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-12-01 16:45:25 -08:00

ASTextNode.mm

Include correct TextKit headers

2015-11-30 06:46:53 -08: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

…

AsyncDisplayKit.h

Remove public header exposure of text kit internals

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

module.modulemap

add module.modulemap

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