Commit Graph

Select branches

Hide Pull Requests

1.9.4.1

1.9.7.2_branch

1.9.8_Before_ASEnvironment

1.9.90

AHAllocateNodesAsync

AHCacheNSTextStorage

AHCacheNSTextStorageNoKey

AHClarifySomeFlags

AHCollectionReordering

AHCollectionThrashing

AHCollectionViewLimitItemSIze

AHDeprecateBeginEndUpdates

AHInterfaceStateNames

AHLayoutSugar

AHMoveImpl

AHNaturalDealloc

AHNaturalDealloc611

AHNodeAtIndexPathAlwaysWorks

AHRemoveDisplaySemaphore

AHRemoveImplicitWait

AHRemoveImplicitWait_p6.12

AHTableViewRequerying

AHTestPR

AHUnifyDataController

AHUpdateExceptionLogBeforeThrow

AHUpdateSwiftExample

AHWaitForInitialData

ASLayoutPlayground

HTASSectionContext

HTQuickRenamingFix

LayoutSpecIntuition

TableReorderingTests

asyncImages

fixEndOfFileNewlines

fixPropertyAttributes

gh-pages

ht-pr1390

layoutExamples

master

releases/AsyncDisplayKit-1.2.3

releases/p6.10

releases/p6.11

releases/p6.12

releases/p6.13

releases/p6.7

releases/p6.8

releases/p6.9

1.0

1.0-beta2

1.0.1

1.0beta

1.1

1.1-beta

1.1.1

1.2

1.2.1

1.2.2

1.2.3

1.9

1.9.1

1.9.2

1.9.3

1.9.4

1.9.5

1.9.6

1.9.7

1.9.7.1

1.9.7.2

1.9.7.3

1.9.73

1.9.74

1.9.8

1.9.80

1.9.81

1.9.90

Mono Color

