Repository: incubator-weex Updated Branches: refs/heads/0.16-dev 27f69b75a -> c643ceafe
Merge remote-tracking branch 'upstream/0.16-dev' into 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/901be692 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/901be692 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/901be692 Branch: refs/heads/0.16-dev Commit: 901be692f9b2469b88460f13881b78a094c80a0c Parents: 5123304 20b1157 Author: misakuo <misa...@apache.org> Authored: Thu Sep 21 14:18:37 2017 +0800 Committer: misakuo <misa...@apache.org> Committed: Thu Sep 21 14:18:37 2017 +0800 ---------------------------------------------------------------------- .travis.yml | 47 +------- POSSIBLE-NOTICES-FOR-BIN-DIST | 5 +- .../com/taobao/weex/dom/WXTextDomObject.java | 11 +- .../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 +- 12 files changed, 360 insertions(+), 56 deletions(-) ----------------------------------------------------------------------
