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

Conflicts:
	AsyncDisplayKit/ASCollectionView.h
	AsyncDisplayKit/ASTableView.h
	AsyncDisplayKit/Details/ASLayoutController.h
	AsyncDisplayKit/Details/ASRangeController.h

2015-11-24 16:40:03 -08:00

..

Transactions

Implementation of Synchronous Concurrency features for AsyncDisplayKit 2.0

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

_ASDisplayLayer.h

…

_ASDisplayLayer.mm

Remove debugging names of ASDisplayNode and _ASDisplayLayer

2015-10-26 07:44:59 +02:00

_ASDisplayView.h

…

_ASDisplayView.mm

add UIResponder methods to ASDisplayNode

2015-06-27 03:19:51 -04:00

ASAbstractLayoutController.h

Merge branch 'master' into update-objc

2015-11-24 16:40:03 -08:00

ASAbstractLayoutController.mm

Remove deprecated layout controller methods

2015-11-19 11:48:06 -08:00

ASBasicImageDownloader.h

Merge branch 'master' into update-objc

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

ASBasicImageDownloader.mm

Fix retain cycle in basic, cache-less ASNetworkImageNodes

2015-10-30 22:42:05 -07:00

ASBatchContext.h

Update all the files in the Details group

2015-09-17 13:30:28 -07:00

ASBatchContext.mm

…

ASChangeSetDataController.h

Add documentation to ASChangeSetDataController.

2015-10-26 06:22:30 +02:00

ASChangeSetDataController.m

Implement ASChangeSetDataController.

2015-10-26 06:22:30 +02:00

ASCollectionDataController.h

Implement ASChangeSetDataController.

2015-10-26 06:22:30 +02:00

ASCollectionDataController.mm

Make array instantiation consistent

2015-10-21 23:17:37 -07:00

ASCollectionViewFlowLayoutInspector.h

Clean up caching of collection view delegate selectors on the inspector

2015-10-21 23:17:38 -07:00

ASCollectionViewFlowLayoutInspector.m

Reset inspector selector implementation cache correctly

2015-10-22 18:54:07 -07:00

ASCollectionViewLayoutController.h

Update all the files in the Details group

2015-09-17 13:30:28 -07:00

ASCollectionViewLayoutController.mm

Ensure layout controller exposes only cell item index paths to range controller

2015-10-15 11:40:53 -07:00

ASDataController.h

Merge branch 'master' into update-objc

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

ASDataController.mm

Move ASDisplayNodePerformBlockOnMainThread to ASInternalHelpers

2015-10-29 16:09:36 +02:00

ASDataController+Subclasses.h

Clarify editing transaction documentation

2015-10-21 23:17:37 -07:00

ASDealloc2MainObject.h

Update all the files in the Details group

2015-09-17 13:30:28 -07:00

ASDealloc2MainObject.m

…

ASFlowLayoutController.h

Update all the files in the Details group

2015-09-17 13:30:28 -07:00

ASFlowLayoutController.mm

Add support automatically adjusting the content offset to UITableView as well as support for performing endUpdates with no animations. Additionally, there are critical bug fixes for ASDataController (begin/end updates delegates not called in correct order) and ASRangeController (failure to fully refresh internal state when inserts or delete are made.)

2015-07-20 14:05:56 -07:00

ASHighlightOverlayLayer.h

Update all the files in the Details group

2015-09-17 13:30:28 -07:00

ASHighlightOverlayLayer.mm

Integrate new layout nodes to the framework.

2015-06-25 11:34:35 +07:00

ASImageProtocols.h

Make image download token optional

2015-09-17 14:56:39 -07:00

ASIndexPath.h

Update all the files in the Details group

2015-09-17 13:30:28 -07:00

ASIndexPath.m

Fix duplicate symbols on ASIndexPath

2015-07-07 18:23:04 +03:00

ASLayoutController.h

Merge branch 'master' into update-objc

2015-11-24 16:40:03 -08:00

ASLayoutRangeType.h

…

ASMutableAttributedStringBuilder.h

Update all the files in the Details group

2015-09-17 13:30:28 -07:00

ASMutableAttributedStringBuilder.m

…

ASPhotosFrameworkImageRequest.h

Simplify creation of Photos Framework NSURLs in ASMultiplexImageNode

2015-10-02 12:44:21 -07:00

ASPhotosFrameworkImageRequest.m

Refuse to parse ph:// URLs if iOS < 8 for safety

2015-10-02 15:51:32 -07:00

ASRangeController.h

Merge branch 'master' into update-objc

2015-11-24 16:40:03 -08:00

ASRangeController.mm

Separate range controller delegate methods into separate data source

2015-11-19 16:01:38 -08:00

ASRangeHandler.h

Update all the files in the Details group

2015-09-17 13:30:28 -07:00

ASRangeHandlerPreload.h

Update all the files in the Details group

2015-09-17 13:30:28 -07:00

ASRangeHandlerPreload.mm

…

ASRangeHandlerRender.h

Update all the files in the Details group

2015-09-17 13:30:28 -07:00

ASRangeHandlerRender.mm

Fix for behavior difference between CA and UIKit that causes mutation crash

2015-11-09 13:41:25 -08:00

ASScrollDirection.h

Update all the files in the Details group

2015-09-17 13:30:28 -07:00

ASScrollDirection.m

…

ASTextNodeCoreTextAdditions.h

Update all the files in the Details group

2015-09-17 13:30:28 -07:00

ASTextNodeCoreTextAdditions.m

Make ASTextNode copy exclusionPaths and attributedString

2015-10-06 00:46:20 -07:00

ASTextNodeRenderer.h

Update all the files in the Details group

2015-09-17 13:30:28 -07:00

ASTextNodeRenderer.mm

use attributedString.length instead of attributedString.string.length to check for empty strings

2015-08-16 18:24:20 -04:00

ASTextNodeShadower.h

Update all the files in the Details group

2015-09-17 13:30:28 -07:00

ASTextNodeShadower.m

…

ASTextNodeTextKitHelpers.h

Merge branch 'master' into update-objc

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

ASTextNodeTextKitHelpers.mm

…

ASTextNodeTypes.h

…

ASTextNodeWordKerner.h

Update all the files in the Details group

2015-09-17 13:30:28 -07:00

ASTextNodeWordKerner.m

Update the identifier that AsyncDisplayKit uses to label its internal queues (2/2).

2015-06-27 12:10:58 -07:00

ASThread.h

…

CGRect+ASConvenience.h

Update all the files in the Details group

2015-09-17 13:30:28 -07:00

CGRect+ASConvenience.m

…

NSMutableAttributedString+TextKitAdditions.h

Update all the files in the Details group

2015-09-17 13:30:28 -07:00

NSMutableAttributedString+TextKitAdditions.m

…

UICollectionViewLayout+ASConvenience.h

Update all the files in the Details group

2015-09-17 13:30:28 -07:00

UICollectionViewLayout+ASConvenience.m

…

UIView+ASConvenience.h

Merge branch 'master' into update-objc

2015-11-18 14:17:09 -08:00