GitHub user wispy316 opened a pull request:
https://github.com/apache/incubator-weex/pull/246
Hotfix empty pr
an empty pr to see CI is working right
You can merge this pull request into a Git repository by running:
$ git pull https://github.com/wispy316/incubator-weex hotfix-empty-pr
Alternatively you can review and apply these changes as the patch at:
https://github.com/apache/incubator-weex/pull/246.patch
To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:
This closes #246
----
commit 7ec3bb72d02dc377f495fcbcdce9a2308768618a
Author: kfeagle <[email protected]>
Date: 2017-03-24T03:14:21Z
+ [ios] android macaca support
commit 7359e64efee4afa56c7d74ba57cfa6f783ea56f2
Author: cxfeng <[email protected]>
Date: 2017-03-24T03:42:09Z
Merge branch 'ios-feature-textarea-maxlength-0.12-dev' of
https://github.com/kfeagle/incubator-weex into 0.12-dev
commit 51ea1db598b102863e1c034cacd7c45e0fb4c0db
Author: moxun.ljf <[email protected]>
Date: 2017-03-24T06:11:20Z
* [android] add keyboard event to edittext
commit 312f592b547145c40263d4036b12c0ca00eb4605
Author: moxun.ljf <[email protected]>
Date: 2017-03-24T06:24:02Z
* [android] revert the other changes that not belong to this feature
commit 468f4f9561d00bc560a443a2d59633b0b8492a9d
Author: MrRaindrop <[email protected]>
Date: 2017-03-24T07:07:05Z
Merge branch '0.12-dev-feature-jsfm0.19.16' of
https://github.com/atomtong/incubator-weex into 0.12-dev
commit 436a69c5b38d97f73301da8e3bf76ce6f1e1d80f
Author: MrRaindrop <[email protected]>
Date: 2017-03-24T07:54:11Z
* [html5] fix indicator's zIndex.
commit c47ec8671bcefcd64ad6f78ed731e989572460e9
Author: cxfeng <[email protected]>
Date: 2017-03-24T08:10:30Z
Merge branch 'ios-feature-text-0.12-dev' of
https://github.com/kfeagle/incubator-weex into 0.12-dev
commit a8316d74d0c364f7caa71ae39f36f8a3b5df18d9
Author: cxfeng <[email protected]>
Date: 2017-03-24T08:11:05Z
Merge branch '0.12-dev' of
https://git-wip-us.apache.org/repos/asf/incubator-weex into 0.12-dev
commit 43c9e6516dc6b76b58ba536b47c7a1c0cc58352a
Author: MrRaindrop <[email protected]>
Date: 2017-03-24T08:28:40Z
* [html5] hyphenate static style.
commit fff9fd8a5f2e8c0773f1e4cd1c2911c07f04e8b1
Author: zshshr <[email protected]>
Date: 2017-03-24T08:44:04Z
* [android] bug fix for header disappear
commit 3ef1336f8da66a020e71ec7291256448f744ba64
Author: zshshr <[email protected]>
Date: 2017-03-24T08:51:53Z
* [android] remove space line
commit 1fb06cda0fd0da37985692274aeabc571bbd191f
Author: LiuHongfeng(GuJian) <[email protected]>
Date: 2017-03-24T09:11:48Z
remove performSelector:@selector(scrollViewDidEndScrollingAnimation:) to
avoid crash. and scrollstop envent be disabled .
commit 69a69c5d5eb16664db98718e9d65b0dd629e0e1d
Author: acton393 <[email protected]>
Date: 2017-03-24T09:30:13Z
* [ios] fix refresh bug
commit 66aeba2304cca6eda0ffebfe8ee5f34902abe2a9
Author: cxfeng <[email protected]>
Date: 2017-03-24T09:34:41Z
Merge branch '0.11-dev' of https://github.com/acton393/incubator-weex into
0.11-dev
commit e578673850ca61e3e6e0fbdd3df6ef093dd706f7
Author: sospartan <[email protected]>
Date: 2017-03-24T10:05:32Z
Merge branch '0.11-dev' of
https://git-wip-us.apache.org/repos/asf/incubator-weex into 0.12-dev
commit fc30124335a22e733042352a1fd27fb88e3855a7
Author: sospartan <[email protected]>
Date: 2017-03-24T05:58:39Z
integration test improve:
- support web integeration test
- support vue in integrate test
web platform test will not enable in CI till vue-render update to newest
version.
commit e1be952b25c8c063187c579cb1ea2e848cdda752
Author: sospartan <[email protected]>
Date: 2017-03-24T10:32:31Z
Merge branch 'enable-macaca-h5' into 0.12-dev
commit 1d7998d12339b54a9a4f9364526458200d6f6281
Author: acton393 <[email protected]>
Date: 2017-03-24T15:48:44Z
* [ios] fix list insert cell out of bounds crash
commit 373ae386a24cd7dd7d57956baa508df279bac3fd
Author: cxfeng <[email protected]>
Date: 2017-03-24T15:50:59Z
Merge branch '0.11-dev' of https://github.com/acton393/incubator-weex into
0.11-dev
commit 7de10149906253c0c059fbdc1bcc70cb6bae595f
Author: MrRaindrop <[email protected]>
Date: 2017-03-25T06:14:44Z
* [html5] fix v-model binding for textarea.
commit b27b58b9e964aff0d449b63cc5d677966a49c16e
Author: MrRaindrop <[email protected]>
Date: 2017-03-25T07:21:34Z
* [html5] add comp-dom map for readme.
commit 08930c2c09fccb7fad4c30d77353d1bb8bd23522
Author: éé£ <[email protected]>
Date: 2017-03-25T09:07:34Z
Merge remote-tracking branch 'upstream/0.11-dev' into 0.11-dev
commit bc723eb9012b93b30d82712cdf98c28b09b8342f
Author: moxun.ljf <[email protected]>
Date: 2017-03-23T05:45:38Z
* [example] add demo for list & scroller with onScroll event
(cherry picked from commit 7f60621)
commit 9076095f84cbc8b886ecba10ec8a74d70ad92d8e
Author: moxun.ljf <[email protected]>
Date: 2017-03-27T02:53:23Z
Merge remote-tracking branch 'upstream/0.12-dev' into 0.12-dev
commit ece44ec720f58a7b32c77e8bda7440ccd7514d74
Author: moxun.ljf <[email protected]>
Date: 2017-03-27T05:01:02Z
* [example] add slider scroll event demo
commit a726be7f5089447f787d0edf26e3d7c963bf2f1a
Author: MrRaindrop <[email protected]>
Date: 2017-03-27T06:09:37Z
* [html5] update
commit 93063f1425289e2b501a0bd821f5e1153e52849a
Author: xkli <[email protected]>
Date: 2017-03-27T06:58:56Z
Merge branch 'v0.10.0-playground' into 0.11-dev
* v0.10.0-playground:
*[android] update app version 0.10.0
*[android] update app version
*[android] update example
æ´æ°example
*[android] update ic_launcher
* [android] update app version
* [android] update weex_inspector version
* [android] add mask component
* [android] update verison
* [android] add linear-gradient.we
# Conflicts:
# android/playground/app/build.gradle
# android/sdk/assets/main.js
# android/sdk/build.gradle
# examples/module/websocket-demo.we
# examples/vue/components/input.vue
# examples/vue/include/marquee.vue
# examples/vue/index.vue
# examples/vue/showcase/calculator.vue
# examples/vue/template.vue
commit 5a992e0565f107041bee6f979589c362f0d9c6f2
Author: xkli <[email protected]>
Date: 2017-03-27T07:08:37Z
* [example] modify img address
commit 5cb0819472bf7db3d2843e1634f9d7fea1dee368
Author: xkli <[email protected]>
Date: 2017-03-27T07:12:52Z
* [example] update image demo
commit 1a370931d18091baa10ebc72fe203c3dedf2d9de
Author: éé£ <[email protected]>
Date: 2017-03-27T07:28:12Z
* [ios] fix issue that recycler can not scroll to header
----
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at [email protected] or file a JIRA ticket
with INFRA.
---
