GitHub/Texture
1
0
Fork 0
mirror of https://github.com/TextureGroup/Texture.git synced 2026-04-07 19:17:39 +00:00
Code Issues Packages Projects Releases Wiki Activity
4,542 Commits 371 Branches 222 Tags
AutomaticSubnodeReordering
Commit Graph
4542 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Adlai Holler 9d6b3b6e14 Merge branch 'master' into update-objc 
Conflicts:
	AsyncDisplayKit/Details/ASTextNodeTextKitHelpers.h
 2015-09-20 21:55:54 -07:00
appleguy 48b0525f76 Merge pull request #667 from levi/patch-2 
Update Podspec to support Cocoapods 0.38.x
 2015-09-20 21:48:47 -07:00
appleguy 233e9c69ae Merge pull request #673 from adly-holler/ceil-text-size 
Align ASEditableTextNode to pixel boundaries
 2015-09-20 21:44:53 -07:00
Adlai Holler efe198e814 Use ceilSize in ASEditableTextNode 2015-09-20 21:18:06 -07:00
Adlai Holler 4ef2e572e6 Elevate ceilPixel functions to ASTextNodeTextKitHelpers.h, add ceilSize 2015-09-20 21:17:24 -07:00
Levi McCallum a9539fea1a Update Travis' Cocoapods version to 0.38.2 2015-09-20 10:01:08 -07:00
Levi McCallum debb178043 Update Podspec to support Cocoapods 0.38.x 
Fixes #659
 2015-09-20 10:00:40 -07:00
appleguy ca9b1caca4 Merge pull request #672 from adly-holler/fix-collectionview-update-crash 
Fix collection view data inconsistency
 2015-09-20 11:21:15 +02:00
appleguy aee6709229 Merge pull request #668 from adly-holler/imagenode-opaque-bg 
Fill image context with background color if image node is opaque
 2015-09-20 11:06:53 +02:00
Adlai Holler 86c1fa3981 Rename flag, default it to true, shorten some comment lines 2015-09-19 14:21:33 -07:00
Adlai Holler 7cd79e6e6f Tweak comment 2015-09-19 13:43:18 -07:00
Adlai Holler f0f26d3dab Tweak the new pendingReload flag 2015-09-19 13:40:41 -07:00
Adlai Holler 77490e11c0 ASCollectionView: Suspend updates while reload data is pending 2015-09-19 13:35:57 -07:00
Adlai Holler a1236a90c1 Update Swift example 2015-09-19 13:10:40 -07:00
Adlai Holler a14267ebf2 Bump the .travis.yml OS X image requirement for Xcode 7 2015-09-19 12:59:58 -07:00
Adlai Holler 3f12162b1f Bump SDK in build.sh 2015-09-19 12:57:44 -07:00
Adlai Holler 37e2a530ad Merge branch 'master' into update-objc 2015-09-19 12:53:06 -07:00
Adlai Holler d0f4bacc67 ImageNode: fill background more efficiently 2015-09-19 12:23:51 -07:00
appleguy 4e86ca2024 Merge pull request #670 from facebook/FixTextBuild 
Fix building test / profile under Xcode 7
 2015-09-19 20:57:23 +02:00
Scott Goodson a8924a2977 Fix building test / profile under Xcode 7 
It is strictly enforcing this unused variable (when asserts are compiled out).
 2015-09-19 20:55:40 +02:00
Adlai Holler 70c5582af7 Bump SDK in build.sh 2015-09-19 11:14:45 -07:00
Adlai Holler dc5650d6fa Revert "Point travis at 9.0 SDK" 
This reverts commit ffbf84f13b.
 2015-09-19 11:14:22 -07:00
Adlai Holler ffbf84f13b Point travis at 9.0 SDK 2015-09-19 11:05:01 -07:00
Adlai Holler f37a88d2e4 Give a prefix to make ASImageIdentifier typealias 2015-09-18 23:32:52 -07:00
appleguy a6dba104df Merge pull request #666 from adly-holler/fix-ascell-doc 
Clarify ASCellNode docs
 2015-09-18 14:02:35 +02:00
