You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@weex.apache.org by cx...@apache.org on 2017/03/14 09:15:03 UTC
[2/3] incubator-weex git commit: Merge remote-tracking branch
'upstream/0.11-dev' into 0.11-dev
Merge remote-tracking branch 'upstream/0.11-dev' into 0.11-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/e429628e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/e429628e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/e429628e
Branch: refs/heads/0.11-dev
Commit: e429628e600c66b127eade2d7b9f2c6e57aac10a
Parents: 27a19d1 de623be
Author: \u9690\u98ce <cx...@apache.org>
Authored: Tue Mar 14 16:18:58 2017 +0800
Committer: \u9690\u98ce <cx...@apache.org>
Committed: Tue Mar 14 16:18:58 2017 +0800
----------------------------------------------------------------------
Dangerfile | 2 +-
.../com/taobao/weex/common/WXImageStrategy.java | 2 +-
.../main/java/com/taobao/weex/dom/WXStyle.java | 25 ++------
.../taobao/weex/ui/component/WXComponent.java | 10 ++--
.../com/taobao/weex/ui/component/WXImage.java | 61 ++++++++++++++++++--
.../weex/ui/view/border/BorderDrawable.java | 4 +-
.../java/com/taobao/weex/dom/WXStyleTest.java | 23 +-------
.../taobao/weex/utils/FunctionParserTest.java | 11 ++--
package.json | 9 ++-
9 files changed, 84 insertions(+), 63 deletions(-)
----------------------------------------------------------------------