You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@weex.apache.org by so...@apache.org on 2017/04/13 05:16:50 UTC

[20/50] incubator-weex git commit: Merge branch '0.12-dev' of https://git-wip-us.apache.org/repos/asf/incubator-weex into 0.12-dev

Merge branch '0.12-dev' of https://git-wip-us.apache.org/repos/asf/incubator-weex into 0.12-dev


Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/579a2b32
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/579a2b32
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/579a2b32

Branch: refs/heads/dev
Commit: 579a2b320a85439105a1a9651eda3ef43b2d5851
Parents: 419d019 ac49663
Author: sospartan <so...@apache.org>
Authored: Wed Apr 12 12:11:28 2017 +0800
Committer: sospartan <so...@apache.org>
Committed: Wed Apr 12 12:11:28 2017 +0800

----------------------------------------------------------------------
 .../java/com/taobao/weex/WXSDKInstance.java     | 25 ++++++++++++++++++++
 .../taobao/weex/dom/action/AnimationAction.java |  3 ++-
 .../taobao/weex/ui/component/WXComponent.java   | 14 ++++++++---
 doc/source/cn/references/modules/modal.md       |  2 ++
 doc/source/references/modules/modal.md          |  2 ++
 .../Sources/Component/WXImageComponent.m        |  6 ++---
 .../Sources/Display/WXComponent+Display.m       |  2 +-
 7 files changed, 45 insertions(+), 9 deletions(-)
----------------------------------------------------------------------