appleguy 2ef40e1a60 Merge pull request #434 from dasmer/master 
Generate slather/Coveralls test coverage stats
 2015-09-18 14:00:45 +02:00
Adlai Holler c872485459 Fill image context with background color if image node is opaque 2015-09-17 21:59:52 -07:00
Adlai Holler f20a0d4bc0 Add some nullables in ASTextNode 2015-09-17 19:56:21 -07:00
Adlai Holler fd3a90a3ed Make image download token optional 2015-09-17 14:56:39 -07:00
Adlai Holler ba9a742999 Fix nullability of ASImageDownloaderProtocol to conform to ASBasicImageDownloader behavior 2015-09-17 14:48:51 -07:00
Adlai Holler 38706d0962 Fix nullability in ASImageDownloaderProtocol completion handler 2015-09-17 14:22:29 -07:00
Adlai Holler c010ddad3b Update all the files in the Details group 2015-09-17 13:30:28 -07:00
Adlai Holler 03648d12a8 Clarify ASCellNode docs that it is for use with collection view as well 2015-09-17 12:30:31 -07:00
Adlai Holler 309ecca444 In ASLayoutOptions, make initWithLayoutable: take a nullable argument 2015-09-17 11:42:38 -07:00
Adlai Holler 717df1cfd2 Merge latest master and update Layout headers 2015-09-17 11:39:59 -07:00
Adlai Holler cde790124d Merge branch 'master' into update-objc 2015-09-17 11:27:27 -07:00
appleguy f8e43ea07a Merge pull request #660 from nguyenhuy/ASViewController 
Add ASViewController
 2015-09-17 15:16:54 +02:00
Huy Nguyen a864341710 Remove nonnull and nuulable annotations in ASViewController. Travis don't recognize them (yet). 2015-09-17 16:07:43 +03:00
Huy Nguyen 1ef1b647c9 Remove unnecessary import in ScreenNode.m 2015-09-17 15:59:38 +03:00
Huy Nguyen 8ebc3bdf67 Fix Multiplex sample does not load image: screenNode must be started before its -fetchData method is called. 2015-09-17 15:59:38 +03:00
Huy Nguyen fcd76dbd19 Use nonnull annotation, instead of sanity check, for node property in ASViewController. 2015-09-17 15:59:37 +03:00
Huy Nguyen 72d108cd98 Minor fixes in ASViewController and Multiplex sample. 2015-09-17 15:58:21 +03:00
Huy Nguyen 07c0d78c71 Add ASViewController and update Multiplex sample to use it. 2015-09-17 15:58:21 +03:00
appleguy 21bdbbe12f Merge pull request #665 from jflinter/jack-build-phase-cleanup 
Clean up Cocoa Touch framework target
 2015-09-17 10:15:21 +02:00
appleguy 43b03e74bd Merge pull request #663 from rcancro/functionName 
Changed copyIntoOptions to copyFromOptions
 2015-09-17 10:12:22 +02:00
appleguy f74eb4e800 Merge pull request #662 from adly-holler/indentation-settings 
Update project indentation settings
 2015-09-17 10:11:40 +02:00
appleguy 6282b8607b Merge pull request #661 from nguyenhuy/DisableFailingTableViewTest 
Disable an unstable test in ASTableViewTests.
 2015-09-17 10:10:03 +02:00
Jack Flintermann b84c371211 fix breaking test imports 2015-09-16 23:39:19 -04:00
Jack Flintermann 5c4a506af4 fix .DS_Store in gitignore 2015-09-16 23:33:56 -04:00
Jack Flintermann ce33149548 make additional private headers actually private; import all public headers in AsyncDisplayKit.h 2015-09-16 23:31:48 -04:00