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/26 06:56:24 UTC
[02/50] [abbrv] incubator-weex git commit: Merge branch '0.12-dev' of
https://github.com/apache/incubator-weex into 0.12-dev-web
Merge branch '0.12-dev' of https://github.com/apache/incubator-weex into 0.12-dev-web
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/8cd9157b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/8cd9157b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/8cd9157b
Branch: refs/heads/dev
Commit: 8cd9157ba8df4cc693e3f2845adb1134d9dbe724
Parents: d038a93 8ce111a
Author: MrRaindrop <te...@gmail.com>
Authored: Tue Apr 18 16:37:59 2017 +0800
Committer: MrRaindrop <te...@gmail.com>
Committed: Tue Apr 18 16:37:59 2017 +0800
----------------------------------------------------------------------
.travis.yml | 42 +++++++++--
NOTICE | 75 ++++++++++++++++++++
WeexSDK.podspec | 45 ++++++++++++
android/run-ci.sh | 2 +-
.../com/taobao/weex/ui/component/WXEmbed.java | 2 +-
examples/component/input-demo.we | 14 ++--
examples/index.we | 5 +-
examples/vue/components/input.vue | 14 ++--
examples/vue/index.vue | 3 +
examples/vue/market/gcanvas.vue | 40 +++++++++++
ios/playground/Podfile | 5 +-
.../WeexDemo.xcodeproj/project.pbxproj | 4 +-
ios/sdk/WeexSDK.podspec | 47 ------------
.../WeexSDK/Sources/Bridge/WXBridgeContext.m | 2 +-
.../Sources/Component/WXSliderComponent.m | 53 +++-----------
.../Sources/Controller/WXBaseViewController.h | 2 +-
.../Sources/Controller/WXBaseViewController.m | 16 -----
.../Sources/Controller/WXRootViewController.m | 17 ++++-
ios/sdk/WeexSDKTests/WXRootViewTests.m | 4 +-
package.json | 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 +-
24 files changed, 294 insertions(+), 222 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/8cd9157b/package.json
----------------------------------------------------------------------