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/29 06:48:57 UTC
[05/18] incubator-weex git commit: Merge remote-tracking branch
'upstream/0.12-dev' into 0.12-dev
Merge remote-tracking branch 'upstream/0.12-dev' 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/c8a25b94
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/c8a25b94
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/c8a25b94
Branch: refs/heads/0.12-dev
Commit: c8a25b942061b98dfbdc2051ddf721f01cefdbb0
Parents: 896ffe8 a6207a6
Author: acton393 <zh...@gmail.com>
Authored: Wed Mar 22 17:20:44 2017 +0800
Committer: acton393 <zh...@gmail.com>
Committed: Wed Mar 22 17:20:44 2017 +0800
----------------------------------------------------------------------
.../src/main/java/com/taobao/weex/WXSDKInstance.java | 6 +++++-
.../com/taobao/weex/adapter/DefaultUriAdapter.java | 8 +++++---
.../java/com/taobao/weex/ui/component/WXComponent.java | 6 +++++-
.../java/com/taobao/weex/ui/component/WXHeader.java | 5 +++++
.../java/com/taobao/weex/ui/component/WXLoading.java | 5 +++++
.../java/com/taobao/weex/ui/component/WXRefresh.java | 5 +++++
.../weex/ui/component/list/BasicListComponent.java | 13 +------------
ios/sdk/WeexSDK.podspec | 2 +-
ios/sdk/WeexSDK.xcodeproj/project.pbxproj | 2 +-
ios/sdk/WeexSDK/Sources/Module/WXNavigatorModule.m | 5 ++++-
ios/sdk/WeexSDK/Sources/Utility/WXDefine.h | 2 +-
11 files changed, 38 insertions(+), 21 deletions(-)
----------------------------------------------------------------------