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 |
|
Huy Nguyen
|
ed9a3cc2e0
|
[ASDataController] Apply new visible map inside batch updates block (#420)
* ASDataController to apply new visible map inside batch updates block
* Update CHANGELOG
* Sorry, put up a PR that doesn't even build LOL
|
2017-07-05 19:04:17 +00: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 |
|
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
|
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 |
|
Adlai Holler
|
18dc91ccc2
|
Remove ASRangeController's viewport API (#3122)
|
2017-03-02 08:38:01 +00: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 |
|