GitHub user acton393 reopened a pull request:

    https://github.com/apache/incubator-weex/pull/529

    * [ios] upgrade csslayout to yoga

    

You can merge this pull request into a Git repository by running:

    $ git pull https://github.com/acton393/incubator-weex yoga

Alternatively you can review and apply these changes as the patch at:

    https://github.com/apache/incubator-weex/pull/529.patch

To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:

    This closes #529
    
----
commit 1860460964656685bc20e95284f43033a15e8ce7
Author: acton393 <zhangxing610...@gmail.com>
Date:   2017-06-29T02:52:13Z

    * [ios] update

commit 7bc62a2385b8b8218d669c46c3256c5c147c65af
Author: acton393 <zhangxing610...@gmail.com>
Date:   2017-06-29T07:54:17Z

    * [ios] add css parse

commit b6d144b5215f0e4059222bb690f33bd9e2da69f9
Author: acton393 <zhangxing610...@gmail.com>
Date:   2017-06-30T13:39:38Z

    * [ios] which can simply layout

commit 2769c2b89b30ff1af4a6c02d37cfd8032cd4e592
Author: acton393 <zhangxing610...@gmail.com>
Date:   2017-07-06T13:14:43Z

    * [ios] make it layout normally

commit 9b15562f733f40ffc30d54467765503cb134b41d
Author: acton393 <zhangxing610...@gmail.com>
Date:   2017-07-18T03:33:39Z

    * [ios] fix cell layout

commit 43502a5c853dad93a6bef933d69c62c3510acc5d
Author: zifan.zx <zifan...@alibaba-inc.com>
Date:   2017-07-19T11:49:30Z

    * [ios] fix margin parse error

commit f132b64a544a5c8bb66595f60413a56438175f2c
Author: zifan.zx <zifan...@alibaba-inc.com>
Date:   2017-07-19T11:50:55Z

    * [ios] fix dealloc crash when cssNode is nil

commit ab95d482d379a63d2c2c68dcddda7c42afd87e3a
Author: zifan.zx <zifan...@alibaba-inc.com>
Date:   2017-07-19T12:53:03Z

    * [ios] fix waterfall case @nodanger

commit 0ef181aa9233804eb5144960d8493594cfe2440c
Author: zifan.zx <zifan...@alibaba-inc.com>
Date:   2017-07-19T12:53:38Z

    * [ios] handle fixed component

commit 6113cabe914409dc723a8a242ab14cc20ac27eea
Author: zifan.zx <zifan...@alibaba-inc.com>
Date:   2017-07-20T06:37:05Z

    * [ios] fix  yoga adapter problem

commit c868364e2257883948cb430363472a7161bb9884
Author: zifan.zx <zifan...@alibaba-inc.com>
Date:   2017-07-24T11:44:43Z

    * [ios] handle fixed component

commit 958833510385536b0dad4ccd53804131c3159183
Author: zifan.zx <zifan...@alibaba-inc.com>
Date:   2017-07-24T14:04:48Z

    * [ios] fix  serial bugs

commit 85d2b331248fc1b227f0f1b46972b7a215a857e9
Author: zifan.zx <zifan...@alibaba-inc.com>
Date:   2017-07-25T03:53:49Z

    * [ios] fixed component bug

commit bcb951df4498af77afacbda10affd4bef9bfa481
Author: zifan.zx <zifan...@alibaba-inc.com>
Date:   2017-07-25T03:58:01Z

    * [ios] fixed search path

commit b415e3a1b00794484698fdae6effd5f11a801ebb
Author: acton393 <acton...@users.noreply.github.com>
Date:   2017-07-25T05:53:25Z

    Merge branch '0.16-dev' into yoga

commit 54f93c66f53f0dbb31271bda5c025cb8775cb2d2
Author: acton393 <zhangxing610...@gmail.com>
Date:   2017-07-25T05:54:26Z

    Merge remote-tracking branch 'wip-us/0.16-dev' into yoga
    
    # Conflicts:
    #   ios/sdk/WeexSDK.xcodeproj/project.pbxproj
    #   ios/sdk/WeexSDK/Sources/Component/Recycler/WXRecyclerComponent.m
    #   ios/sdk/WeexSDK/Sources/WeexSDK.h

commit da6202c72592f61432c4f1a8a61b253cf065cd76
Author: acton393 <zhangxing610...@gmail.com>
Date:   2017-07-25T05:58:49Z

    Merge branch 'yoga' of https://github.com/acton393/incubator-weex into yoga
    
    * 'yoga' of https://github.com/acton393/incubator-weex:
    
    # Conflicts:
    #   ios/sdk/WeexSDK.xcodeproj/project.pbxproj
    #   ios/sdk/WeexSDK/Sources/WeexSDK.h

commit 2820624c49e1b4e97398c8aa994da4df49144ae6
Author: acton393 <zhangxing610...@gmail.com>
Date:   2017-07-25T06:07:47Z

    * [ios] remove yoga file in reference

commit 39ba2b5babcb87ade8ccaf99387571c4e36a36a1
Author: acton393 <zhangxing610...@gmail.com>
Date:   2017-07-25T06:11:04Z

    * [ios] remove unexpected settings

commit ed37efb70f919cbd84da254a63ae6db705d89621
Author: acton393 <zhangxing610...@gmail.com>
Date:   2017-07-25T06:20:59Z

    * [ios] fix dynamic framework compiler unknow symbol problem  @nodanger

commit 9eb4340f3d5d5af0e34dd333292abd5369b44ef6
Author: zifan.zx <zifan...@alibaba-inc.com>
Date:   2017-07-25T08:25:30Z

    * [ios] fix yoga unit test case  @nodanger

----


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---

Reply via email to