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
8ec4b312cf
Overhaul our logging, add activity tracing support. ( #399 )
...
* Improve the os_log and os_activity integration
* Address feedback from Scott and Huy
2017-07-03 19:03:26 -07: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
Adlai Holler
b41816d40d
Standardize Dependency Flags for PINRemoteImage, IGListKit ( #3244 )
...
* no message
* Go further
* Make the symbols public so that apps actually build
* Move ASAvailability into the umbrella header
* Remove duplicate define
* Put the file back where it was in the list
* Revert "Put the file back where it was in the list"
This reverts commit 6a80c15b5b5efe5ff39812a018114e8bdc1dc0cf.
2017-04-07 15:04:50 -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
7617b9a9f3
Merge commit 'e6ee24debcae89bd0066061b42ad1a6a73da9486'
...
# Conflicts:
# Source/ASDisplayNode.mm
# Source/ASImageNode.mm
# Source/Details/ASCollectionViewLayoutController.mm
2017-03-15 13:31:39 +03: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
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
