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/04/17 04:14:57 UTC
[42/48] incubator-weex git commit: Merge branch 'dev' of
https://git-wip-us.apache.org/repos/asf/incubator-weex into dev
Merge branch 'dev' of https://git-wip-us.apache.org/repos/asf/incubator-weex into 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/5a15881f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/5a15881f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/5a15881f
Branch: refs/heads/0.12-dev
Commit: 5a15881fd5c28e82f94a3234404bb9ed6c5c6863
Parents: e584b16 6bd212e
Author: sospartan <so...@apache.org>
Authored: Tue Apr 11 20:16:43 2017 +0800
Committer: sospartan <so...@apache.org>
Committed: Tue Apr 11 20:16:43 2017 +0800
----------------------------------------------------------------------
doc/package.json | 4 +-
doc/source/cn/references/common-style.md | 82 +-
doc/source/cn/references/components/input.md | 14 +-
doc/source/cn/references/components/refresh.md | 9 +-
doc/source/cn/references/modules/dom.md | 76 +-
doc/source/cn/releasenote.md | 858 +++++++++++++++++++
doc/source/examples/dom-rect.md | 73 +-
doc/source/references/common-style.md | 71 +-
doc/source/references/components/input.md | 23 +-
doc/source/references/components/refresh.md | 11 +-
doc/source/references/modules/dom.md | 77 +-
doc/source/releasenote.md | 858 +++++++++++++++++++
doc/themes/weex/languages/cn.yml | 2 +
doc/themes/weex/languages/en.yml | 2 +
doc/themes/weex/layout/_partial/header.ejs | 12 +-
doc/themes/weex/source/css/partial/article.scss | 4 +
.../WeexDemo.xcodeproj/project.pbxproj | 18 +-
.../Recycler/WXRecyclerDataController.m | 2 +-
.../Sources/Display/WXComponent+BoxShadow.h | 2 +-
.../Sources/Display/WXComponent+BoxShadow.m | 10 +-
ios/sdk/WeexSDK/Sources/Display/WXInnerLayer.h | 2 +-
ios/sdk/WeexSDK/Sources/Display/WXInnerLayer.m | 4 +-
.../WeexSDK/Sources/Layout/WXComponent+Layout.m | 2 +-
ios/sdk/WeexSDK/Sources/Utility/WXBoxShadow.h | 2 +-
ios/sdk/WeexSDK/Sources/Utility/WXBoxShadow.m | 18 +-
ios/sdk/WeexSDK/Sources/WeexSDK.h | 1 +
26 files changed, 2123 insertions(+), 114 deletions(-)
----------------------------------------------------------------------