Merge branch '0.16-dev' of 
https://git-wip-us.apache.org/repos/asf/incubator-weex into wip-us-0.16-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/b7631a35
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/b7631a35
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/b7631a35

Branch: refs/heads/0.16-dev
Commit: b7631a359e00d5420879b66e0d5fa3ad2865aac3
Parents: 59facc1 5c90b13
Author: acton393 <[email protected]>
Authored: Thu Sep 21 16:09:34 2017 +0800
Committer: acton393 <[email protected]>
Committed: Thu Sep 21 16:09:34 2017 +0800

----------------------------------------------------------------------
 .travis.yml                                     |  47 +------
 POSSIBLE-NOTICES-FOR-BIN-DIST                   |   5 +-
 .../com/taobao/weex/dom/WXTextDomObject.java    |  11 +-
 .../weex/dom/action/CreateBodyAction.java       |  12 +-
 .../weex/ui/view/WXBaseCircleIndicator.java     | 131 +++----------------
 .../java/com/taobao/weex/utils/LogLevel.java    |   4 +-
 .../java/com/taobao/weex/utils/WXLogUtils.java  |  14 ++
 dangerfile-android.js                           | 108 +++++++++++++++
 dangerfile-ios.js                               | 107 +++++++++++++++
 dangerfile-jsfm.js                              | 105 +++++++++++++++
 package.json                                    |   5 +-
 scripts/generate_apache_release.sh              |   2 +-
 test/pages/components/iconfont.vue              |   6 +-
 test/scripts/components/scroll-event.test.js    |   2 +-
 14 files changed, 386 insertions(+), 173 deletions(-)
----------------------------------------------------------------------


Reply via email to