Adlai Holler 9d6b3b6e14 Merge branch 'master' into update-objc ...

Conflicts:
	AsyncDisplayKit/Details/ASTextNodeTextKitHelpers.h

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

..

Details

Merge branch 'master' into update-objc

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

Layout

Merge branch 'master' into update-objc

2015-09-19 12:53:06 -07:00

Private

make additional private headers actually private; import all public headers in AsyncDisplayKit.h

2015-09-16 23:31:48 -04:00

ASCellNode.h

Merge branch 'master' into update-objc

2015-09-19 12:53:06 -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

Add nullability annotations for public API

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

ASCollectionView.mm

Rename flag, default it to true, shorten some comment lines

2015-09-19 14:21:33 -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

scott's comments

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

ASDisplayNode+Subclasses.h

hitTest:withEvent: return value should be nullable

2015-09-16 16:21:07 -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

More objective-C cleanup

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

ASEditableTextNode.mm

Use ceilSize in ASEditableTextNode

2015-09-20 21:18:06 -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

Give a prefix to make ASImageIdentifier typealias

2015-09-18 23:32:52 -07:00

ASMultiplexImageNode.mm

releasing downloaded image when multiplex image node exits render range

2015-07-11 09:27:01 -04:00

ASNetworkImageNode.h

Add nullability annotations for public API

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

ASNetworkImageNode.mm

Updating API names for network range and memory culling before ASDK 1.2 tag.

2015-05-21 22:43:38 -10: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

Add nullability annotations for public API

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

ASTableView.mm

Force the layout of subviews when _ASTableViewCell transitioned to another state

2015-09-16 15:25:40 +03: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 latest master and update Layout headers

2015-09-17 11:39:59 -07:00

ASViewController.m

Remove nonnull and nuulable annotations in ASViewController. Travis don't recognize them (yet).

2015-09-17 16:07:43 +03:00

AsyncDisplayKit-Prefix.pch

…

AsyncDisplayKit.h

Add ASViewController and update Multiplex sample to use it.

2015-09-17 15:58:21 +03:00

module.modulemap

add module.modulemap

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