Peter
26fd19a7c0
Merge branch 'master' of https://github.com/TextureGroup/Texture
...
# Conflicts:
# Source/ASDisplayNode.h
# Source/ASDisplayNode.mm
# Source/ASDisplayNodeExtras.h
# Source/ASImageNode.h
# Source/Private/ASBatchFetching.h
2018-07-21 21:13:16 +03:00
Max Wang
9214e3c2ef
Renew supplementary node on relayout ( #842 )
...
* fix SIMULATE_WEB_RESPONSE not imported #449
* Fix to make rangeMode update in right time
* Renew supplementary node on relayout.
* Add support for layoutDelegate (ASCollectionLayout).
* revert space
* Update change log
* fix build error
* refactor
* set default size
* return early when can delegate
2018-06-04 10:29:41 -07:00
Peter
34b6e37b8c
Merge commit '131619de96190415aec89987d4493220c6d0305d'
...
# Conflicts:
# Source/ASDisplayNode+Deprecated.h
# Source/ASDisplayNode.mm
# Source/ASDisplayNodeExtras.h
# Source/ASImageNode+AnimatedImage.mm
# Source/Private/ASSection.h
# Source/Private/_ASHierarchyChangeSet.mm
2017-12-25 01:44:19 +04:00
Adlai Holler
4fc753a458
Make it possible to map between sections even if they're empty ( #660 )
...
* Make section mapping work even for empty sections
* Unlock more cases and update changelog
* Fix complexity documentation
2017-11-03 16:24:48 -07:00
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
fcb293e049
Fix issue where supplementary elements don't track section changes ( #404 )
...
* Fix collection view supplementary issue
* Add a fast-path
* Remove the old index path entry unconditionally
* Handle overwriting bug
2017-07-01 10:55:59 -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
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
Peter
429faedb45
no message
2017-03-01 18:33:48 +04:00
Adlai Holler
25bc97c5c8
Fix Issues Repopulating Supplementary Elements ( #3098 )
...
* Fix issues repopulating supplementary elements
* Remove unrelated change
* Update comments
2017-02-27 16:06:06 -08:00
Adlai Holler
73ca6ab514
Shuffle & Cleanup Stuff ( #3080 )
2017-02-26 18:14:13 -08:00