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,957 Commits 371 Branches 222 Tags
fixDevelopmentSidebarInDocs
Commit Graph
4957 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Jack Flintermann ff1be72e04 add module.modulemap 2015-09-16 20:15:48 -04:00
Jack Flintermann 2c7ac3bf0c add UICollectionView+ASConvenience.h 2015-09-16 20:09:03 -04:00
Jack Flintermann d95f0ea1bd synchronize target build phases 2015-09-16 20:05:10 -04:00
Adlai Holler 6bcd245c6d Bump the .travis.yml OS X image requirement for Xcode 7 2015-09-16 17:03:33 -07:00
Jack Flintermann b217f7c28a remove .ms from header build phases 2015-09-16 19:52:31 -04:00
Jack Flintermann 1b25cdd1eb clean up compile sources phase 2015-09-16 19:45:00 -04:00
Adlai Holler e4dc823c0d hitTest:withEvent: return value should be nullable 2015-09-16 16:21:07 -07:00
Adlai Holler a7240bac27 More objective-C cleanup 2015-09-16 15:41:56 -07:00
Adlai Holler 30ed0bd64a Restore old ASCollectionNode init 2015-09-16 15:39:06 -07:00
Adlai Holler 04690c0a4c Re-add nil tests 2015-09-16 15:36:52 -07:00
Adlai Holler 262d65eea9 More updates 2015-09-16 15:34:24 -07:00
Adlai Holler 814f72535c Add nullability annotations for public API 2015-09-16 15:21:35 -07:00
rcancro 7e3a0b3223 Changed copyIntoOptions to copyFromOptions 
I thought I already did this. I think copyFrom is a better name.
 2015-09-16 14:33:54 -07:00
Adlai Holler b1dfaa1eff Update project indentation settings 2015-09-16 14:17:52 -07:00
Huy Nguyen dfbaa35706 Disable an unstable test in ASTableViewTests. 2015-09-16 23:04:18 +03:00
appleguy f275d858ae Merge pull request #632 from paulyoung/compiler-warnings 
Add missing imports to address compiler warnings.
 2015-09-16 21:48:33 +02:00
Paul Young 77d74e60f0 Update header imports. 2015-09-16 12:17:01 -07:00
Paul Young 77dfd222d3 Merge branch 'master' into compiler-warnings 2015-09-16 12:13:50 -07:00
Paul Young 8426ab1122 Use a shared header for the static library and dynamic framework. 2015-09-16 12:12:21 -07:00
Dasmer Singh d326c66a72 Merge remote-tracking branch 'upstream/master' 2015-09-16 10:19:26 -04:00
appleguy b557075371 Merge pull request #655 from nguyenhuy/relayout_editing_mode 
Relayout table view cell nodes if there is a mismatch between content view size and the node's constrained size
 2015-09-16 15:20:48 +02:00
Huy Nguyen 094d2570f5 Force the layout of subviews when _ASTableViewCell transitioned to another state 
Relayout will be triggered in layoutSubviews (if needed).
 2015-09-16 15:25:40 +03:00
appleguy 6e04bfbb94 Merge pull request #657 from nguyenhuy/AppledocInASLayoutSpec 
Fix appledoc warnings in ASLayoutSpec.h
 2015-09-16 13:34:44 +02:00
Huy Nguyen 0c068c442d Fix appledoc warnings in ASLayoutSpec.h 2015-09-16 14:30:37 +03:00
appleguy c9aa2dec44 Merge pull request #656 from rcancro/ASLayoutOptionsPrivate 
As layout options private
 2015-09-16 13:18:09 +02:00
Huy Nguyen 2d575fcafc Relayout table view cell nodes if there is a mismatch between content view size and the node's constrained size 
- Above is the generic case. Correctly handling it means relayout when the table view enters or leaves editing mode is solved as well.
- Async data source API removal: In a table view, cell nodes should always fill its content view and table view widths. Thus async data source can no longer provide custom constrained size for cell nodes. This removal allows table view to better handle relayout.
- Some more tests are added to ASTableViewTests to check against use cases handled in this diff.
 2015-09-16 11:41:34 +03:00
rcancro b0948ee6ae Changed target membership of ASLayoutOptionsPrivate.h to Private from Public. 2015-09-15 17:18:08 -07:00
rcancro 21cc4e085c Merge branch 'ASLayoutOptionsPrivate' of github.com:rcancro/AsyncDisplayKit into ASLayoutOptionsPrivate 2015-09-15 17:11:29 -07:00
rcancro 9c8aaeb17e Move ASLayoutOptionsPrivate to the private folder 
fixes:
https://github.com/facebook/AsyncDisplayKit/issues/654
 2015-09-15 17:11:20 -07:00
rcancro eee60fb31b Move ASLayoutOptionsPrivate to the private folder 
fixes:
https://github.com/facebook/AsyncDisplayKit/issues/654
 2015-09-15 17:10:55 -07:00
appleguy fff8a0be4a Merge pull request #653 from rcancro/documentation 
Added missing Appledoc documentation
 2015-09-15 21:50:43 +02:00
rcancro 3b4055fcd3 few more doc changes. 2015-09-15 12:38:41 -07:00
rcancro 2d30a81a75 added documentation 2015-09-15 11:05:30 -07:00
appleguy a9f2bda345 Merge pull request #651 from rcancro/viewBlock 
added a callback for initWithViewBlock/initWithLayerBlock
 2015-09-15 18:50:24 +02:00
rcancro 2f3562fa09 scott's comments 2015-09-15 09:11:19 -07:00