Commit Graph

25012 Commits

Author SHA1 Message Date
Peter
f5e632ce9b Merge commit '016d99f420dc6a8a237b4f8b794cb3cb00939ce1' into debug-drawrect 2016-12-12 01:17:14 +03:00
Peter
d6cc31eaff Merge commit '4355f4d2eef9472642a8a8029aeef1c7fdad034f' into debug-drawrect 2016-12-12 01:10:39 +03:00
Peter
a2ca258b6b Merge commit 'aec8dbfb33832cafdd183f5818ddb01c8b1c3997' into debug-drawrect 2016-12-12 01:07:18 +03:00
Peter
bef812c50b no message 2016-12-12 01:02:45 +03:00
Peter
3121ecf636 Merge commit 'd9209e69c25657586b43a72def4c5ac537956e40' into debug-drawrect
# Conflicts:
#	AsyncDisplayKit/ASCollectionNode.mm
#	AsyncDisplayKit/ASDisplayNode.mm
#	AsyncDisplayKit/ASTableNode.mm
#	AsyncDisplayKit/Details/ASCollectionViewFlowLayoutInspector.h
#	AsyncDisplayKit/Details/ASCollectionViewLayoutInspector.h
#	AsyncDisplayKit/Details/ASCollectionViewLayoutInspector.m
2016-12-12 01:02:23 +03:00
Peter
7bf7235e0c no message 2016-12-11 22:59:02 +03:00
Benjamin Scholtysik (Reimold)
23410a11ac Merge pull request #100 from bitstadium/master
Master
2016-12-09 15:27:03 -08:00
Garrett Moon
b8be6076a8 Remove build status for now since we're using Jenkins and we can't publicise results because of network restrictions. (#2745) 2016-12-09 14:02:56 -08:00
Hannah Trosi
a64253cf38 [Examples] move failing Shop example to extra folder until config is fixed 2016-12-09 13:52:25 -08:00
Peter
72cbe5da9e No message 2016-12-09 23:17:21 +03:00
Peter
51c51b1992 No message 2016-12-09 23:17:21 +03:00
Garrett Moon
2e1d6c122e Update to 2.0 (#2735) 2016-12-08 15:35:55 -08:00
Benjamin Scholtysik (Reimold)
191d532b37 Merge pull request #375 from bitstadium/master
Master
2016-12-08 14:41:37 -08:00
StrauneanuDimitri
3d1ff675c5 [Examples] Added Bear Shop project (#2614)
* [Examples] Added Bear Shop project

* - added screenshots
2016-12-08 09:57:07 -08:00
Adlai Holler
5b80a641af Improve Handling of Rasterized Node Interface & Hierarchy States (#2731)
* Improve handling of rasterize node interface states and testing

* Fix harder

* Finish fixes and move rasterization flag into beta header

* Re-enable rasterization in ASDKgram

* Re-enable working test

* Only do it in debug
2016-12-08 09:52:21 -08:00
Huy Nguyen
016d99f420 Document default values of alignItems and justifyContent (#2733) 2016-12-08 07:53:05 -08:00
Brandon Withrow
d442ae859d Fix project Setting 2016-12-07 15:35:19 -08:00
Brandon Withrow
b245983bd1 Merge pull request #3 from brandon-withrow/btw/lottie/animationstate
Btw/lottie/animationstate
2016-12-07 15:34:14 -08:00
Brandon Withrow
e4fd35fe84 Updated LAAnimationView with new Animation State
- Added animation state machine
- Fixes bugs with play/pause
- Fully Supported completion blocks
2016-12-07 15:32:49 -08:00
Michael Schneider
4355f4d2ee [Layout] Don't crash if layout elements are created in layoutSpecThatFits: (#2694)
* Fix crash if layout elements are created with no owner and referenced in layoutSpecThatFits:

* Add failing test for nodes deallocated while creating in layoutSpecThatFits:

* Some more

* Some cleanup

* Added more complexity to tests

* Only cache sublayouts if the layout get’s flattened

* Address comments

* Address comments
2016-12-07 14:58:34 -08:00
Garrett Moon
80ab695cd0 Add lint mode to build.sh (#2728) 2016-12-07 14:38:12 -08:00
Adlai Holler
7de2decdcb Allow section-indexpaths in collection & table validation (#2727) 2016-12-07 13:36:15 -08:00
Michael Schneider
a6b2166244 Don’t compare the hash instead compare the attributes in ASTextNodeRendererKey isEqual (#2726) 2016-12-07 09:57:48 -08:00
Michael Schneider
beb98b448e [ASTextKit] Remove internal side effects related to constrainedSize. 2016-12-06 19:53:58 -08:00
Michael Schneider
c3cbd3b583 Just call super to change the size of the cell node that will resize itself instead of setting the frame directly (#2725) 2016-12-06 15:53:09 -08:00
Adlai Holler
5b8330107f Merge pull request #2708 from maicki/MSPreventSettingImageSpecificImageNodeSubclasses
[ASImageNode] Add handling of setting .image in specific ASImageNode subclasses
2016-12-06 15:23:13 -08:00
Garrett Moon
54eba883d8 Update to RC 2 (#2723) 2016-12-06 15:11:00 -08:00
Michael Schneider
ee0cc9b103 Further logic and documentation improvements 2016-12-06 14:19:54 -08:00
Benjamin Scholtysik (Reimold)
93551df117 Merge pull request #374 from bitstadium/release/4.1.3
Release/4.1.3
2016-12-06 13:05:40 -08:00
Michael Schneider
aec8dbfb33 Fix ASDKGram deprecation warning (#2719) 2016-12-06 11:52:31 -08:00
Garrett Moon
d57760797a Update to beta 7 of PINRemoteImage - fixes image corruption issues. (#2720) 2016-12-06 11:11:00 -08:00
Andrey Konstantinov
52eb9df366 Fix typo in README (#2718) 2016-12-06 11:05:23 -08:00
Benjamin Scholtysik (Reimold)
69e1374f1d Merge pull request #369 from bitstadium/feature/persian-localization
Add persian language file
2016-12-06 09:45:04 -08:00
Michael Schneider
cacc366706 Some video node improvements 2016-12-06 06:55:47 -08:00
Peter
d093d7fa3f no message 2016-12-06 12:12:43 +03:00
Peter
bed02f5c56 no message 2016-12-06 12:12:28 +03:00
Michael Schneider
ef84e99673 Tremendously make the implementation easier 2016-12-05 20:15:23 -08:00
Michael Schneider
018ad148bc Further work 2016-12-05 16:50:58 -08:00
Michael Schneider
d57e33b2f0 Some further improvements 2016-12-05 16:43:46 -08:00
Michael Schneider
9fefd4a5b0 Cleanup ASVideoNode a bit 2016-12-05 16:43:46 -08:00
Michael Schneider
70b647c2b9 Add support for setting a static image to ASNetworkImageNode 2016-12-05 16:43:46 -08:00
Michael Schneider
143abdaa96 Change Header of ASImageNode+Private 2016-12-05 16:43:46 -08:00
Michael Schneider
9adb6554fc Add assertion against externally setting .image in specific ASImageNode subclasses 2016-12-05 16:43:46 -08:00
Adlai Holler
45c69ada36 Add some index path validation to avoid production crashes (#2716) 2016-12-05 16:37:44 -08:00
Adlai Holler
42c7bb291e Merge pull request #2715 from facebook/AHMoreBatchFetching
Ensure Batch Fetching Includes Leading Screens, Even if Not Scrolling
2016-12-05 16:27:01 -08:00
Adlai Holler
20c66f1025 Beef up the tests 2016-12-05 15:37:49 -08:00
Adlai Holler
9bc58dc024 When not visible, only batch fetch to fill visible area 2016-12-05 15:00:39 -08:00
Adlai Holler
21cad90355 Ensure we always fill leading screens for batching 2016-12-05 14:51:07 -08:00
Benjamin Scholtysik (Reimold)
05768216a2 Merge remote-tracking branch 'Public/release/4.1.3' into feature/persian-localization 2016-12-05 13:14:45 -08:00
Benjamin Scholtysik (Reimold)
0e2f4701ce Merge branch 'fix/check-if-strongSelf-is-not-null' into release/4.1.3 2016-12-05 13:11:49 -08:00