Peter d1da40bb0b Merge commit '19a9d29aa873edcf5624bed7fa9ee86662da0bfd' ...

# Conflicts:
#	Source/Details/ASCollectionGalleryLayoutDelegate.m

2017-09-11 00:03:22 +03: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 '3ccc2f0f15d2e4ed7105f0ef6aea575e05cfd7ad'

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

_ASDisplayView.h

Update license v2 (#67)

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

_ASDisplayView.mm

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

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

_ASDisplayViewAccessiblity.h

Update license v2 (#67)

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

_ASDisplayViewAccessiblity.mm

[Accessibility] Add .isAccessibilityContainer property, allowing automatic aggregation of children's a11y labels. (#468)

2017-08-20 13:17:05 -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 '3ccc2f0f15d2e4ed7105f0ef6aea575e05cfd7ad'

2017-08-04 13:12:06 +03: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 '19a9d29aa873edcf5624bed7fa9ee86662da0bfd'

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

ASCollectionGalleryLayoutDelegate.m

Improvements in ASCollectionGalleryLayoutDelegate (#496)

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

ASCollectionGalleryLayoutDelegate.mm

Merge commit '19a9d29aa873edcf5624bed7fa9ee86662da0bfd'

2017-09-11 00:03:22 +03: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 '3ccc2f0f15d2e4ed7105f0ef6aea575e05cfd7ad'

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

ASCollectionViewLayoutInspector.m

Merge commit '19a9d29aa873edcf5624bed7fa9ee86662da0bfd'

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

ASDataController.h

Merge commit '19a9d29aa873edcf5624bed7fa9ee86662da0bfd'

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

ASDataController.mm

Merge commit '19a9d29aa873edcf5624bed7fa9ee86662da0bfd'

2017-09-11 00:03:22 +03: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 '3ccc2f0f15d2e4ed7105f0ef6aea575e05cfd7ad'

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

ASElementMap.m

Merge commit 'ba08ae1318cac3a40c4c0fe6c920e1675117dc2f'

2017-08-04 13:12:11 +03: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

Fix internal Linter warnings #trivial (#340)

2017-06-08 10:45:03 -07: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

Update license v2 (#67)

2017-04-24 16:59:57 -07: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 '3ccc2f0f15d2e4ed7105f0ef6aea575e05cfd7ad'

2017-08-04 13:12:06 +03: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

Improve System Trace Implementation #trivial (#368)

2017-06-19 10:14:39 -07: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

[ASTraitCollection] Convert ASPrimitiveTraitCollection from lock to atomic. (#355)

2017-06-14 13:55:52 -07:00

ASTraitCollection.m

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

2017-05-02 14:38:06 -07: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

[ASDisplayNode] Allow setting stretchable contents on nodes; add bridged properties. (#429)

2017-07-09 10:54:39 -07:00