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
d30c35787c
Fix Alignment of Hashed Structs ( #287 )
...
* Fix alignment of ASImageNodeContentsKey struct to fix hashing
* Change the change log by logging a change
* Add the world's stupidest explicit cast
* Actually its simpler
2017-05-17 18:08:50 -07:00
Michael Schneider
3738f1f6e2
[ASImageNode] Move to class method of displayWithParameters:isCancelled: for drawing ( #244 )
...
* Remove instance displayWithParameters:isCancelled:
* Address comments
2017-05-09 13:03:30 -07:00
Michael Schneider
8692428481
[ASDisplayNode] Pass drawParameter in rendering context callbacks ( #248 )
...
* Pass drawParameter in rendering context callbacks
* Add changelog
* Fix examples
2017-05-08 14:39:40 -07:00
Michael Schneider
17d956493a
[ASImageNode] Move debug label and will- / didDisplayNodeContentWithRenderingContext out of drawing method #trivial ( #235 )
...
* Move configuring the debug label from the drawing method in displayDidFinish
* Move will- and didDisplayNodeContentWithRenderingContext in drawing parameters
2017-05-04 16:56:26 -07:00
Michael Schneider
25da46c8ac
Remove unneeded pointer star ( #231 )
2017-05-04 13:41:35 +01:00
Adlai Holler
456dc8535d
Simplify Hashing Code ( #86 )
...
* Simplify hashing
* Update chingling
* Update license
2017-04-29 15:23:00 -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
Huy Nguyen
5ef1d2b541
Improve hash functions of image and text nodes ( #3265 )
...
* Improve hash functions of image and text nodes
* Move ASEqualityHashHelpers to Private/
2017-04-13 16:13:21 -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
7617b9a9f3
Merge commit 'e6ee24debcae89bd0066061b42ad1a6a73da9486'
...
# Conflicts:
# Source/ASDisplayNode.mm
# Source/ASImageNode.mm
# Source/Details/ASCollectionViewLayoutController.mm
2017-03-15 13:31:39 +03:00
Michael Schneider
0540c863ca
Improve locking situation in ASDisplayNode subclasses ( #3159 )
...
* Improve locking situation in ASDisplayNode subclasses
* Adress first number of comments
* Don’t hold the lock while calling _updateComposedTruncationText
2017-03-10 17:29:09 +00:00
Peter
bb8cf51d7a
no message
2017-03-06 02:08:37 +03: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
