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

Conflicts:
	AsyncDisplayKit/ASDisplayNode+Subclasses.h

2015-12-06 12:25:13 -08:00

..

Details

Merge branch 'master' into update-objc

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

Layout

Annotate ASAsciiArtBoxCreator.h

2015-12-01 21:57:45 -08:00

Private

Fix for an incorrect assertion firing when transforming an ASLayoutSpec-positioned node.

2015-12-01 17:49:11 -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

Merge branch 'master' into update-objc

2015-12-06 12:25:13 -08:00

ASCellNode.m

Merge branch 'master' into update-objc

2015-12-06 12:25:13 -08:00

ASCollectionNode.h

…

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 #898 from Adlai-Holler/OptimizeNodeDidRelayout

2015-12-03 21:02:22 -08:00

ASCollectionViewProtocols.h

…

ASControlNode.h

…

ASControlNode.m

…

ASControlNode+Subclasses.h

…

ASDisplayNode.h

Merge branch 'master' into update-objc

2015-12-06 12:25:13 -08:00

ASDisplayNode.mm

Merge pull request #913 from Adlai-Holler/WorkaroundCellContentsLoading

2015-12-05 17:35:28 -08:00

ASDisplayNode+Subclasses.h

Merge branch 'master' into update-objc

2015-12-06 12:25:13 -08:00

ASDisplayNodeExtras.h

Add some more annotations

2015-12-01 16:48:55 -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

…

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

…

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

Merge pull request #898 from Adlai-Holler/OptimizeNodeDidRelayout

2015-12-03 21:02:22 -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-06 12:25:13 -08:00

ASTextNode.mm

Change assumed value for text node highlighting delegate method to YES and don't consult it unless highlighting.

2015-12-03 20:52:02 -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

…