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/18 08:10:27 UTC
[7/7] incubator-weex git commit: Merge branch 'dev' into 0.12-dev
Merge branch '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/8ce111a7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/8ce111a7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/8ce111a7
Branch: refs/heads/0.12-dev
Commit: 8ce111a7d93d85056fd3b2d1064b06b84924a367
Parents: 32ae6e4 648cfc0
Author: sospartan <so...@apache.org>
Authored: Tue Apr 18 16:10:00 2017 +0800
Committer: sospartan <so...@apache.org>
Committed: Tue Apr 18 16:10:00 2017 +0800
----------------------------------------------------------------------
.travis.yml | 42 +++++++++--
NOTICE | 75 ++++++++++++++++++++
android/run-ci.sh | 2 +-
.../Sources/Controller/WXBaseViewController.h | 2 +-
.../Sources/Controller/WXBaseViewController.m | 16 -----
.../Sources/Controller/WXRootViewController.m | 17 ++++-
ios/sdk/WeexSDKTests/WXRootViewTests.m | 4 +-
test/ci-funcs.sh | 75 +++-----------------
test/run.sh | 41 ++++++-----
test/scripts/components/image-onload.test.js | 2 +-
test/scripts/components/recycler.test.js | 2 +-
11 files changed, 169 insertions(+), 109 deletions(-)
----------------------------------------------------------------------