Peter Iakovlev 3a2c2ea690 Merge commit '2618c50073092e99fe1df5213ba6a0619e908988' ...

# Conflicts:
#	AsyncDisplayKit.xcodeproj/project.pbxproj
#	Source/Private/ASDisplayNode+AsyncDisplay.mm

2018-03-02 15:24:20 +04:00

..

Base

Revert "Faster collection operations (#748)" (#759)

2018-01-22 11:38:09 -08:00

Debug

Merge commit '2618c50073092e99fe1df5213ba6a0619e908988'

2018-03-02 15:24:20 +04:00

Details

Merge commit '2618c50073092e99fe1df5213ba6a0619e908988'

2018-03-02 15:24:20 +04:00

Layout

Revert "Faster collection operations (#748)" (#759)

2018-01-22 11:38:09 -08:00

Private

Merge commit '2618c50073092e99fe1df5213ba6a0619e908988'

2018-03-02 15:24:20 +04:00

TextKit

[ASTextKitComponents] Make sure Main Thread Checker isn't triggered during background calculations #trivial (#612)

2017-10-17 14:20:20 +01: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

Revert "Faster collection operations (#748)" (#759)

2018-01-22 11:38:09 -08:00

ASBlockTypes.h

Fix "This block and function declaration is not a prototype" warning. (#619)

2017-10-17 14:18:23 +01: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 '2618c50073092e99fe1df5213ba6a0619e908988'

2018-03-02 15:24:20 +04:00

ASCellNode.mm

Merge commit '2618c50073092e99fe1df5213ba6a0619e908988'

2018-03-02 15:24:20 +04:00

ASCollectionNode.h

Merge commit '2618c50073092e99fe1df5213ba6a0619e908988'

2018-03-02 15:24:20 +04:00

ASCollectionNode.mm

Merge commit '2618c50073092e99fe1df5213ba6a0619e908988'

2018-03-02 15:24:20 +04:00

ASCollectionNode+Beta.h

Merge commit '131619de96190415aec89987d4493220c6d0305d'

2017-12-25 01:44:19 +04:00

ASCollectionView.h

Merge commit '131619de96190415aec89987d4493220c6d0305d'

2017-12-25 01:44:19 +04:00

ASCollectionView.mm

Merge commit '2618c50073092e99fe1df5213ba6a0619e908988'

2018-03-02 15:24:20 +04: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 '2618c50073092e99fe1df5213ba6a0619e908988'

2018-03-02 15:24:20 +04:00

ASDisplayNode.mm

Merge commit '2618c50073092e99fe1df5213ba6a0619e908988'

2018-03-02 15:24:20 +04:00

ASDisplayNode+Beta.h

Fix "This block and function declaration is not a prototype" warning. (#619)

2017-10-17 14:18:23 +01: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

[Cleanup] Remove deprecated APIs (#529)

2017-09-07 19:25:42 +01:00

ASDisplayNode+Layout.mm

Merge commit '2618c50073092e99fe1df5213ba6a0619e908988'

2018-03-02 15:24:20 +04:00

ASDisplayNode+Subclasses.h

no message

2018-01-09 13:19:25 +04:00

ASDisplayNode+Yoga.mm

Revert "Faster collection operations (#748)" (#759)

2018-01-22 11:38:09 -08:00

ASDisplayNodeExtras.h

no message

2018-01-09 13:19:25 +04:00

ASDisplayNodeExtras.mm

[Minor Breaking API] Make deallocation queues more reliable (#651)

2017-11-02 10:45:34 -07:00

asdkmodule.modulemap

no message

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

ASEditableTextNode.h

Merge commit '2618c50073092e99fe1df5213ba6a0619e908988'

2018-03-02 15:24:20 +04:00

ASEditableTextNode.mm

Merge commit '2618c50073092e99fe1df5213ba6a0619e908988'

2018-03-02 15:24:20 +04:00

ASImageNode.h

no message

2018-01-09 13:19:25 +04:00

ASImageNode.mm

Merge commit '2618c50073092e99fe1df5213ba6a0619e908988'

2018-03-02 15:24:20 +04:00

ASImageNode+AnimatedImage.mm

no message

2018-01-09 13:19:25 +04:00

ASMapNode.h

Merge commit '3ccc2f0f15d2e4ed7105f0ef6aea575e05cfd7ad'

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

ASMapNode.mm

Merge commit '2618c50073092e99fe1df5213ba6a0619e908988'

2018-03-02 15:24:20 +04:00

ASMultiplexImageNode.h

Merge commit '3ccc2f0f15d2e4ed7105f0ef6aea575e05cfd7ad'

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

ASMultiplexImageNode.mm

Merge commit '2618c50073092e99fe1df5213ba6a0619e908988'

2018-03-02 15:24:20 +04: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

ASNetworkImageLoadInfo.h

Add support for providing additional info to network image node delegate (#775)

2018-01-30 17:50:38 -05:00

ASNetworkImageLoadInfo.m

Add support for providing additional info to network image node delegate (#775)

2018-01-30 17:50:38 -05:00

ASNetworkImageNode.h

Merge commit '2618c50073092e99fe1df5213ba6a0619e908988'

2018-03-02 15:24:20 +04:00

ASNetworkImageNode.mm

Merge commit '2618c50073092e99fe1df5213ba6a0619e908988'

2018-03-02 15:24:20 +04:00

ASNodeController+Beta.h

[ASNodeController] Add -nodeDidLayout callback. Allow switching retain behavior at runtime. (#470)

2017-07-27 01:07:53 -07:00

ASNodeController+Beta.m

[ASNodeController] Add -nodeDidLayout callback. Allow switching retain behavior at runtime. (#470)

2017-07-27 01:07:53 -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 '131619de96190415aec89987d4493220c6d0305d'

2017-12-25 01:44:19 +04:00

ASPagerNode.m

Merge commit '131619de96190415aec89987d4493220c6d0305d'

2017-12-25 01:44:19 +04:00

ASPagerNode+Beta.h

no message

2017-08-04 14:04:08 +03:00

ASRangeManagingNode.h

Make Cell Node Properties Atomic (#74)

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

ASRunLoopQueue.h

New runloop queue to coalesce Interface state update calls. (#788)

2018-02-13 12:10:20 -08:00

ASRunLoopQueue.mm

New runloop queue to coalesce Interface state update calls. (#788)

2018-02-13 12:10:20 -08:00

ASScrollNode.h

Update license v2 (#67)

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

ASScrollNode.mm

[ASScrollNode] Fix small bugs and add unit tests (#637)

2017-12-01 15:41:06 +00: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 '131619de96190415aec89987d4493220c6d0305d'

2017-12-25 01:44:19 +04:00

ASTableNode.mm

Merge commit '2618c50073092e99fe1df5213ba6a0619e908988'

2018-03-02 15:24:20 +04:00

ASTableNode+Beta.h

[Batch Fetching] Add ASBatchFetchingDelegate (#281)

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

ASTableView.h

Merge commit '131619de96190415aec89987d4493220c6d0305d'

2017-12-25 01:44:19 +04:00

ASTableView.mm

Merge commit '2618c50073092e99fe1df5213ba6a0619e908988'

2018-03-02 15:24:20 +04: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

Fix ASTextNode2 is accessing backgroundColor off main while sizing / layout is happening (#794)

2018-02-08 08:28:14 -08:00

ASTextNode.h

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

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

ASTextNode.mm

Raise deployment target to iOS 9 (#743)

2018-01-15 15:13:05 -08: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 '131619de96190415aec89987d4493220c6d0305d'

2017-12-25 01:44:19 +04:00

ASVideoPlayerNode.h

Merge commit '131619de96190415aec89987d4493220c6d0305d'

2017-12-25 01:44:19 +04:00

ASVideoPlayerNode.mm

Merge commit '131619de96190415aec89987d4493220c6d0305d'

2017-12-25 01:44:19 +04:00

ASViewController.h

Merge commit '131619de96190415aec89987d4493220c6d0305d'

2017-12-25 01:44:19 +04:00

ASViewController.mm

Merge commit '131619de96190415aec89987d4493220c6d0305d'

2017-12-25 01:44:19 +04: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

Add support for providing additional info to network image node delegate (#775)

2018-01-30 17:50:38 -05: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

Shuffle & Cleanup Stuff (#3080)

2017-02-26 18:14:13 -08:00

UIImage+ASConvenience.h

Update license v2 (#67)

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

UIImage+ASConvenience.m

Add an experimental "no-copy" renderer (#741)

2018-01-13 19:19:08 -08: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