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/07/13 09:49:09 UTC
[03/11] incubator-weex git commit: Merge remote-tracking branch
'upstream/0.15-dev' into 0.15-dev
Merge remote-tracking branch 'upstream/0.15-dev' into 0.15-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/d20eded8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/d20eded8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/d20eded8
Branch: refs/heads/0.15-dev
Commit: d20eded8ccb16e4c905af6a6f2af79363f4bddc1
Parents: 462c1f5 450ba37
Author: yinfeng <cx...@apache.org>
Authored: Thu Jun 22 15:57:43 2017 +0800
Committer: yinfeng <cx...@apache.org>
Committed: Thu Jun 22 15:57:43 2017 +0800
----------------------------------------------------------------------
.travis.yml | 1 -
README.md | 2 +-
.../ui/component/AbstractEditComponent.java | 14 +-
.../com/taobao/weex/ui/component/Textarea.java | 6 +
.../taobao/weex/ui/component/WXComponent.java | 2 +-
.../com/taobao/weex/ui/view/WXEditText.java | 9 +-
doc/_config.yml | 1 +
doc/_config_cn.yml | 1 +
doc/source/cn/releasenote.md | 663 ++-----------------
doc/source/faq.md | 6 +-
doc/source/guide/index.md | 26 +-
doc/source/guide/intro/using-vue.md | 6 +-
doc/source/releasenote.md | 663 ++-----------------
doc/themes/weex/layout/post.ejs | 7 -
html5/render/vue/components/index.js | 4 +-
.../components/scrollable/loading-indicator.js | 152 ++++-
.../render/vue/components/scrollable/loading.js | 4 +-
.../render/vue/components/scrollable/refresh.js | 4 +-
html5/render/vue/mixins/style.js | 11 +-
html5/render/vue/styles/base.css | 56 --
html5/render/vue/utils/func.js | 30 +
html5/render/vue/utils/style.js | 33 +
test/screenshot/border-ios.png | Bin 126375 -> 126185 bytes
23 files changed, 344 insertions(+), 1357 deletions(-)
----------------------------------------------------------------------