Peter
|
e7b34f5811
|
Merge commit '404795dc02aa57b167223bfaee7c380907022ca1'
# Conflicts:
# AsyncDisplayKit.xcodeproj/project.pbxproj
# AsyncDisplayKit/ASCellNode+Internal.h
# AsyncDisplayKit/ASCellNode.mm
# AsyncDisplayKit/ASCollectionNode+Beta.h
# AsyncDisplayKit/ASCollectionNode.mm
# AsyncDisplayKit/ASCollectionView.mm
# AsyncDisplayKit/ASCollectionViewProtocols.h
# AsyncDisplayKit/ASDisplayNode.mm
# AsyncDisplayKit/ASMultiplexImageNode.h
# AsyncDisplayKit/ASMultiplexImageNode.mm
# AsyncDisplayKit/ASNavigationController.m
# AsyncDisplayKit/ASNetworkImageNode.mm
# AsyncDisplayKit/ASPagerFlowLayout.m
# AsyncDisplayKit/ASPagerNode.m
# AsyncDisplayKit/ASTabBarController.m
# AsyncDisplayKit/ASTableNode.h
# AsyncDisplayKit/ASTableNode.mm
# AsyncDisplayKit/ASTableView.mm
# AsyncDisplayKit/ASTableViewProtocols.h
# AsyncDisplayKit/ASVideoNode.h
# AsyncDisplayKit/ASVideoNode.mm
# AsyncDisplayKit/ASVideoPlayerNode.mm
# AsyncDisplayKit/ASViewController.mm
# AsyncDisplayKit/Debug/ASLayoutElementInspectorCell.m
# AsyncDisplayKit/Debug/ASLayoutElementInspectorNode.m
# AsyncDisplayKit/Details/ASBasicImageDownloader.mm
# AsyncDisplayKit/Details/ASBatchContext.mm
# AsyncDisplayKit/Details/ASChangeSetDataController.h
# AsyncDisplayKit/Details/ASChangeSetDataController.mm
# AsyncDisplayKit/Details/ASCollectionDataController.mm
# AsyncDisplayKit/Details/ASCollectionViewLayoutController.mm
# AsyncDisplayKit/Details/ASCollectionViewLayoutInspector.m
# AsyncDisplayKit/Details/ASDataController.mm
# AsyncDisplayKit/Details/ASFlowLayoutController.h
# AsyncDisplayKit/Details/ASFlowLayoutController.mm
# AsyncDisplayKit/Details/ASIndexedNodeContext.mm
# AsyncDisplayKit/Details/ASPhotosFrameworkImageRequest.h
# AsyncDisplayKit/Details/ASPhotosFrameworkImageRequest.m
# AsyncDisplayKit/Details/ASRangeController.mm
# AsyncDisplayKit/Details/ASRangeControllerUpdateRangeProtocol+Beta.h
# AsyncDisplayKit/Details/ASSectionContext.h
# AsyncDisplayKit/Private/ASBatchFetching.m
# AsyncDisplayKit/Private/ASCollectionView+Undeprecated.h
# AsyncDisplayKit/Private/ASCollectionViewFlowLayoutInspector.h
# AsyncDisplayKit/Private/ASCollectionViewFlowLayoutInspector.m
# AsyncDisplayKit/Private/ASDisplayNode+UIViewBridge.mm
# AsyncDisplayKit/Private/_ASPendingState.mm
# examples/SocialAppLayout-Inverted/Sample.xcodeproj/xcshareddata/xcschemes/Sample.xcscheme
|
2017-02-02 11:46:47 +03:00 |
|
Adlai Holler
|
404795dc02
|
Remove Support for iOS 7 (#2930)
* Drop support for iOS 7
* Copy reference images
* Update deployment for sample projects
* Update version
* Update "Life Without Cocoapods"
|
2017-02-01 14:40:37 -08:00 |
|
Peter
|
7bf7235e0c
|
no message
|
2016-12-11 22:59:02 +03:00 |
|
Hannah Troisi
|
c857e809f4
|
Clean up header comments (for consistent Facebook licensing info) (#1741)
[Licensing] Clean up header comments (for consistent Facebook licensing info)
|
2016-06-11 23:31:39 -07:00 |
|
Michael Schneider
|
389fd4b15d
|
Further improvements for ASPagerNode rotation
|
2016-06-09 20:11:21 -07:00 |
|
Michael Schneider
|
3e8ea64a1b
|
Update to latest state
|
2016-06-09 15:46:08 -07:00 |
|
Michael Schneider
|
1c6686e5d6
|
Improve rotation support for ASPagerNode
|
2016-06-09 15:46:08 -07:00 |
|
Levi McCallum
|
c07175bfcb
|
Fix conditional
|
2016-03-25 11:54:56 -07:00 |
|
Levi McCallum
|
687be58621
|
Fix PagerNode from not loading
|
2016-03-25 10:02:47 -07:00 |
|
Levi McCallum
|
f51ca78570
|
Simplify boolean logic
|
2016-03-24 21:40:49 -07:00 |
|
Levi McCallum
|
d845a18dfb
|
Prevent calculation of current index path when the collection view is empty
|
2016-03-24 21:33:01 -07:00 |
|
Levi McCallum
|
f760c8460a
|
Nil out currentIndexPath after usage to prevent ASPagerFlowLayout crashes
|
2016-03-23 17:55:25 -07:00 |
|
Levi McCallum
|
66c8c8f47d
|
Add rotation support to ASPagerNode
|
2016-02-12 13:45:22 -08:00 |
|