Commit Graph

  • 73ce8c148a Add comment for setting the backgroundColor in ASImageNode Michael Schneider 2016-05-26 10:01:12 -07:00
  • 4f40f3c12f Merge remote-tracking branch 'facebook/master' into ASVideoPlayerNode Erekle 2016-05-26 12:15:23 +04:00
  • 096f20c8d5 update sample app ricky 2016-05-25 13:34:43 -07:00
  • bebc4c604c remove _child from ASLayoutSpec.mm. Store all children in the children array. ricky 2016-05-25 13:30:35 -07:00
  • c42b0dd33a Remove explicit passing of trait collection to setChild/Children ricky 2016-05-25 10:49:42 -07:00
  • e3e9d36f56 Fix image sometimes appearing with black background or completely disappearing in ASImageNode Michael Schneider 2016-05-25 10:07:34 -07:00
  • bde4fe7e24 remove exclusive => true due to 1.0.0 changes (#1695) Nick Velloff 2016-05-25 07:34:07 -07:00
  • 95f1ab4902 [ASDisplayNode] Rename ASDisplayNodeTransitionContext to ASLayoutTransition (#1680) Levi McCallum 2016-05-24 20:10:27 -07:00
  • a33966d4ae Actually propagate the traits down on layout spec ricky 2016-05-24 11:15:41 -07:00
  • d0c30a43ca expose relayoutAllNodes at ASCollectionView level (#1683) Nick Velloff 2016-05-23 23:22:01 -07:00
  • 59a26ee111 [ASTraitCollection] Bug fixing/LayoutSpec propagation ricky 2016-05-23 16:37:40 -07:00
  • 4ab0f1ec60 [ASVideoPlayerNode] fixes; Ability to add custom controls Erekle 2016-05-23 23:23:33 +04:00
  • 03f193c58b Merge remote-tracking branch 'facebook/master' into ASVideoPlayerNode Erekle 2016-05-22 13:49:36 +04:00
  • 94bb3b79cb May as well use the existing visibility function. (#1684) Garrett Moon 2016-05-21 23:12:29 -07:00
  • e8a49b57bc Change ASTableView's visibleNodes interface to return array of ASCellNodes (#1666) Rocir Santiago 2016-05-21 23:10:12 -07:00
  • 4ac2d52a06 Allow nil borderColor when using ASImageNodeRoundBorderModificationBlock (#1686) Eric 2016-05-21 05:12:40 +02:00
  • d3c33a38bb Add missing nullability annotations to headers related to display node transitions (#1688) Eric Jensen 2016-05-20 20:10:07 -07:00
  • 49b2726632 fixed old examples Erekle 2016-05-20 12:21:57 +04:00
  • 94b88ad1ab Removed DevelopmentTeam setting in sample (#1682) Jonas Schmid 2016-05-19 22:20:37 +02:00
  • 100d2b4f26 moved spinner to ASVIdeoPlayerNode Erekle 2016-05-19 15:07:39 +04:00
  • 3d5385dad3 replaced deprecated methods Erekle 2016-05-19 13:40:09 +04:00
  • 053b14992c Merge remote-tracking branch 'facebook/master' into ASVideoPlayerNode Erekle 2016-05-19 11:57:16 +04:00
  • 4036904869 Merge pull request #1676 from Xinchi/patch-3 appleguy 2016-05-18 22:16:34 -07:00
  • 73b41ee450 Renaming the delegate flags for the deprecated methods Max Gu 2016-05-18 22:10:06 -07:00
  • 1c64a4a785 Surpressing deprecated methods warning Max Gu 2016-05-18 16:39:45 -07:00
  • 90877847c2 Adding deprecated methods back Max Gu 2016-05-18 14:05:08 -07:00
  • a93bc72e25 Updating and adding a few APIs for ASVideoNode Max Gu 2016-05-18 08:40:58 -07:00
  • 772cf15b83 Merge branch 'master' into patch-3 Max Gu 2016-05-18 08:37:24 -07:00
  • b91f1f8336 Merge remote-tracking branch 'upstream/master' Max Gu 2016-05-18 08:37:11 -07:00
  • 325e37020c Adding startup loading state in ASVideoNode Max Gu 2016-05-17 15:31:30 -07:00
  • 39e287f0d6 fixes suggested by levi Erekle 2016-05-18 00:45:40 +04:00
  • d9b84db614 Merge remote-tracking branch 'facebook/master' into ASVideoPlayerNode Erekle 2016-05-17 23:34:20 +04:00
  • 74584e2f8e Merge branch 'ASVideoPlayerNode' of https://github.com/Eke/AsyncDisplayKit into ASVideoPlayerNode Max Gu 2016-05-17 11:10:22 -07:00
  • 8c8fc3dba0 Adding ASVideoPlayerNode Erekle 2016-05-14 16:41:32 +04:00
  • 9c5b2fcb18 [Cocoapods] Update podspec to version 1.9.74. 1.9.74 Scott Goodson 2016-05-17 11:01:09 -07:00
  • d26b489529 [Examples] Move several simpler, single-purpose examples to extras to ensure Travis does not time out. Scott Goodson 2016-05-17 10:52:43 -07:00
  • a5d1e04b3c Merge pull request #1672 from rcancro/traitCrash appleguy 2016-05-16 20:23:02 -07:00
  • 97f95e6799 Fix category name collision (Travis error). Hannah Troisi 2016-05-16 17:35:41 -07:00
  • 14bbfe6f38 [ASAvailability.h] Add kCFCoreFoundationVersionNumber_iOS_9_0 define ricky 2016-05-16 17:05:17 -07:00
  • a330f0e480 Merge pull request #1670 from garrettmoon/undoRevertOfTraitCollection appleguy 2016-05-16 17:00:45 -07:00
  • 8d4959bd76 Revert "ASViewController.m -> ASViewController.mm upstream" Garrett Moon 2016-05-16 14:56:41 -07:00
  • d9e1e7cc0a example Erekle 2016-05-17 01:26:40 +04:00
  • c144ef28e0 updated control node docs Luke Parham 2016-05-16 15:39:01 -05:00
  • 7872d85ab0 tap proxy Erekle 2016-05-17 00:01:14 +04:00
  • e1544f0f59 minor fixes. ensure size in layoutSpecThatFits: Erekle 2016-05-16 11:33:46 +04:00
  • 37d4c5e475 Fixing a bug in both debug tools (image scaling, tappable area) in which I don't check that the overlay exists before creating it. Hannah Troisi 2016-05-15 23:28:39 -07:00
  • a18ffc64ab [AsyncDisplayKit+Debug.h] Moving hitTestDebug tool code out of ASControlNode and into debug file - unifying ASControlNode, ASImageNode debugging categories into debug file to simplify base classes Hannah Troisi 2016-05-15 23:18:46 -07:00
  • d552103375 added docs for control node, cell node, text cell node, and tweaked styling of code blocks Luke Parham 2016-05-16 01:05:34 -05:00
  • ae29cd2721 Merge remote-tracking branch 'facebook/master' Hannah Troisi 2016-05-15 20:58:16 -07:00
  • f30bf32a47 minor fixis Erekle 2016-05-14 17:01:06 +04:00
  • e30584d215 ASDefaultPlaybackButton Erekle 2016-05-14 16:41:32 +04:00
  • b3360a5daf Merge remote-tracking branch 'facebook/master' into ASVideoPlayerNode Erekle 2016-05-14 12:26:01 +04:00
  • 4cfe3f750a Merge pull request #1661 from maicki/MatchSubarrayContextsNodesCreation appleguy 2016-05-13 23:47:41 -07:00
  • 50bdaa2442 Merge pull request #1658 from henish/ascollectionview_mutation_during_enumeration appleguy 2016-05-13 16:21:46 -07:00
  • 9eb9336351 Merge remote-tracking branch 'upstream/master' Max Gu 2016-05-13 14:42:04 -07:00
  • eee2262262 Match creation of subarrays for nodes and contexts in ASDataController Michael Schneider 2016-05-13 22:51:40 +02:00
  • 41a53887d7 [Sample] Resolve mutation during enumeration issue Henish Shah 2016-05-13 11:51:01 -04:00
  • 60b71a604c Merge pull request #1660 from maicki/FixWrongConstrainedSize appleguy 2016-05-13 13:06:29 -07:00
  • 33b76bbce0 Use calloc’d array for subarray of contexts Michael Schneider 2016-05-13 21:38:25 +02:00
  • 7d902d98c9 Fix passing wrong constrained size to nodes Michael Schneider 2016-05-13 21:02:11 +02:00
  • 8e38e225c8 [Sample] Resolve mutation during enumeration issue Henish Shah 2016-05-13 11:51:01 -04:00
  • 3e45f41710 ASVideoNode property proxy Erekle 2016-05-13 18:43:24 +04:00
  • 0bef0d09e7 Merge pull request #1653 from garrettmoon/visibility appleguy 2016-05-12 22:42:27 -07:00
  • c8a759e3f4 Merge remote-tracking branch 'upstream/master' Max Gu 2016-05-12 16:03:36 -07:00
  • 88efa56097 Revert "Adding scrollViewWillBeginDragging and scrollViewDidEndDragging callbac to ASCellNode instances" Max Gu 2016-05-12 16:02:38 -07:00
  • 5805bdb239 Merge Max Gu 2016-05-12 15:53:09 -07:00
  • 658d376d7b ASVideoNode public methods proxy Erekle 2016-05-13 02:14:12 +04:00
  • 38b07612d9 Merge pull request #1655 from rcancro/lockFix appleguy 2016-05-12 15:09:29 -07:00
  • db95771b33 enable/disable controls Erekle 2016-05-13 01:49:46 +04:00
  • 72d7b57abb Don't add zero for readability Garrett Moon 2016-05-12 14:44:54 -07:00
  • 7901a985e3 Now that this is included by a C++ file, it needs the weird C extern thing. Garrett Moon 2016-05-12 14:21:01 -07:00
  • 98c451118b removed play button Erekle 2016-05-13 00:46:55 +04:00
  • 4c78fb3846 Add setVisibilityDepth setter. Garrett Moon 2016-05-12 10:53:20 -07:00
  • 5a9ef8a6f7 Fix build Garrett Moon 2016-05-11 17:29:09 -07:00
  • e296cad8ee Add support for visibility depth Garrett Moon 2016-05-11 16:55:10 -07:00
  • b7b8ad54fd Move common implementations to macros Garrett Moon 2016-05-11 16:54:38 -07:00
  • af7a2f09d7 Add support for visibility depth Garrett Moon 2016-05-09 13:48:22 -07:00
  • b34e8d78de ASViewController.m -> ASViewController.mm upstream Garrett Moon 2016-05-12 13:16:39 -07:00
  • 8e444092be [ASEnvironment] Remove unneeded locking on environmentState rcancro 2016-05-12 13:13:30 -07:00
  • ae5440ad11 updated example Erekle 2016-05-12 13:26:39 +04:00
  • d0345549f6 Merge remote-tracking branch 'facebook/master' into ASVideoPlayerNode Erekle 2016-05-12 13:05:24 +04:00
  • e0074524c3 new ASVideoPlayerNodeDelegate methods. comments in header Erekle 2016-05-12 12:59:32 +04:00
  • efc81f5a1c Merge pull request #1592 from rcancro/displayTraits appleguy 2016-05-11 21:19:55 -07:00
  • 9aba0fb19d Merge pull request #1652 from maicki/FixASVideoNodeSpinnerPosition appleguy 2016-05-11 14:46:41 -07:00
  • 441f9632cd ASVideoPlayer layout delegation Erekle 2016-05-12 01:29:54 +04:00
  • cfa9dcda56 typo and comment rcancro 2016-05-11 14:08:06 -07:00
  • 58101feeee event better duration handling. time label attributes delegation Erekle 2016-05-11 23:22:17 +04:00
  • 94a9291b1c Merge pull request #1646 from levi/patch-14 appleguy 2016-05-11 12:06:20 -07:00
  • 1ac3579141 Merge pull request #1647 from levi/patch-15 appleguy 2016-05-11 12:06:02 -07:00
  • 9b3ecd28a9 Fix position of loading spinner in ASVideoNode Michael Schneider 2016-05-11 20:14:22 +02:00
  • 9fe57ea583 ASVideoPlayerDelegate first steps Erekle 2016-05-11 21:55:53 +04:00
  • 11446f3bf5 Add auto inviter Levi McCallum 2016-05-11 10:52:08 -07:00
  • 490d51f45a Add auto inviter Levi McCallum 2016-05-11 10:51:29 -07:00
  • 4b54144f55 Levi's comments rcancro 2016-05-11 10:21:11 -07:00
  • 975690744b Merge remote-tracking branch 'facebook/master' into ASVideoPlayerNode Erekle 2016-05-11 20:43:57 +04:00
  • b84ccf00f4 Add Slack to README Levi McCallum 2016-05-10 18:06:43 -07:00
  • e99bbb0b1e Add Slack to Contributing file Levi McCallum 2016-05-10 18:06:11 -07:00
  • 25feefeafb Merge pull request #1643 from levi/patch-14 appleguy 2016-05-10 16:53:02 -07:00
  • 12d757a38d Merge pull request #1645 from rcancro/textCrash appleguy 2016-05-10 16:31:43 -07:00
  • ffde31a1b2 Fixed a crash in ASTextNode that I made rcancro 2016-05-10 15:25:34 -07:00