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
Mustafa Besnili
1e7d46196f
Fix "This block and function declaration is not a prototype" warning. ( #619 )
2017-10-17 14:18:23 +01:00
appleguy
c6e3dd7a5d
[ASCollectionView] Fix index space translation of Flow Layout Delegate methods. ( #467 )
...
* [ASCollectionView] Fix index space translation of Flow Layout Delegate methods.
This includes a few other cleanups, including overflow of signed integer indices.
* [ASCollectionView] Improve code sharing of UIKit size method calls; ensure delegate invalidation re-fetches supplementary sizes too.
* [ASCollectionView] Final method ordering and doc-comment for new _sizeForUIKitCellWithKind:atIndexPath: method.
2017-10-09 17:19:46 +01:00
Huy Nguyen
fcee108af5
[ASCollectionNode][ASTableNode] Add content inset bridging property ( #560 )
...
* Add content inset bridging property to table and collection nodes
* Fix CHANGELOG
* Fix typo
* Minor fixes
2017-09-11 19:20:32 +01:00
Peter
d1da40bb0b
Merge commit '19a9d29aa873edcf5624bed7fa9ee86662da0bfd'
...
# Conflicts:
# Source/Details/ASCollectionGalleryLayoutDelegate.m
2017-09-11 00:03:22 +03:00
Huy Nguyen
dc3be352af
[ASTableNode][ASCollectionNode] Add content offset bridging property ( #460 )
...
- Add content offset bridging property to table and collection node
- And use it in `ASCollectionLayout` to avoid measuring unrelated nodes during the first layout.
- Update CHANGELOG and highlight deprecated methods
2017-08-10 17:47:26 +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
Adlai Holler
326925839d
Fix double-load issue with ASCollectionNode ( #372 )
...
* Fix double-reload issue with ASCollectionNode
* Add a message to the change pile
* Fix some license headers
* Address feedback
2017-06-19 14:18:56 -07:00
Adlai Holler
588f30c7dd
Move Last Few Properties from ASTableView,ASCollectionView to Node ( #225 )
...
* Finish moving properties ASTableView->ASTableNode, ASCollectionView->ASCollectionNode
* Update changeling
2017-05-04 13:41:58 +01: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
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
