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/06/22 05:27:15 UTC
[10/50] [abbrv] incubator-weex git commit: Merge remote-tracking
branch 'wip-us/0.14-dev' into 0.14-dev
Merge remote-tracking branch 'wip-us/0.14-dev' into 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/53efdad2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/53efdad2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/53efdad2
Branch: refs/heads/dev
Commit: 53efdad2048e3dfffb42b3c9a95c5a855f1a22d8
Parents: 1b10c6a 6371b3a
Author: acton393 <zh...@gmail.com>
Authored: Thu Jun 15 12:07:00 2017 +0800
Committer: acton393 <zh...@gmail.com>
Committed: Thu Jun 15 12:07:00 2017 +0800
----------------------------------------------------------------------
.travis.yml | 87 ++++++++---
android/run-ci.sh | 7 -
android/sdk/build.gradle | 11 +-
.../taobao/weex/ui/module/WXTimerModule.java | 87 ++++++-----
.../weex/ui/module/WXTimerModuleTest.java | 44 ++++--
.../WeexSDK/Sources/Bridge/WXBridgeContext.m | 154 +++++++++++++++++++
ios/sdk/WeexSDK/Sources/Bridge/WXJSCoreBridge.m | 111 +++++++++++++
.../WeexSDK/Sources/Protocol/WXBridgeProtocol.h | 38 +++++
test/ci-funcs.sh | 18 ---
test/screenshot/border-ios.png | Bin 128206 -> 126375 bytes
10 files changed, 454 insertions(+), 103 deletions(-)
----------------------------------------------------------------------