Peter Iakovlev
3a2c2ea690
Merge commit '2618c50073092e99fe1df5213ba6a0619e908988'
...
# Conflicts:
# AsyncDisplayKit.xcodeproj/project.pbxproj
# Source/Private/ASDisplayNode+AsyncDisplay.mm
2018-03-02 15:24:20 +04:00
Adlai Holler
fef965f78e
Add support for providing additional info to network image node delegate ( #775 )
...
* Add support for piping arbitrary user info from ASImageDownloader to the ASNetworkImageNodeDelegate
* s/source/sourceType
* Fix stuff and take Michael's advice
2018-01-30 17:50:38 -05: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
Garrett Moon
008a1ce208
Revert Adds support for specifying a quality indexed array of URLs ( #699 )
...
* Revert "Adds support for specifying a quality indexed array of URLs (#557 )"
This reverts commit 3c77d4a5da44c46c7b80b2a627c95389b7d6352d.
* Add CHANGELOG entry
2017-12-05 13:55:19 -08:00
Adlai Holler
af99ff5ef2
Have ASNetworkImageNode report whether images were cached or not ( #639 )
...
* Have ASNetworkImageNode report whether images were cached or not.
* Update changelog
* Add fileURL case
2017-10-25 15:57:30 -07:00
Garrett Moon
3c77d4a5da
Adds support for specifying a quality indexed array of URLs ( #557 )
...
* Add support for downloading a set of URLs on ASNetworkImageNode
* Should be building now;
* Remove old unused code
* Add a changelog message
* Bump PINRemoteImage
* Huy's comments
2017-09-11 11:12:45 -07: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
Adlai Holler
0de270fdfb
Revert "Improve designated initializer usage ( #3132 )"
...
This reverts commit eaa875c7f2e08afa8b597c653be6b7c45cfff66d.
2017-03-03 15:31:28 -08:00
Michael Schneider
eaa875c7f2
Improve designated initializer usage ( #3132 )
...
* Improve designated initializer usage
* Some more changes
* Add some whitespace
* Fix some warning
2017-03-03 14:49:34 -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
