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
d00ed249e5
Introduce ASIntegerMap, improve our changeset handling #trivial ( #405 )
...
* Introduce ASIntegerMap, improve our changeset handling
Rename to ASIntegerMap
License header
* Add unit tests for ASIntegerMap
* Address nit
2017-07-05 13:29:02 -07: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
Adlai Holler
6b3f8f8ad7
Add support for keeping letting cell nodes update to new view models when reloaded. #trivial ( #357 )
...
* Add support for skipping reload if node decides it is compatible with new view model also
* Sort things right
* Put the order back
* No need for redundant expectation
* Fix license header
* Fix comment
2017-06-13 10:10: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
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
6abccf5841
ASDataController can bail early if a change set is empty ( #3225 )
2017-03-31 10:48:11 -07: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
