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
|
a9837f2dc8
|
Replace NSMutableSet with NSHashTable when Appropriate #trivial (#321)
* Use NSHashTable to avoid needless -hash and -isEqual: calls
* Mark debug-only methods as such for clarity
* Address feedback
|
2017-06-05 16:33:37 -07:00 |
|
Adlai Holler
|
588f30c7dd
|
Move Last Few Properties from ASTableView,ASCollectionView to Node (#225)
* Finish moving properties ASTableView->ASTableNode, ASCollectionView->ASCollectionNode
* Update changeling
|
2017-05-04 13:41:58 +01: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
|
fc588c5e39
|
Avoid adding nil element which represents an unsupported decoration view (#3215)
|
2017-03-23 15:53:13 -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
|
d59ea3902d
|
Initial Work for Range Controller to Support Supplementary Elements (#3140)
* Initial work supporting supplementaries in range controller
* Rename indexPathForElementIfItem
|
2017-03-06 10:11:00 -08:00 |
|