Merge branch 'dev' of https://git-wip-us.apache.org/repos/asf/incubator-weex into wip-us-0.16-dev
# Conflicts: # doc/source/cn/references/weex-variable.md Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/51ed22dc Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/51ed22dc Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/51ed22dc Branch: refs/heads/0.16-dev Commit: 51ed22dcbfffdee078e46dada4bcb6032b0464a4 Parents: 42285f3 778c0f6 Author: acton393 <zhangxing610...@gmail.com> Authored: Fri Aug 11 17:37:17 2017 +0800 Committer: acton393 <zhangxing610...@gmail.com> Committed: Fri Aug 11 17:37:17 2017 +0800 ---------------------------------------------------------------------- doc/source/_posts/arkit.md | 112 +++++++++++++++++++ doc/source/_posts/cn/hello.md | 6 - doc/source/_posts/hello_world.md | 7 -- doc/source/_posts/test.md | 14 --- doc/source/cn/blog/index.md | 4 - .../cn/references/advanced/extend-to-ios.md | 4 +- .../advanced/integrate-devtool-to-android.md | 86 +++++++++++++- doc/source/cn/references/components/text.md | 4 +- doc/source/references/advanced/extend-to-ios.md | 5 +- doc/source/references/components/text.md | 4 +- doc/themes/weex/layout/_partial/header.ejs | 1 + .../weex/layout/_partial/post/summary.ejs | 1 + doc/themes/weex/source/css/blog.scss | 3 + doc/themes/weex/source/css/media-queries.scss | 1 + doc/themes/weex/source/css/partial/header.scss | 6 +- .../WeexSDK/Sources/Component/WXListComponent.m | 4 +- 16 files changed, 217 insertions(+), 45 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/51ed22dc/ios/sdk/WeexSDK/Sources/Component/WXListComponent.m ----------------------------------------------------------------------
