Peter
4360986a17
Merge fix
2019-02-12 20:41:07 +04:00
Peter
49a271411f
Merge commit 'e76272470d7c9170cf22e0f724f207fd077e9f69'
2019-02-12 13:50:56 +04:00
Michael Schneider
31125ff6cf
Add Video subspec ( #1240 )
2018-11-21 08:30:22 -08:00
Adlai Holler
d0ba092a77
Convert the codebase to Objective-C++ ( #1206 )
...
* Convert the codebase to Objective-C++ throughout. One language is better than two.
* Put it back
* Fix linker
* Point explicitly to updated Weaver to unblock build
* Revert "Point explicitly to updated Weaver to unblock build"
This reverts commit fdc25296e8794d4e6e56c35f5fe6da2be3f71dbc.
* Revert "Fix linker"
This reverts commit 7be25f91519b8497ef42de79f115bcfbdb965c39.
* Add in the frameworks
* no message
* Address spec lint warnings
* Fix tvos build
* Put that back
* Address Michael's review
* Add comment to kick CI
2018-11-02 12:04:14 -07:00
Peter
a085123ec1
Merge commit '565da7d4935740d12fc204aa061faf093831da1e'
...
# Conflicts:
# AsyncDisplayKit.xcodeproj/project.pbxproj
# AsyncDisplayKit.xcodeproj/xcshareddata/xcschemes/AsyncDisplayKit.xcscheme
# Source/ASDisplayNode.mm
# Source/ASEditableTextNode.h
# Source/ASImageNode.mm
# Source/ASMapNode.h
# Source/ASMapNode.mm
# Source/Base/ASAssert.m
# Source/Details/ASPhotosFrameworkImageRequest.h
# Source/Details/ASPhotosFrameworkImageRequest.m
# Source/Layout/ASLayoutElement.mm
2018-10-08 22:42:45 +03:00
appleguy
465abb1ded
[License] Simplify the Texture license to be pure Apache 2 (removing ASDK-Licenses). ( #1077 )
...
* [License] Simplify the Texture license to be pure Apache 2 (removing ASDK-Licenses)
With permission of the Facebook Open Source team, we are simplifying the Texture
license so that clients can rely on the Apache 2 terms that most of Texture is
already covered by. This means that code originally forked from AsyncDisplayKit
will be re-licensed from "BSD 3-clause + PATENTS v2" to Apache 2 without a
PATENTS file.
After getting confirmation that the updates to these core files look good, we'll
propagate this new license header to all files (in this same PR) and get sign-off
from all parties before landing.
* [License] Update all Texture source files to be pure Apache 2.
* Changelog entry for Apache 2 license update.
* Revert "[License] Update all Texture source files to be pure Apache 2."
This reverts commit ffa0fbbba9717d871dd16c4b07539f2f8208fc2b.
* [License] Update all Texture source files to be pure Apache 2, maintaining copyrights.
* [License] Update CONTRIBUTING, README, Podspec & Dangerfile.
2018-08-28 07:39:18 -07:00
Peter
26fd19a7c0
Merge branch 'master' of https://github.com/TextureGroup/Texture
...
# Conflicts:
# Source/ASDisplayNode.h
# Source/ASDisplayNode.mm
# Source/ASDisplayNodeExtras.h
# Source/ASImageNode.h
# Source/Private/ASBatchFetching.h
2018-07-21 21:13:16 +03:00
Adlai Holler
cac14e0bce
Standardize Property Declaration Style in Core Classes ( #870 )
...
* Audit property attributes for core classes
* Update style guide
* Go crazy
* Update changelog
2018-05-24 14:42:43 -07:00
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
Huy Nguyen
4ba6f451f6
[Cleanup] Remove deprecated APIs ( #529 )
...
* Remove preferredFrameSize
* Remove -measure:
* Remove -measureWithSizeRange:
* Remove ASLayoutable
* Remove .name
* Remove deprecated style forwardings
That includes following properties that are declared on ASDisplayNode and ASLayoutSpec: spacingBefore, spacingAfter, flexGrow, flexShrink, flexBasis, alignSelf, ascender, descender, sizeRange and layoutPosition.
* Remove usesImplicitHierarchyManagement
* Remove deprecated range update callbacks:
-visibilityDidChange:
-visibleStateDidChange:
-displayStateDidChange:
-loadStateDidChange:
* Remove -clearFetchedData
* Remove -cancelLayoutTransitionsInProgress
* Remve ASDisplayNode+Deprecated.h
* Remove ASLayoutRangeTypeRender and ASLayoutRangeTypeFetchData
* Remove -[ASTableView clearContents]
* Remove reloadDataImmediately
* Remove ASStaticLayoutSpec
* Remove ASDimensionDeprecated
* Remove optional -pagerNode:constrainedSizeForNodeAtIndex: delegate method in ASPagerDelegate
* Remove suppressesInvalidCollectionUpdateExceptions
* Remove -[ASCollectionViewLayoutInspector initWithCollectionView]
* Remove ASVideoPlayerNode.loadAssetWhenNodeBecomesVisible
* Update CHANGELOG
* Update license of ASLayoutSpecTests.m
* Update examples/PagerNode
* Remove ASEnvironmentTraitCollection
* Remove -ASViewController.nodeConstrainedSize
* More on removing ASLayoutable
2017-09-07 19:25:42 +01:00
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
Garrett Moon
8013e25524
Update license v2 ( #67 )
...
* Fixed license
* Update all licenses
* Update Dangerfile for new license
* Update already updated licenses
* Closer…
* Closer…
* Closer…
* Closer…
* Closer…
* Closer…
* Closer…
* Closer…
* Closer…
* Closer…
* Closer…
2017-04-24 16:59:57 -07:00
Peter
7617b9a9f3
Merge commit 'e6ee24debcae89bd0066061b42ad1a6a73da9486'
...
# Conflicts:
# Source/ASDisplayNode.mm
# Source/ASImageNode.mm
# Source/Details/ASCollectionViewLayoutController.mm
2017-03-15 13:31:39 +03:00
Michael Schneider
2df392261e
[ASVideoPlayerNode] Fixes and improvements ( #3135 )
...
* Improvements for ASVideoPlayer, especially around asset handling and API
* Change legacy URL of videos
* Address comments
2017-03-05 19:28:03 +00:00
Michael Schneider
67baa44fb5
Fix -Wdocumentation warnings ( #3113 )
2017-03-01 11:25:37 -08:00
Peter
d1ab6976b5
Merge commit 'a08d9dc7328bef8cfc1b50b36cc05edb09af25a3'
...
# Conflicts:
# AsyncDisplayKit.xcodeproj/project.pbxproj
# AsyncDisplayKit/ASPagerFlowLayout.m
# AsyncDisplayKit/AsyncDisplayKit.modulemap
# AsyncDisplayKit/Details/ASCollectionDataController.h
# AsyncDisplayKit/Details/ASCollectionDataController.mm
# AsyncDisplayKit/Details/ASDataController.mm
# AsyncDisplayKit/Private/ASDataController+Subclasses.h
# AsyncDisplayKit/module.modulemap
# Source/Debug/AsyncDisplayKit+Debug.h
# Source/Details/ASCollectionElement.mm
# Source/module.modulemap
2017-03-01 15:57:40 +04:00
Adlai Holler
73ca6ab514
Shuffle & Cleanup Stuff ( #3080 )
2017-02-26 18:14:13 -08:00
