You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@weex.apache.org by kf...@apache.org on 2017/06/14 07:51:34 UTC
[2/2] incubator-weex git commit: Merge branch '0.14-dev' of
https://git-wip-us.apache.org/repos/asf/incubator-weex into ios-dom-0.14-dev
Merge branch '0.14-dev' of https://git-wip-us.apache.org/repos/asf/incubator-weex into ios-dom-0.14-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/d26c46f1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/d26c46f1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/d26c46f1
Branch: refs/heads/0.14-dev
Commit: d26c46f198870db400216cae4d41c3c6559f8269
Parents: 8da1964 c16beb8
Author: 齐山 <su...@163.com>
Authored: Wed Jun 14 15:50:18 2017 +0800
Committer: 齐山 <su...@163.com>
Committed: Wed Jun 14 15:50:18 2017 +0800
----------------------------------------------------------------------
.travis.yml | 86 ++++++++++++++----
android/run-ci.sh | 7 --
android/sdk/build.gradle | 11 +--
.../taobao/weex/ui/module/WXTimerModule.java | 87 ++++++++++---------
.../weex/ui/module/WXTimerModuleTest.java | 44 +++++++---
ios/playground/WeexDemo/WXDemoViewController.m | 6 --
.../Sources/Component/WXCycleSliderComponent.m | 7 +-
package.json | 2 +-
test/ci-funcs.sh | 18 ----
test/pages/css/border.vue | 15 ++--
test/run.sh | 4 +-
test/screenshot/border-ios.png | Bin 128206 -> 126375 bytes
test/scripts/util.js | 5 +-
test/serve.sh | 3 +-
14 files changed, 175 insertions(+), 120 deletions(-)
----------------------------------------------------------------------