Peter 587d2b2132 Merge commit '3ccc2f0f15d2e4ed7105f0ef6aea575e05cfd7ad' ...

# Conflicts:
#	AsyncDisplayKit.xcodeproj/project.pbxproj
#	Source/ASDisplayNode.mm
#	Source/ASMapNode.mm
#	Source/Details/ASDataController.mm
#	Source/Details/ASPINRemoteImageDownloader.h
#	Source/Details/ASPINRemoteImageDownloader.m

2017-08-04 13:12:06 +03:00

..

Base

[ASCollectionView] Small improvements (#407)

2017-07-06 17:38:23 +00:00

Debug

Merge commit '3ccc2f0f15d2e4ed7105f0ef6aea575e05cfd7ad'

2017-08-04 13:12:06 +03:00

Details

Merge commit '3ccc2f0f15d2e4ed7105f0ef6aea575e05cfd7ad'

2017-08-04 13:12:06 +03:00

Layout

Overhaul our logging, add activity tracing support. (#399)

2017-07-03 19:03:26 -07:00

Private

Merge commit '3ccc2f0f15d2e4ed7105f0ef6aea575e05cfd7ad'

2017-08-04 13:12:06 +03:00

TextKit

Fix Alignment of Hashed Structs (#287)

2017-05-17 18:08:50 -07:00

tvOS

Update license v2 (#67)

2017-04-24 16:59:57 -07:00

_ASTransitionContext.h

Update license v2 (#67)

2017-04-24 16:59:57 -07:00

_ASTransitionContext.m

Update license v2 (#67)

2017-04-24 16:59:57 -07:00

ASBlockTypes.h

Update license v2 (#67)

2017-04-24 16:59:57 -07:00

ASButtonNode.h

Update license v2 (#67)

2017-04-24 16:59:57 -07:00

ASButtonNode.mm

Update license v2 (#67)

2017-04-24 16:59:57 -07:00

ASCellNode.h

Merge commit '3ccc2f0f15d2e4ed7105f0ef6aea575e05cfd7ad'

2017-08-04 13:12:06 +03:00

ASCellNode.mm

Merge commit '3ccc2f0f15d2e4ed7105f0ef6aea575e05cfd7ad'

2017-08-04 13:12:06 +03:00

ASCollectionNode.h

Merge commit '3ccc2f0f15d2e4ed7105f0ef6aea575e05cfd7ad'

2017-08-04 13:12:06 +03:00

ASCollectionNode.mm

Merge commit '3ccc2f0f15d2e4ed7105f0ef6aea575e05cfd7ad'

2017-08-04 13:12:06 +03:00

ASCollectionNode+Beta.h

Merge commit '3ccc2f0f15d2e4ed7105f0ef6aea575e05cfd7ad'

2017-08-04 13:12:06 +03:00

ASCollectionView.h

Merge commit '3ccc2f0f15d2e4ed7105f0ef6aea575e05cfd7ad'

2017-08-04 13:12:06 +03:00

ASCollectionView.mm

Merge commit '3ccc2f0f15d2e4ed7105f0ef6aea575e05cfd7ad'

2017-08-04 13:12:06 +03:00

ASCollectionViewLayoutFacilitatorProtocol.h

Merge commit '3ccc2f0f15d2e4ed7105f0ef6aea575e05cfd7ad'

2017-08-04 13:12:06 +03:00

ASCollectionViewProtocols.h

Merge commit '3ccc2f0f15d2e4ed7105f0ef6aea575e05cfd7ad'

2017-08-04 13:12:06 +03:00

ASContextTransitioning.h

Update license v2 (#67)

2017-04-24 16:59:57 -07:00

ASControlNode.h

Update license v2 (#67)

2017-04-24 16:59:57 -07:00

ASControlNode.mm

Update license v2 (#67)

2017-04-24 16:59:57 -07:00

ASControlNode+Subclasses.h

Update license v2 (#67)

2017-04-24 16:59:57 -07:00

ASDisplayNode.h

Merge commit '3ccc2f0f15d2e4ed7105f0ef6aea575e05cfd7ad'

2017-08-04 13:12:06 +03:00

ASDisplayNode.mm

Merge commit '3ccc2f0f15d2e4ed7105f0ef6aea575e05cfd7ad'

2017-08-04 13:12:06 +03:00

ASDisplayNode+Beta.h

[Yoga] Delete YOGA_TREE_CONTIGOUS gating and permanently enable. (#370)

2017-06-18 18:18:59 -07:00

ASDisplayNode+Convenience.h

Update license v2 (#67)

2017-04-24 16:59:57 -07:00

ASDisplayNode+Convenience.m

Update license v2 (#67)

2017-04-24 16:59:57 -07:00

ASDisplayNode+Deprecated.h

Merge commit '3ccc2f0f15d2e4ed7105f0ef6aea575e05cfd7ad'

2017-08-04 13:12:06 +03:00

ASDisplayNode+Layout.mm

Use a sentinel NSUInteger for node layout data #trivial (#428)

2017-07-10 12:10:04 +00:00

ASDisplayNode+Subclasses.h

Merge commit '3ccc2f0f15d2e4ed7105f0ef6aea575e05cfd7ad'

2017-08-04 13:12:06 +03:00

ASDisplayNode+Yoga.mm

[Yoga] Refine the handling of measurement functions when Yoga is used. (#408)

2017-07-02 13:01:07 -07:00

ASDisplayNodeExtras.h

Merge commit '3ccc2f0f15d2e4ed7105f0ef6aea575e05cfd7ad'

2017-08-04 13:12:06 +03:00

ASDisplayNodeExtras.mm

Improve Ancestry Handling, Avoid Assertion Failure (#246)

2017-05-09 18:27:54 -07:00

asdkmodule.modulemap

no message

2017-03-01 18:33:48 +04:00

ASEditableTextNode.h

Update license v2 (#67)

2017-04-24 16:59:57 -07:00

ASEditableTextNode.mm

Update license v2 (#67)

2017-04-24 16:59:57 -07:00

ASImageNode.h

Merge commit '3ccc2f0f15d2e4ed7105f0ef6aea575e05cfd7ad'

2017-08-04 13:12:06 +03:00

ASImageNode.mm

Merge commit '3ccc2f0f15d2e4ed7105f0ef6aea575e05cfd7ad'

2017-08-04 13:12:06 +03:00

ASImageNode+AnimatedImage.mm

Merge commit '3ccc2f0f15d2e4ed7105f0ef6aea575e05cfd7ad'

2017-08-04 13:12:06 +03:00

ASMapNode.h

Merge commit '3ccc2f0f15d2e4ed7105f0ef6aea575e05cfd7ad'

2017-08-04 13:12:06 +03:00

ASMapNode.mm

Merge commit '3ccc2f0f15d2e4ed7105f0ef6aea575e05cfd7ad'

2017-08-04 13:12:06 +03:00

ASMultiplexImageNode.h

Merge commit '3ccc2f0f15d2e4ed7105f0ef6aea575e05cfd7ad'

2017-08-04 13:12:06 +03:00

ASMultiplexImageNode.mm

Merge commit '3ccc2f0f15d2e4ed7105f0ef6aea575e05cfd7ad'

2017-08-04 13:12:06 +03:00

ASNavigationController.h

Merge commit '3ccc2f0f15d2e4ed7105f0ef6aea575e05cfd7ad'

2017-08-04 13:12:06 +03:00

ASNavigationController.m

Merge commit '3ccc2f0f15d2e4ed7105f0ef6aea575e05cfd7ad'

2017-08-04 13:12:06 +03:00

ASNetworkImageNode.h

Merge commit '3ccc2f0f15d2e4ed7105f0ef6aea575e05cfd7ad'

2017-08-04 13:12:06 +03:00

ASNetworkImageNode.mm

Merge commit '3ccc2f0f15d2e4ed7105f0ef6aea575e05cfd7ad'

2017-08-04 13:12:06 +03:00

ASNodeController+Beta.h

[ASNodeController+Beta] Provide an option to allow nodes to own their controllers. (#61)

2017-05-01 10:51:59 -07:00

ASNodeController+Beta.m

[ASNodeController+Beta] Provide an option to allow nodes to own their controllers. (#61)

2017-05-01 10:51:59 -07:00

ASPagerFlowLayout.h

Merge commit '3ccc2f0f15d2e4ed7105f0ef6aea575e05cfd7ad'

2017-08-04 13:12:06 +03:00

ASPagerFlowLayout.m

Merge commit '3ccc2f0f15d2e4ed7105f0ef6aea575e05cfd7ad'

2017-08-04 13:12:06 +03:00

ASPagerNode.h

Merge commit '3ccc2f0f15d2e4ed7105f0ef6aea575e05cfd7ad'

2017-08-04 13:12:06 +03:00

ASPagerNode.m

Merge commit '3ccc2f0f15d2e4ed7105f0ef6aea575e05cfd7ad'

2017-08-04 13:12:06 +03:00

ASRangeManagingNode.h

Make Cell Node Properties Atomic (#74)

2017-05-02 14:09:12 -07:00

ASRunLoopQueue.h

Fix memory leaks, add section-object support to new test harness (#360)

2017-06-16 09:25:16 -07:00

ASRunLoopQueue.mm

Overhaul our logging, add activity tracing support. (#399)

2017-07-03 19:03:26 -07:00

ASScrollNode.h

Update license v2 (#67)

2017-04-24 16:59:57 -07:00

ASScrollNode.mm

Update license v2 (#67)

2017-04-24 16:59:57 -07:00

ASSectionController.h

Merge commit '3ccc2f0f15d2e4ed7105f0ef6aea575e05cfd7ad'

2017-08-04 13:12:06 +03:00

ASSupplementaryNodeSource.h

Merge commit '3ccc2f0f15d2e4ed7105f0ef6aea575e05cfd7ad'

2017-08-04 13:12:06 +03:00

ASTabBarController.h

Merge commit '3ccc2f0f15d2e4ed7105f0ef6aea575e05cfd7ad'

2017-08-04 13:12:06 +03:00

ASTabBarController.m

Merge commit '3ccc2f0f15d2e4ed7105f0ef6aea575e05cfd7ad'

2017-08-04 13:12:06 +03:00

ASTableNode.h

Merge commit '3ccc2f0f15d2e4ed7105f0ef6aea575e05cfd7ad'

2017-08-04 13:12:06 +03:00

ASTableNode.mm

Merge commit '3ccc2f0f15d2e4ed7105f0ef6aea575e05cfd7ad'

2017-08-04 13:12:06 +03:00

ASTableNode+Beta.h

[Batch Fetching] Add ASBatchFetchingDelegate (#281)

2017-05-17 13:26:30 +01:00

ASTableView.h

Merge commit '3ccc2f0f15d2e4ed7105f0ef6aea575e05cfd7ad'

2017-08-04 13:12:06 +03:00

ASTableView.mm

Merge commit '3ccc2f0f15d2e4ed7105f0ef6aea575e05cfd7ad'

2017-08-04 13:12:06 +03:00

ASTableViewInternal.h

Merge commit '3ccc2f0f15d2e4ed7105f0ef6aea575e05cfd7ad'

2017-08-04 13:12:06 +03:00

ASTableViewProtocols.h

Merge commit '3ccc2f0f15d2e4ed7105f0ef6aea575e05cfd7ad'

2017-08-04 13:12:06 +03:00

ASTextNode2.h

[ASTextNode2] Provide compiler flag to enable ASTextNode2 for all usages. (#410)

2017-07-02 21:40:51 -07:00

ASTextNode2.mm

[ASTextNode2] Provide compiler flag to enable ASTextNode2 for all usages. (#410)

2017-07-02 21:40:51 -07:00

ASTextNode.h

[ASTextNode2] Provide compiler flag to enable ASTextNode2 for all usages. (#410)

2017-07-02 21:40:51 -07:00

ASTextNode.mm

Overhaul our logging, add activity tracing support. (#399)

2017-07-03 19:03:26 -07:00

ASTextNode+Beta.h

[ASTextNode2] Provide compiler flag to enable ASTextNode2 for all usages. (#410)

2017-07-02 21:40:51 -07:00

ASVideoNode.h

Merge commit '3ccc2f0f15d2e4ed7105f0ef6aea575e05cfd7ad'

2017-08-04 13:12:06 +03:00

ASVideoNode.mm

Merge commit '3ccc2f0f15d2e4ed7105f0ef6aea575e05cfd7ad'

2017-08-04 13:12:06 +03:00

ASVideoPlayerNode.h

Merge commit '3ccc2f0f15d2e4ed7105f0ef6aea575e05cfd7ad'

2017-08-04 13:12:06 +03:00

ASVideoPlayerNode.mm

Merge commit '3ccc2f0f15d2e4ed7105f0ef6aea575e05cfd7ad'

2017-08-04 13:12:06 +03:00

ASViewController.h

Merge commit '3ccc2f0f15d2e4ed7105f0ef6aea575e05cfd7ad'

2017-08-04 13:12:06 +03:00

ASViewController.mm

Merge commit '3ccc2f0f15d2e4ed7105f0ef6aea575e05cfd7ad'

2017-08-04 13:12:06 +03:00

ASVisibilityProtocols.h

Update license v2 (#67)

2017-04-24 16:59:57 -07:00

ASVisibilityProtocols.m

Update license v2 (#67)

2017-04-24 16:59:57 -07:00

AsyncDisplayKit.h

Introduce ASCollectionGalleryLayoutDelegate (#76)

2017-07-14 18:50:26 +00:00

AsyncDisplayKit.modulemap

Fix failing build in XCode 8.3 (#3241)

2017-04-04 14:37:45 -07:00

AsyncDisplayKit+IGListKitMethods.h

Remove References to IGListSectionType, Now that It's Gone (#49)

2017-04-26 13:04:03 -07:00

AsyncDisplayKit+IGListKitMethods.m

Remove References to IGListSectionType, Now that It's Gone (#49)

2017-04-26 13:04:03 -07:00

IGListAdapter+AsyncDisplayKit.h

Update license v2 (#67)

2017-04-24 16:59:57 -07:00

IGListAdapter+AsyncDisplayKit.m

Update license v2 (#67)

2017-04-24 16:59:57 -07:00

Info.plist

…

UIImage+ASConvenience.h

Update license v2 (#67)

2017-04-24 16:59:57 -07:00

UIImage+ASConvenience.m

Update license v2 (#67)

2017-04-24 16:59:57 -07:00

UIResponder+AsyncDisplayKit.h

Update license v2 (#67)

2017-04-24 16:59:57 -07:00

UIResponder+AsyncDisplayKit.m

Update license v2 (#67)

2017-04-24 16:59:57 -07:00