• ffbf84f13b Point travis at 9.0 SDK Adlai Holler 2015-09-19 11:05:01 -07:00
• f37a88d2e4 Give a prefix to make ASImageIdentifier typealias Adlai Holler 2015-09-18 23:32:52 -07:00
• a6dba104df Merge pull request #666 from adly-holler/fix-ascell-doc appleguy 2015-09-18 14:02:35 +02:00
• 2ef40e1a60 Merge pull request #434 from dasmer/master appleguy 2015-09-18 14:00:45 +02:00
• c872485459 Fill image context with background color if image node is opaque Adlai Holler 2015-09-17 21:59:52 -07:00
• f20a0d4bc0 Add some nullables in ASTextNode Adlai Holler 2015-09-17 19:56:21 -07:00
• fd3a90a3ed Make image download token optional Adlai Holler 2015-09-17 14:56:39 -07:00
• ba9a742999 Fix nullability of ASImageDownloaderProtocol to conform to ASBasicImageDownloader behavior Adlai Holler 2015-09-17 14:48:42 -07:00
• 38706d0962 Fix nullability in ASImageDownloaderProtocol completion handler Adlai Holler 2015-09-17 14:22:29 -07:00
• c010ddad3b Update all the files in the Details group Adlai Holler 2015-09-17 13:30:28 -07:00
• 03648d12a8 Clarify ASCellNode docs that it is for use with collection view as well Adlai Holler 2015-09-17 12:30:31 -07:00
• 309ecca444 In ASLayoutOptions, make initWithLayoutable: take a nullable argument Adlai Holler 2015-09-17 11:42:38 -07:00
• 717df1cfd2 Merge latest master and update Layout headers Adlai Holler 2015-09-17 11:39:59 -07:00
• cde790124d Merge branch 'master' into update-objc Adlai Holler 2015-09-17 11:27:27 -07:00
• f8e43ea07a Merge pull request #660 from nguyenhuy/ASViewController appleguy 2015-09-17 15:16:54 +02:00
• a864341710 Remove nonnull and nuulable annotations in ASViewController. Travis don't recognize them (yet). Huy Nguyen 2015-09-17 16:03:02 +03:00
• 1ef1b647c9 Remove unnecessary import in ScreenNode.m Huy Nguyen 2015-09-17 00:11:41 +03:00
• 8ebc3bdf67 Fix Multiplex sample does not load image: screenNode must be started before its -fetchData method is called. Huy Nguyen 2015-09-17 00:03:39 +03:00
• fcd76dbd19 Use nonnull annotation, instead of sanity check, for node property in ASViewController. Huy Nguyen 2015-09-16 23:36:19 +03:00
• 72d108cd98 Minor fixes in ASViewController and Multiplex sample. Huy Nguyen 2015-09-16 23:28:12 +03:00
• 07c0d78c71 Add ASViewController and update Multiplex sample to use it. Huy Nguyen 2015-09-16 22:22:08 +03:00
• 21bdbbe12f Merge pull request #665 from jflinter/jack-build-phase-cleanup appleguy 2015-09-17 10:15:21 +02:00
• 43b03e74bd Merge pull request #663 from rcancro/functionName appleguy 2015-09-17 10:12:22 +02:00
• f74eb4e800 Merge pull request #662 from adly-holler/indentation-settings appleguy 2015-09-17 10:11:40 +02:00
• 6282b8607b Merge pull request #661 from nguyenhuy/DisableFailingTableViewTest appleguy 2015-09-17 10:10:03 +02:00
• b84c371211 fix breaking test imports Jack Flintermann 2015-09-16 23:39:19 -04:00
• 5c4a506af4 fix .DS_Store in gitignore Jack Flintermann 2015-09-16 23:33:56 -04:00
• ce33149548 make additional private headers actually private; import all public headers in AsyncDisplayKit.h Jack Flintermann 2015-09-16 23:31:48 -04:00
• ff1be72e04 add module.modulemap Jack Flintermann 2015-09-16 20:15:48 -04:00
• 2c7ac3bf0c add UICollectionView+ASConvenience.h Jack Flintermann 2015-09-16 20:09:03 -04:00
• d95f0ea1bd synchronize target build phases Jack Flintermann 2015-09-16 20:05:10 -04:00
• 6bcd245c6d Bump the .travis.yml OS X image requirement for Xcode 7 Adlai Holler 2015-09-16 17:03:33 -07:00
• b217f7c28a remove .ms from header build phases Jack Flintermann 2015-09-16 19:52:31 -04:00
• 1b25cdd1eb clean up compile sources phase Jack Flintermann 2015-09-16 19:45:00 -04:00
• e4dc823c0d hitTest:withEvent: return value should be nullable Adlai Holler 2015-09-16 16:21:07 -07:00
• a7240bac27 More objective-C cleanup Adlai Holler 2015-09-16 15:41:56 -07:00
• 30ed0bd64a Restore old ASCollectionNode init Adlai Holler 2015-09-16 15:39:06 -07:00
• 04690c0a4c Re-add nil tests Adlai Holler 2015-09-16 15:36:52 -07:00
• 262d65eea9 More updates Adlai Holler 2015-09-16 15:34:24 -07:00
• 814f72535c Add nullability annotations for public API Adlai Holler 2015-09-16 15:15:07 -07:00
• 7e3a0b3223 Changed copyIntoOptions to copyFromOptions rcancro 2015-09-16 14:33:54 -07:00
• b1dfaa1eff Update project indentation settings Adlai Holler 2015-09-16 14:17:52 -07:00
• dfbaa35706 Disable an unstable test in ASTableViewTests. Huy Nguyen 2015-09-16 23:04:18 +03:00
• f275d858ae Merge pull request #632 from paulyoung/compiler-warnings appleguy 2015-09-16 21:48:33 +02:00
• 77d74e60f0 Update header imports. Paul Young 2015-09-16 12:17:01 -07:00
• 77dfd222d3 Merge branch 'master' into compiler-warnings Paul Young 2015-09-16 12:13:50 -07:00
• 8426ab1122 Use a shared header for the static library and dynamic framework. Paul Young 2015-09-16 12:12:21 -07:00
• d326c66a72 Merge remote-tracking branch 'upstream/master' Dasmer Singh 2015-09-16 10:19:26 -04:00
• b557075371 Merge pull request #655 from nguyenhuy/relayout_editing_mode appleguy 2015-09-16 15:20:48 +02:00
• 094d2570f5 Force the layout of subviews when _ASTableViewCell transitioned to another state Huy Nguyen 2015-09-16 15:19:55 +03:00
• 6410ebf5a4 Merge pull request #658 from nguyenhuy/update_gh_pages appleguy 2015-09-16 14:00:58 +02:00
• f6e606db28 Regen on 6e04bfbb94. Huy Nguyen 2015-09-16 14:54:25 +03:00
• 6e04bfbb94 Merge pull request #657 from nguyenhuy/AppledocInASLayoutSpec appleguy 2015-09-16 13:34:44 +02:00
• 0c068c442d Fix appledoc warnings in ASLayoutSpec.h Huy Nguyen 2015-09-16 14:17:29 +03:00
• c9aa2dec44 Merge pull request #656 from rcancro/ASLayoutOptionsPrivate appleguy 2015-09-16 13:18:09 +02:00
• 2d575fcafc Relayout table view cell nodes if there is a mismatch between content view size and the node's constrained size Huy Nguyen 2015-09-15 22:26:11 +03:00
• b0948ee6ae Changed target membership of ASLayoutOptionsPrivate.h to Private from Public. rcancro 2015-09-15 17:18:08 -07:00
• 21cc4e085c Merge branch 'ASLayoutOptionsPrivate' of github.com:rcancro/AsyncDisplayKit into ASLayoutOptionsPrivate rcancro 2015-09-15 17:11:29 -07:00
• 9c8aaeb17e Move ASLayoutOptionsPrivate to the private folder rcancro 2015-09-15 17:10:55 -07:00
• eee60fb31b Move ASLayoutOptionsPrivate to the private folder rcancro 2015-09-15 17:10:55 -07:00
• fff8a0be4a Merge pull request #653 from rcancro/documentation appleguy 2015-09-15 21:50:43 +02:00
• 3b4055fcd3 few more doc changes. rcancro 2015-09-15 12:38:41 -07:00
• 2d30a81a75 added documentation rcancro 2015-09-15 11:03:40 -07:00
• a9f2bda345 Merge pull request #651 from rcancro/viewBlock appleguy 2015-09-15 18:50:24 +02:00
• 2f3562fa09 scott's comments rcancro 2015-09-15 09:11:19 -07:00
• 01be5acece added a callback for initWithViewBlock/initWithLayerBlock rcancro 2015-09-14 20:36:08 -07:00
• 6ce077be5a Merge pull request #650 from nguyenhuy/appledoc appleguy 2015-09-15 00:24:11 +02:00
• 7dc9b7fc40 Fix appledoc warnings. Huy Nguyen 2015-09-15 00:58:48 +03:00
• 83aac39ef2 Merge pull request #648 from rcancro/layoutOptionsComments appleguy 2015-09-14 16:43:15 +02:00
• 2e3d59a73e spelling rcancro 2015-09-11 16:13:18 -07:00
• b14e189bfb Addressed comments to LayoutOptions PR rcancro 2015-09-11 16:07:18 -07:00
• dc0d22dff4 Merge pull request #647 from rcancro/stackBaseLine appleguy 2015-09-10 18:16:37 -07:00
• 41197ad4a3 Merge pull request #646 from rcancro/finalLayoutableFollowup appleguy 2015-09-10 18:16:24 -07:00
• 4bb8472182 Removed ASBaselineLayoutSpec and made baseline alignment part of ASStackView rcancro 2015-09-10 17:29:39 -07:00
• b85316d8bc a couple comment updates rcancro 2015-09-10 13:19:13 -07:00
• a56ac35105 Merge pull request #613 from eanagel/ASDisplayNode-init-perf appleguy 2015-09-09 22:36:19 -07:00
• 8ea40a0265 Merge branch 'master' into ASDisplayNode-init-perf Ethan Nagel 2015-09-09 22:17:49 -07:00
• c959adace0 Merge pull request #645 from rcancro/finalLayoutableFlag appleguy 2015-09-09 21:36:58 -07:00
• 69365451d1 Merge pull request #643 from nguyenhuy/fixRelayoutDuringInitialConfig appleguy 2015-09-09 19:45:21 -07:00
• 23497379e4 added comment to give guidance if a user is getting crashing in finalLayoutable rcancro 2015-09-09 11:51:36 -07:00
• 2a030c9841 First thoughts on fixing the finalLayoutable method. rcancro 2015-09-09 09:13:02 -07:00
• cb1081b759 Merge pull request #644 from rcancro/layoutOptions appleguy 2015-09-08 22:30:31 -07:00
• a8cecbd0ad Avoid doing relayout during initial configuration of table and collection views. Huy Nguyen 2015-09-08 22:31:09 +03:00
• 6383b69029 Update ASTableViewTests to detect the case when relayout is trigger during initial configuration. Huy Nguyen 2015-09-08 22:30:56 +03:00
• fc9d589cf9 Merge branch 'layoutOptions' of github.com:rcancro/AsyncDisplayKit into layoutOptions rcancro 2015-09-08 09:53:22 -07:00
• fe4a2d272f add locks to ASLayoutOptions rcancro 2015-09-08 09:48:59 -07:00
• b3369ca388 making ASLayoutOptions threadsafe rcancro 2015-08-31 14:19:27 -07:00
• fca43a651f Make layoutOptions readonly rcancro 2015-08-28 20:41:40 -07:00
• 2a8b20b102 didn't mean to commit this rcancro 2015-08-28 20:14:09 -07:00
• 5786bc1b5b Fixed infinite recursion in finalLayoutable, removed child properties from ASLayoutSpecs rcancro 2015-08-28 20:11:19 -07:00
• 84cd80c41d bug in setting the ASLayoutOptions default class. rcancro 2015-08-28 16:51:15 -07:00
• 36d00273fb wasn't copying layout options to final layoutable. rcancro 2015-08-28 16:49:40 -07:00
• 8263a9f53a Kittens sample working rcancro 2015-08-28 15:55:41 -07:00
• cbaf178950 Hide ASLayoutOptions from the user rcancro 2015-08-28 14:30:50 -07:00
• 15b3fd6eab Moved ASLayoutable* properties into ASLayoutOptions class rcancro 2015-08-28 09:36:22 -07:00
• 61b72d2c46 fix kittens example rcancro 2015-08-25 14:37:34 -07:00
• 7446578f6f Added method to ASLayoutable to allow a layoutable to override how it will be added to the layoutSpec. rcancro 2015-08-25 14:04:06 -07:00
• ad95a7c3ea add locks to ASLayoutOptions rcancro 2015-09-08 09:48:59 -07:00
• a57f701a9e style fix Ethan Nagel 2015-09-08 09:44:54 -07:00
• ed5ebbe450 update documentation. Ethan Nagel 2015-09-08 09:32:56 -07:00