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

..

Transactions

Improve System Trace Implementation #trivial (#368)

2017-06-19 10:14:39 -07:00

_ASCollectionReusableView.h

Merge commit '3ccc2f0f15d2e4ed7105f0ef6aea575e05cfd7ad'

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

_ASCollectionReusableView.m

Merge commit '3ccc2f0f15d2e4ed7105f0ef6aea575e05cfd7ad'

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

_ASCollectionViewCell.h

Merge commit '3ccc2f0f15d2e4ed7105f0ef6aea575e05cfd7ad'

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

_ASCollectionViewCell.m

Merge commit '3ccc2f0f15d2e4ed7105f0ef6aea575e05cfd7ad'

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

_ASDisplayLayer.h

Cleanup ASDisplayLayer (#315)

2017-05-29 15:38:27 -07:00

_ASDisplayLayer.mm

Merge commit '131619de96190415aec89987d4493220c6d0305d'

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

_ASDisplayView.h

Update license v2 (#67)

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

_ASDisplayView.mm

Make the framework backwards compatible with Xcode 8 (#650)

2017-10-31 16:11:57 -07:00

_ASDisplayViewAccessiblity.h

Update license v2 (#67)

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

_ASDisplayViewAccessiblity.mm

Make the framework backwards compatible with Xcode 8 (#650)

2017-10-31 16:11:57 -07:00

ASAbstractLayoutController.h

Replace NSMutableSet with NSHashTable when Appropriate #trivial (#321)

2017-06-05 16:33:37 -07:00

ASAbstractLayoutController.mm

Replace NSMutableSet with NSHashTable when Appropriate #trivial (#321)

2017-06-05 16:33:37 -07:00

ASBasicImageDownloader.h

Merge commit '3ccc2f0f15d2e4ed7105f0ef6aea575e05cfd7ad'

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

ASBasicImageDownloader.mm

Merge commit '131619de96190415aec89987d4493220c6d0305d'

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

ASBatchContext.h

Merge commit '3ccc2f0f15d2e4ed7105f0ef6aea575e05cfd7ad'

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

ASBatchContext.mm

Merge commit '3ccc2f0f15d2e4ed7105f0ef6aea575e05cfd7ad'

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

ASBatchFetchingDelegate.h

[Batch Fetching] Add ASBatchFetchingDelegate (#281)

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

ASCollectionElement.h

Merge commit '19a9d29aa873edcf5624bed7fa9ee86662da0bfd'

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

ASCollectionElement.mm

Merge commit '19a9d29aa873edcf5624bed7fa9ee86662da0bfd'

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

ASCollectionFlowLayoutDelegate.h

Merge commit '3ccc2f0f15d2e4ed7105f0ef6aea575e05cfd7ad'

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

ASCollectionFlowLayoutDelegate.m

Merge commit '19a9d29aa873edcf5624bed7fa9ee86662da0bfd'

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

ASCollectionGalleryLayoutDelegate.h

Merge commit '131619de96190415aec89987d4493220c6d0305d'

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

ASCollectionGalleryLayoutDelegate.m

Improvements in ASCollectionGalleryLayoutDelegate (#496)

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

ASCollectionGalleryLayoutDelegate.mm

Merge commit '131619de96190415aec89987d4493220c6d0305d'

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

ASCollectionInternal.h

Merge commit '3ccc2f0f15d2e4ed7105f0ef6aea575e05cfd7ad'

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

ASCollectionInternal.m

Update license v2 (#67)

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

ASCollectionLayoutContext.h

Merge commit '19a9d29aa873edcf5624bed7fa9ee86662da0bfd'

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

ASCollectionLayoutContext.m

Merge commit '19a9d29aa873edcf5624bed7fa9ee86662da0bfd'

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

ASCollectionLayoutDelegate.h

Merge commit 'ba08ae1318cac3a40c4c0fe6c920e1675117dc2f'

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

ASCollectionLayoutState.h

Merge commit '19a9d29aa873edcf5624bed7fa9ee86662da0bfd'

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

ASCollectionLayoutState.mm

Merge commit '19a9d29aa873edcf5624bed7fa9ee86662da0bfd'

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

ASCollectionViewLayoutController.h

Merge commit '3ccc2f0f15d2e4ed7105f0ef6aea575e05cfd7ad'

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

ASCollectionViewLayoutController.m

Merge commit '3ccc2f0f15d2e4ed7105f0ef6aea575e05cfd7ad'

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

ASCollectionViewLayoutController.mm

Initial Work for Range Controller to Support Supplementary Elements (#3140)

2017-03-06 10:11:00 -08:00

ASCollectionViewLayoutInspector.h

Merge commit '131619de96190415aec89987d4493220c6d0305d'

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

ASCollectionViewLayoutInspector.m

Merge commit '131619de96190415aec89987d4493220c6d0305d'

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

ASDataController.h

Merge commit '131619de96190415aec89987d4493220c6d0305d'

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

ASDataController.mm

Merge commit '131619de96190415aec89987d4493220c6d0305d'

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

ASDelegateProxy.h

Update license v2 (#67)

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

ASDelegateProxy.m

[ASCollectionView] Add delegate bridging and index space translation for missing UICollectionViewLayout properties. (#440)

2017-07-17 11:30:46 +00:00

ASElementMap.h

Merge commit '131619de96190415aec89987d4493220c6d0305d'

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

ASElementMap.m

Merge commit '131619de96190415aec89987d4493220c6d0305d'

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

ASEventLog.h

Update license v2 (#67)

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

ASEventLog.mm

Update license v2 (#67)

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

ASHashing.h

Introduce ASCollectionGalleryLayoutDelegate (#76)

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

ASHashing.m

Introduce ASCollectionGalleryLayoutDelegate (#76)

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

ASHighlightOverlayLayer.h

Update license v2 (#67)

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

ASHighlightOverlayLayer.mm

Update license v2 (#67)

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

ASImageContainerProtocolCategories.h

Update license v2 (#67)

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

ASImageContainerProtocolCategories.m

Update license v2 (#67)

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

ASImageProtocols.h

Revert Adds support for specifying a quality indexed array of URLs (#699)

2017-12-05 13:55:19 -08:00

ASIntegerMap.h

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

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

ASIntegerMap.mm

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

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

ASLayoutController.h

Replace NSMutableSet with NSHashTable when Appropriate #trivial (#321)

2017-06-05 16:33:37 -07:00

ASLayoutRangeType.h

[Cleanup] Remove deprecated APIs (#529)

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

ASMainSerialQueue.h

[ASCollectionNode] Add -isProcessingUpdates and -onDidFinishProcessingUpdates: APIs. (#522)

2017-08-23 11:16:21 +01:00

ASMainSerialQueue.mm

[ASCollectionNode] Add -isProcessingUpdates and -onDidFinishProcessingUpdates: APIs. (#522)

2017-08-23 11:16:21 +01:00

ASMutableAttributedStringBuilder.h

Update license v2 (#67)

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

ASMutableAttributedStringBuilder.m

Update license v2 (#67)

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

ASObjectDescriptionHelpers.h

Update license v2 (#67)

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

ASObjectDescriptionHelpers.m

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

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

ASPageTable.h

Merge commit '3ccc2f0f15d2e4ed7105f0ef6aea575e05cfd7ad'

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

ASPageTable.m

Merge commit '3ccc2f0f15d2e4ed7105f0ef6aea575e05cfd7ad'

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

ASPhotosFrameworkImageRequest.h

Merge commit '3ccc2f0f15d2e4ed7105f0ef6aea575e05cfd7ad'

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

ASPhotosFrameworkImageRequest.m

Merge commit '3ccc2f0f15d2e4ed7105f0ef6aea575e05cfd7ad'

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

ASPINRemoteImageDownloader.h

Merge commit '3ccc2f0f15d2e4ed7105f0ef6aea575e05cfd7ad'

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

ASPINRemoteImageDownloader.m

Merge commit '131619de96190415aec89987d4493220c6d0305d'

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

ASRangeController.h

Merge commit 'ba08ae1318cac3a40c4c0fe6c920e1675117dc2f'

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

ASRangeController.mm

Merge commit 'ba08ae1318cac3a40c4c0fe6c920e1675117dc2f'

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

ASRangeControllerUpdateRangeProtocol+Beta.h

Merge commit '3ccc2f0f15d2e4ed7105f0ef6aea575e05cfd7ad'

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

ASScrollDirection.h

Update license v2 (#67)

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

ASScrollDirection.m

Update license v2 (#67)

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

ASSectionContext.h

Merge commit '3ccc2f0f15d2e4ed7105f0ef6aea575e05cfd7ad'

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

ASTableLayoutController.h

Merge commit '3ccc2f0f15d2e4ed7105f0ef6aea575e05cfd7ad'

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

ASTableLayoutController.m

Merge commit '3ccc2f0f15d2e4ed7105f0ef6aea575e05cfd7ad'

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

ASThread.h

Fix crashes caused by failing to unlock or destroy a static mutex while the app is being terminated (#577)

2017-09-22 11:53:41 +01:00

ASTraceEvent.h

Update license v2 (#67)

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

ASTraceEvent.m

Update license v2 (#67)

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

ASTraitCollection.h

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

2017-10-17 14:18:23 +01:00

ASTraitCollection.m

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

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

ASWeakProxy.h

Update license v2 (#67)

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

ASWeakProxy.m

Update license v2 (#67)

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

ASWeakSet.h

Update license v2 (#67)

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

ASWeakSet.m

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

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

CoreGraphics+ASConvenience.h

Update license v2 (#67)

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

CoreGraphics+ASConvenience.m

Update license v2 (#67)

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

NSArray+Diffing.h

Update license v2 (#67)

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

NSArray+Diffing.m

Update license v2 (#67)

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

NSIndexSet+ASHelpers.h

Update license v2 (#67)

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

NSIndexSet+ASHelpers.m

Update license v2 (#67)

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

NSMutableAttributedString+TextKitAdditions.h

Update license v2 (#67)

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

NSMutableAttributedString+TextKitAdditions.m

Update license v2 (#67)

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

UICollectionViewLayout+ASConvenience.h

Update license v2 (#67)

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

UICollectionViewLayout+ASConvenience.m

Merge commit '3ccc2f0f15d2e4ed7105f0ef6aea575e05cfd7ad'

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

UIView+ASConvenience.h

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

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