Hannah Trosi
|
971d43ad4d
|
[Build settings] add missing newlines at end of file
|
2016-08-18 15:01:41 -07:00 |
|
Hannah Troisi
|
c857e809f4
|
Clean up header comments (for consistent Facebook licensing info) (#1741)
[Licensing] Clean up header comments (for consistent Facebook licensing info)
|
2016-06-11 23:31:39 -07:00 |
|
Adlai Holler
|
fdfe18873a
|
Merge branch 'master' into update-objc
Conflicts:
AsyncDisplayKit/ASDisplayNodeExtras.h
AsyncDisplayKit/Details/ASTextNodeRenderer.h
AsyncDisplayKit/Details/ASTextNodeShadower.h
|
2015-12-01 16:45:25 -08:00 |
|
Huy Nguyen
|
0077c3eec6
|
Implement horizontal and vertical alignments for stack layout
|
2015-11-24 20:57:19 +02:00 |
|
Adlai Holler
|
b4b88da8cd
|
Merge branch 'master' into update-objc
Conflicts:
AsyncDisplayKit/ASCellNode.h
|
2015-11-02 09:36:46 -08:00 |
|
Samuel Hsiung
|
29a12834b0
|
adds convenience methods to return a vertical and horizontal stack spec
|
2015-10-29 20:06:46 -07:00 |
|
Adlai Holler
|
717df1cfd2
|
Merge latest master and update Layout headers
|
2015-09-17 11:39:59 -07:00 |
|
rcancro
|
4bb8472182
|
Removed ASBaselineLayoutSpec and made baseline alignment part of ASStackView
|
2015-09-10 17:29:39 -07:00 |
|
rcancro
|
7446578f6f
|
Added method to ASLayoutable to allow a layoutable to override how it will be added to the layoutSpec.
Also moved ASStaticLayoutSpec to act more like the other layouts.
|
2015-09-08 09:49:40 -07:00 |
|
rcancro
|
9bf62d14ab
|
Merge remote-tracking branch 'upstream/master' into baseline
# Conflicts:
# AsyncDisplayKit/Layout/ASLayoutSpec.h
# AsyncDisplayKit/Layout/ASStackLayoutSpec.mm
|
2015-08-24 09:54:36 -07:00 |
|
rcancro
|
49ac178166
|
huy's comments
|
2015-08-22 19:03:55 -07:00 |
|
ricky cancro
|
ef89f758bc
|
flailing
|
2015-08-22 19:03:54 -07:00 |
|
ricky cancro
|
cf428831a4
|
Added baseline spacing for vertical stack views.
|
2015-08-22 19:03:54 -07:00 |
|
ricky cancro
|
f289b3345a
|
Add baseline support to ASStackLayoutSpec
|
2015-08-22 19:03:54 -07:00 |
|
rcancro
|
680305704a
|
addressed comments and fixed tests
|
2015-08-21 21:03:40 -07:00 |
|
rcancro
|
c06a6be188
|
ASLayoutSpec are temporarily mutable and have a more obj-c interface
|
2015-08-21 16:02:36 -07:00 |
|
Huy Nguyen
|
3992e9b09b
|
[appledoc] Fix all remaining warnings.
|
2015-07-12 17:27:44 +07:00 |
|
Huy Nguyen
|
2149d44990
|
Fix naming convetion:
- "Layout node" is changed to "layout spec".
- Update tests.
- Update Kittens sample.
|
2015-07-01 18:13:44 +07:00 |
|