Commit Graph

25012 Commits

Author SHA1 Message Date
Brandon Withrow
fd6e34f4ba Merge pull request #19 from asowers1/Carthage-README
Carthage instructions in README
2017-02-03 07:58:06 -08:00
Brandon Withrow
20c2faca29 Merge pull request #20 from SoXeon/master
fix crash in Demo for Animated Keyboard
2017-02-03 07:57:17 -08:00
dazi.dp
cef8eb10d7 fix crash in Demo for Animated Keyboard
fix crash in Demo for Animated Keyboard
2017-02-03 14:26:54 +08:00
Andrew Sowers
d8068c3756 Carthage instructions in README 2017-02-02 22:31:40 -05:00
Brandon Withrow
a2a62cc154 Merge pull request #11 from hansemannn/resolve-warnings
Fix all project warnings, specify nullability
2017-02-02 15:52:14 -08:00
Brandon Withrow
2ca94d6d3c Merge pull request #18 from airbnb/btw/3drotationcrash
Fix crash for 3d rotation values
2017-02-02 14:54:55 -08:00
Brandon Withrow
6b365d7227 Fix crash for 3d rotation values 2017-02-02 14:50:57 -08:00
Adlai Holler
bf2363cb8f [ASDKgram] Perform batch-fetching updates on main (#2972) 2017-02-02 14:03:40 -08:00
Michael Schneider
d42dcfefc1 [ASNodeController] Move ASNodeController to beta header (#2966)
* Move ASNodeController to beta header

* Make it public

* Change ASNodeController+Beta to .mm
2017-02-02 12:51:33 -08:00
Brandon Withrow
69094298e2 Merge pull request #12 from federicocappelli/patch-2
Update README.md
2017-02-02 11:42:50 -08:00
Grishka
2027dabd60 Initial public release 2017-02-02 19:24:40 +03:00
Peter
c8055aa8cd Merge branch 'tmp' 2017-02-02 18:59:42 +03:00
Peter
c8ec89bae0 no message 2017-02-02 18:59:18 +03:00
Peter
746821b41a Merge branch 'master' into HEAD 2017-02-02 18:58:17 +03:00
Peter
dbba320020 no message 2017-02-02 18:58:11 +03:00
Federico Cappelli
a8df13ac02 Update README.md
- "Install Lottie" section added to the readme, I've failed initially trying to add pod 'lottie' to my podfile 
- Swift bridge header import instructions removed, not necessaire using cocoapod (just tested)
2017-02-02 13:30:04 +00:00
Hans Knöchel
5159b2ce38 Fix all project warnings, specify nullability 2017-02-02 13:19:26 +01:00
Peter
15c9274a8e no message 2017-02-02 11:47:45 +03:00
Peter
e1195986b9 no message 2017-02-02 11:47:26 +03:00
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
Alex Pawlowski
2a3a574b28 Merge remote-tracking branch 'upstream/master' 2017-02-02 03:47:49 +02:00
Alex Pawlowski
059517d351 Implemented macOS Support 2017-02-02 03:45:10 +02:00
Brandon Withrow
a241b9e57a Merge pull request #9 from natestedman/carthage
Added shared scheme for Carthage support
2017-02-01 16:01:05 -08:00
Peter
f666792f97 no message 2017-02-02 02:59:08 +03:00
Nate Stedman
9c8d7731c7 Added shared scheme for Carthage support. 2017-02-01 18:54:09 -05:00
Brandon Withrow
c4bf8d5015 Merge pull request #8 from hansemannn/patch-1
Fix README.md
2017-02-01 15:22:49 -08:00
Brandon Withrow
31cea7107c Merge pull request #7 from plummer/patch-2
Fixed Typo
2017-02-01 15:22:28 -08:00
Hans Knöchel
7e42d0c662 Fix README.md 2017-02-02 00:20:11 +01:00
plummer
53c1f5ef0b Fixed Typo 2017-02-02 09:52:14 +11: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
Brandon Withrow
5635d1c5d7 Update README.md 2017-02-01 14:38:41 -08:00
Brandon Withrow
97bcd859a2 Update README.md 2017-02-01 14:02:08 -08:00
Garrett Moon
0be685982b Merge pull request #2967 from facebook/bumpTo2dot1
Bump podspec to 2.1
2017-02-01 13:42:26 -08:00
ricky
39298f6694 [ASIndexedNodeContext] Do not cache the envTraitCollection, use the delegate to request it when needed (#2963)
Caching the envTraitCollection upon creation of `ASIndexedNodeContext` can lead to it becoming out of date. Ask the `id<ASEnvironment>` object for the trait collection when we need it.
2017-02-01 13:38:52 -08:00
Garrett Moon
c396e4db68 Bump podspec to 2.1 2017-02-01 13:30:43 -08:00
Brandon Withrow
8142974183 Merge pull request #3 from jongold/patch-1
Add syntax highlighting to README
2017-02-01 11:07:09 -08:00
Jon Gold
4c9e048464 Add syntax highlighting to README 2017-02-01 10:56:45 -08:00
Brandon Withrow
950809f538 Merge pull request #1 from ReadmeCritic/patch-1
[readme] fix typo
2017-02-01 10:44:25 -08:00
Brandon Withrow
bd3196e11c Merge pull request #2 from mukeshthawani/fix-typo
Fix typo
2017-02-01 10:44:10 -08:00
Mukesh Thawani
acfee53f53 Fix typo 2017-02-01 14:50:11 +05:30
ReadmeCritic
4eabb06eaa [readme] fix typo 2017-01-31 19:22:33 -08:00
Adlai Holler
d7670780b2 Fix Deleting Sections Issue (#2962)
* Add data source to main project

* Remove the idea of deletingSectionsOfKind – always delete all kinds

* Move comment into assertion
2017-01-31 15:39:10 -08:00
Hannah Troisi
7f7f28385d [ASNodeController] First implementation of node controller class (#2945)
* [ASNodeController] initial commit for node controller class

* create <ASInterfaceState> protocol, -[ASDisplayNode interfaceDelegate], and use these to forward to ASNodeController

* rename ASInterfaceStateDelegate, fix setting in it ASNodeController.mm
2017-01-31 14:27:02 -08:00
Brandon Withrow
17d9808b55 Update README.md 2017-01-31 13:22:03 -08:00
Huy Nguyen
b3663476e6 Disable background deallocation on iOS 8 and below (#2954)
- The crash mainly occurs on these old iOS versions (~93%) and p6.16.1. There might be a client code issue that causes this crash, but it's hard to tell if it also crashes on newer iOS versions AND p6.17.
- Let's disable this feature for now and re-investigate if it resurfaces on p6.19 and iOS 9/10.
2017-01-31 08:15:28 -08:00
Peter
51c4d15c9f no message 2017-01-31 18:08:16 +03:00
Peter
eaa061add0 no message 2017-01-31 18:07:58 +03:00
Peter
bf311fed75 no message 2017-01-31 15:14:48 +03:00
Peter
9f89633d03 no message 2017-01-31 15:14:32 +03:00
Peter
d0a9b00844 no message 2017-01-31 14:43:11 +03:00