Peter 34b6e37b8c Merge commit '131619de96190415aec89987d4493220c6d0305d' ...

# Conflicts:
#	Source/ASDisplayNode+Deprecated.h
#	Source/ASDisplayNode.mm
#	Source/ASDisplayNodeExtras.h
#	Source/ASImageNode+AnimatedImage.mm
#	Source/Private/ASSection.h
#	Source/Private/_ASHierarchyChangeSet.mm

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

..

Layout

[Cleanup] Remove deprecated APIs (#529)

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

TextExperiment

Fix name clash with YYText (#623)

2017-10-18 15:49:58 -07:00

_ASCollectionGalleryLayoutInfo.h

Improvements in ASCollectionGalleryLayoutDelegate (#496)

2017-08-08 19:11:40 +01:00

_ASCollectionGalleryLayoutInfo.m

Improvements in ASCollectionGalleryLayoutDelegate (#496)

2017-08-08 19:11:40 +01:00

_ASCollectionGalleryLayoutItem.h

Merge commit '3ccc2f0f15d2e4ed7105f0ef6aea575e05cfd7ad'

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

_ASCollectionGalleryLayoutItem.mm

Merge commit '131619de96190415aec89987d4493220c6d0305d'

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

_ASCoreAnimationExtras.h

[ASCoreAnimationExtras] Update documentation for resizbale images #trivial (#492)

2017-08-12 08:03:42 -07:00

_ASCoreAnimationExtras.mm

[ASCoreAnimationExtras] Update documentation for resizbale images #trivial (#492)

2017-08-12 08:03:42 -07:00

_ASHierarchyChangeSet.h

Introduce ASIntegerMap, improve our changeset handling #trivial (#405)

2017-07-05 13:29:02 -07:00

_ASHierarchyChangeSet.mm

[Cleanup] Remove deprecated APIs (#529)

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

_ASPendingState.h

Update license v2 (#67)

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

_ASPendingState.mm

[iOS11] Update project settings and fix errors (#676)

2017-11-30 12:25:06 +00:00

_ASScopeTimer.h

Update license v2 (#67)

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

ASBasicImageDownloaderInternal.h

Update license v2 (#67)

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

ASBatchFetching.h

Merge commit '3ccc2f0f15d2e4ed7105f0ef6aea575e05cfd7ad'

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

ASBatchFetching.m

Merge commit '3ccc2f0f15d2e4ed7105f0ef6aea575e05cfd7ad'

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

ASCellNode+Internal.h

Merge commit '3ccc2f0f15d2e4ed7105f0ef6aea575e05cfd7ad'

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

ASCollectionLayout.h

Merge commit '3ccc2f0f15d2e4ed7105f0ef6aea575e05cfd7ad'

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

ASCollectionLayout.mm

Merge commit '131619de96190415aec89987d4493220c6d0305d'

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

ASCollectionLayoutCache.h

Merge commit '3ccc2f0f15d2e4ed7105f0ef6aea575e05cfd7ad'

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

ASCollectionLayoutCache.mm

Merge commit '3ccc2f0f15d2e4ed7105f0ef6aea575e05cfd7ad'

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

ASCollectionLayoutContext+Private.h

Merge commit '19a9d29aa873edcf5624bed7fa9ee86662da0bfd'

2017-09-11 00:03:22 +03:00

ASCollectionLayoutDefines.h

Introduce ASCollectionGalleryLayoutDelegate (#76)

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

ASCollectionLayoutDefines.m

Introduce ASCollectionGalleryLayoutDelegate (#76)

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

ASCollectionLayoutState+Private.h

Merge commit '19a9d29aa873edcf5624bed7fa9ee86662da0bfd'

2017-09-11 00:03:22 +03:00

ASCollectionView+Undeprecated.h

Merge commit '131619de96190415aec89987d4493220c6d0305d'

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

ASCollectionViewFlowLayoutInspector.h

Merge commit '3ccc2f0f15d2e4ed7105f0ef6aea575e05cfd7ad'

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

ASCollectionViewFlowLayoutInspector.m

Merge commit '3ccc2f0f15d2e4ed7105f0ef6aea575e05cfd7ad'

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

ASControlTargetAction.h

Update license v2 (#67)

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

ASControlTargetAction.m

Update license v2 (#67)

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

ASDefaultPlaybackButton.h

Update license v2 (#67)

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

ASDefaultPlaybackButton.m

Remove instance method of -drawRect:withParameters:isCancelled:isRasterizing: (#232)

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

ASDefaultPlayButton.h

Update license v2 (#67)

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

ASDefaultPlayButton.m

Remove instance method of -drawRect:withParameters:isCancelled:isRasterizing: (#232)

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

ASDispatch.h

Introduce ASCollectionGalleryLayoutDelegate (#76)

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

ASDispatch.m

Introduce ASCollectionGalleryLayoutDelegate (#76)

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

ASDisplayNode+AsyncDisplay.mm

Merge commit '131619de96190415aec89987d4493220c6d0305d'

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

ASDisplayNode+DebugTiming.h

Update license v2 (#67)

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

ASDisplayNode+DebugTiming.mm

Update license v2 (#67)

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

ASDisplayNode+FrameworkPrivate.h

Add unit tests for the layout engine (#424)

2017-12-01 17:05:47 +00:00

ASDisplayNode+FrameworkSubclasses.h

Update license v2 (#67)

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

ASDisplayNode+UIViewBridge.mm

Merge commit '131619de96190415aec89987d4493220c6d0305d'

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

ASDisplayNodeInternal.h

Added attributed versions of accessibilityLabel, accessibilityHint, accessibilityValue (#554)

2017-09-18 18:07:01 +01:00

ASDisplayNodeLayout.h

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

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

ASDisplayNodeLayout.mm

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

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

ASDisplayNodeTipState.h

Update license v2 (#67)

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

ASDisplayNodeTipState.m

Update license v2 (#67)

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

ASIGListAdapterBasedDataSource.h

Update license v2 (#67)

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

ASIGListAdapterBasedDataSource.m

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

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

ASImageNode+AnimatedImagePrivate.h

Animated WebP support (#605)

2017-10-09 11:48:32 -07:00

ASImageNode+CGExtras.h

Update license v2 (#67)

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

ASImageNode+CGExtras.m

Update license v2 (#67)

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

ASImageNode+Private.h

Update license v2 (#67)

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

ASInternalHelpers.h

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

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

ASInternalHelpers.m

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

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

ASLayerBackingTipProvider.h

Update license v2 (#67)

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

ASLayerBackingTipProvider.m

Update license v2 (#67)

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

ASLayoutTransition.h

Extract ASLayoutElement and ASLayoutElementStylability into categories #trivial (#131)

2017-05-02 14:38:06 -07:00

ASLayoutTransition.mm

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

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

ASMutableElementMap.h

Merge commit '131619de96190415aec89987d4493220c6d0305d'

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

ASMutableElementMap.m

Merge commit '131619de96190415aec89987d4493220c6d0305d'

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

ASPendingStateController.h

Update license v2 (#67)

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

ASPendingStateController.mm

Update license v2 (#67)

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

ASRectMap.h

Reimplement ASRectTable using unordered_map to avoid obscure NSMapTable exception. (#719)

2017-12-21 16:17:25 -08:00

ASRectMap.mm

Reimplement ASRectTable using unordered_map to avoid obscure NSMapTable exception. (#719)

2017-12-21 16:17:25 -08:00

ASResponderChainEnumerator.h

Update license v2 (#67)

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

ASResponderChainEnumerator.m

Update license v2 (#67)

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

ASSection.h

Merge commit '131619de96190415aec89987d4493220c6d0305d'

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

ASSection.m

Merge commit '3ccc2f0f15d2e4ed7105f0ef6aea575e05cfd7ad'

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

ASTableView+Undeprecated.h

[iOS11] Update project settings and fix errors (#676)

2017-11-30 12:25:06 +00:00

ASTip.h

Update license v2 (#67)

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

ASTip.m

Update license v2 (#67)

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

ASTipNode.h

Update license v2 (#67)

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

ASTipNode.m

Update license v2 (#67)

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

ASTipProvider.h

Update license v2 (#67)

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

ASTipProvider.m

Update license v2 (#67)

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

ASTipsController.h

Update license v2 (#67)

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

ASTipsController.m

Update license v2 (#67)

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

ASTipsWindow.h

Update license v2 (#67)

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

ASTipsWindow.m

Update license v2 (#67)

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

ASTwoDimensionalArrayUtils.h

Update license v2 (#67)

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

ASTwoDimensionalArrayUtils.m

[Cleanup] Small fixes to improve conformance for strict compiler settings #trivial (#320)

2017-05-29 18:11:18 -07:00

ASWeakMap.h

Make ASWeakMapEntry Value Atomic (#555)

2017-09-08 15:17:35 +01:00

ASWeakMap.m

Make ASWeakMapEntry Value Atomic (#555)

2017-09-08 15:17:35 +01:00