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
baf94a7575
Merge commit '30ad10da3c34439d6c1c8f8e8f88539d875cf6bf'
...
# Conflicts:
# AsyncDisplayKit.xcodeproj/project.pbxproj
# Source/ASImageNode+AnimatedImage.mm
# Source/ASImageNode.mm
# Source/AsyncDisplayKit.modulemap
# Source/Details/_ASCollectionViewCell.m
# Source/asdkmodule.modulemap
# Source/module.modulemap
2017-04-18 19:50:49 +03:00
Michael Schneider
ae1e299f21
Fix PINRemoteImageManagerPriority deprecation ( #3258 )
2017-04-11 10:52:10 -07:00
Garrett Moon
8c3775f5e2
Need to check availability before use of macros. ( #3254 )
...
* Need to check availability before use of macros.
* Get rid of PCH and enforce macro definition.
* Remove prefix
* Switch to global warning instead, much better.
2017-04-10 15:06:40 -07:00
Garrett Moon
68a8d5f468
Add download resume support ( #3246 )
...
* Adds support for resuming downloads that were canceled due to exiting preload range.
* Update to latest PINRemoteImage
* Fix warnings
* Address comments. Thanks @nguyenhuy!
2017-04-10 11:18:05 -07:00
Flo
d5a84bf7b1
[ASImageProtocols] Fix nullables to avoid bridging crashes ( #3190 )
...
* [ASMultiplex/NetworkImageNode] Ensure ASImageProtocols are not called with nil arguments.
* [ASBasic/PINRemoteImageDownloader] Do not check for nil downloadIdentifier needlessly.
* [ASImageCacheProtocol] Make synchronouslyFetchedCachedImageWithURL URL nonnull.
2017-03-17 11:46:10 -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
