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/24 09:33:22 UTC

[04/51] [abbrv] incubator-weex git commit: Merge branch '0.12-dev' of https://github.com/apache/incubator-weex into 0.12-dev-web

Merge branch '0.12-dev' of https://github.com/apache/incubator-weex into 0.12-dev-web


Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/4c6c9ce8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/4c6c9ce8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/4c6c9ce8

Branch: refs/heads/0.13-dev
Commit: 4c6c9ce8fff369904a5cf9d7816f6a0b3d5bda9b
Parents: ae9b7a3 5ea9966
Author: MrRaindrop <te...@gmail.com>
Authored: Mon Apr 17 12:16:07 2017 +0800
Committer: MrRaindrop <te...@gmail.com>
Committed: Mon Apr 17 12:16:07 2017 +0800

----------------------------------------------------------------------
 doc/_config.yml                                 |   4 +
 doc/package.json                                |   4 +-
 doc/source/cn/guide/integrate-to-your-app.md    |  11 +-
 doc/source/cn/guide/set-up-env.md               |   2 +-
 doc/source/cn/guide/tools/devtools.md           | 111 ---
 doc/source/cn/guide/tools/index.md              |   3 +-
 doc/source/cn/guide/tools/toolkit.md            | 231 +++++
 doc/source/cn/guide/tools/weexpack.md           | 388 ---------
 .../cn/references/advanced/extend-to-ios.md     |  84 +-
 doc/source/cn/references/common-style.md        |  82 +-
 doc/source/cn/references/components/input.md    |  14 +-
 doc/source/cn/references/components/refresh.md  |   9 +-
 .../cn/references/components/waterfall.md       |  69 ++
 doc/source/cn/references/components/web.md      |  11 +-
 doc/source/cn/references/modules/dom.md         |  78 +-
 doc/source/cn/references/modules/webview.md     |  11 +-
 doc/source/cn/releasenote.md                    | 858 +++++++++++++++++++
 doc/source/examples/dom-rect.md                 |  73 +-
 doc/source/guide/integrate-to-your-app.md       |   7 +-
 doc/source/guide/set-up-env.md                  |   2 +-
 doc/source/guide/tools/devtools.md              | 100 ---
 doc/source/guide/tools/index.md                 |   3 +-
 doc/source/guide/tools/toolkit.md               | 198 +++++
 doc/source/guide/tools/weexpack.md              | 300 -------
 doc/source/references/advanced/extend-to-ios.md |  70 +-
 doc/source/references/common-style.md           |  71 +-
 doc/source/references/components/input.md       |  23 +-
 doc/source/references/components/refresh.md     |  11 +-
 doc/source/references/components/waterfall.md   |  60 ++
 doc/source/references/components/web.md         |  13 +-
 doc/source/references/modules/dom.md            |  78 +-
 doc/source/references/modules/webview.md        |  11 +-
 doc/source/releasenote.md                       | 858 +++++++++++++++++++
 doc/source/v-0.10/references/components/list.md |  11 +-
 .../references/components/refresh-loading.md    |  13 +-
 doc/themes/weex/languages/cn.yml                |   2 +
 doc/themes/weex/languages/en.yml                |   2 +
 doc/themes/weex/layout/_partial/footer.ejs      |  14 +-
 doc/themes/weex/layout/_partial/header.ejs      |  17 +-
 doc/themes/weex/layout/playground.ejs           |   2 +-
 doc/themes/weex/source/css/common.scss          |   4 +-
 doc/themes/weex/source/css/partial/article.scss |   4 +
 doc/themes/weex/source/css/partial/footer.scss  |  18 +-
 html5/test/e2e/runner.js                        |   1 +
 .../WeexDemo.xcodeproj/project.pbxproj          |  18 +-
 ios/sdk/WeexSDK/Sources/Utility/WXBoxShadow.m   |   1 -
 46 files changed, 2860 insertions(+), 1095 deletions(-)
----------------------------------------------------------------------