Peter
d1da40bb0b
Merge commit '19a9d29aa873edcf5624bed7fa9ee86662da0bfd'
...
# Conflicts:
# Source/Details/ASCollectionGalleryLayoutDelegate.m
2017-09-11 00:03:22 +03:00
Phil Larson
359b5f0b5b
ASImageNode+AnimatedImage playbackReadyCallback retain cycle ( #520 )
...
* ASImageNode+AnimatedImage playbackReadyCallback causes strong retain cycle
* Add CHANGELOG entry for #520
2017-08-21 12:49:11 +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
d5f10652c6
Fixes an issue with GIFs that would always be covered by their placeholder ( #326 )
...
Also adds a subclass override for when the animated image is set.
2017-06-02 16:13:36 -07: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
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
Michael Schneider
1f042e960d
[ASNetworkImageNode] Improve locking ( #3187 )
...
* Locking improvements for ASNetworkImageNode
* Fix typo
* Address comments
* Address comments
* Change comment to kick build
2017-03-28 10:42:59 +01:00
Peter
429faedb45
no message
2017-03-01 18:33:48 +04:00
Adlai Holler
73ca6ab514
Shuffle & Cleanup Stuff ( #3080 )
2017-02-26 18:14:13 -08:00
