Adlai Holler 69767d558e Merge branch 'master' into update-objc ...

Conflicts:
	AsyncDisplayKit/Private/ASDisplayNode+FrameworkPrivate.h

2015-12-22 00:28:21 -05:00

..

Transactions

…

_ASDisplayLayer.h

…

_ASDisplayLayer.mm

Merge branch 'master' into RemoveWorkingWindow

2015-12-11 21:34:45 -08:00

_ASDisplayView.h

…

_ASDisplayView.mm

Support surprisingly nice automatic behavior for the unsupported case of view-backed nodes as children of layer-backed ones.

2015-12-19 20:33:28 -08:00

ASAbstractLayoutController.h

Merge branch 'master' into update-objc

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

ASAbstractLayoutController.mm

ASInterfaceStateVisible is now being driven by a new ASRangeHandlerVisible.

2015-11-29 13:24:42 -08:00

ASBasicImageDownloader.h

Merge branch 'master' into update-objc

2015-12-22 00:28:21 -05:00

ASBasicImageDownloader.mm

Fix ASBasicImageDownloader tests - prevent use of init / new instead of +sharedImageDownloader.

2015-12-20 15:42:57 -08:00

ASBatchContext.h

…

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

Inline supplementary kind iteration in data controller

2015-12-06 21:31:40 -08:00

ASCollectionViewFlowLayoutInspector.h

Add custom collection view layout example project

2015-11-27 18:58:44 -08:00

ASCollectionViewFlowLayoutInspector.m

Add custom collection view layout example project

2015-11-27 18:58:44 -08:00

ASCollectionViewLayoutController.h

…

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

Rename and move ASMainSerialQueue to its own class

2015-12-11 10:53:06 -08:00

ASDataController+Subclasses.h

Clarify editing transaction documentation

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

ASDealloc2MainObject.h

…

ASDealloc2MainObject.m

…

ASFlowLayoutController.h

…

ASFlowLayoutController.mm

…

ASHighlightOverlayLayer.h

…

ASHighlightOverlayLayer.mm

…

ASImageProtocols.h

…

ASIndexPath.h

…

ASIndexPath.m

…

ASLayoutController.h

Revert minor deletion

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

ASLayoutRangeType.h

ASInterfaceStateVisible is now being driven by a new ASRangeHandlerVisible.

2015-11-29 13:24:42 -08:00

ASMainSerialQueue.h

Rename and move ASMainSerialQueue to its own class

2015-12-11 10:53:06 -08:00

ASMainSerialQueue.mm

Rename and move ASMainSerialQueue to its own class

2015-12-11 10:53:06 -08:00

ASMutableAttributedStringBuilder.h

…

ASMutableAttributedStringBuilder.m

…

ASPhotosFrameworkImageRequest.h

…

ASPhotosFrameworkImageRequest.m

…

ASRangeController.h

Merge branch 'master' into update-objc

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

ASRangeController.mm

ASInterfaceStateVisible is now being driven by a new ASRangeHandlerVisible.

2015-11-29 13:24:42 -08:00

ASRangeHandler.h

…

ASRangeHandlerPreload.h

…

ASRangeHandlerPreload.mm

Introduced ASHierarchyState. Created ASDisplayNode+FrameworkPrivate.h. Fixed deadlock.

2015-12-05 22:20:16 -08:00

ASRangeHandlerRender.h

…

ASRangeHandlerRender.mm

Final cleanup for initial version of removing the UIWindow-based render range.

2015-12-18 18:47:08 -08:00

ASRangeHandlerVisible.h

ASInterfaceStateVisible is now being driven by a new ASRangeHandlerVisible.

2015-11-29 13:24:42 -08:00

ASRangeHandlerVisible.mm

Introduced ASHierarchyState. Created ASDisplayNode+FrameworkPrivate.h. Fixed deadlock.

2015-12-05 22:20:16 -08:00

ASScrollDirection.h

…

ASScrollDirection.m

…

ASThread.h

…

CGRect+ASConvenience.h

…

CGRect+ASConvenience.m

…

NSMutableAttributedString+TextKitAdditions.h

…

NSMutableAttributedString+TextKitAdditions.m

…

UICollectionViewLayout+ASConvenience.h

…

UICollectionViewLayout+ASConvenience.m

…

UIView+ASConvenience.h

Merge branch 'master' into update-objc

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