GitHub user misakuo opened a pull request:

    https://github.com/apache/incubator-weex/pull/372

    + [android] enable network inspector in playground

    - update the version of weex_inspector
    - enable http and websocket inspection in playground

You can merge this pull request into a Git repository by running:

    $ git pull https://github.com/misakuo/incubator-weex 
android-feature-enable-inspector

Alternatively you can review and apply these changes as the patch at:

    https://github.com/apache/incubator-weex/pull/372.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 #372
    
----
commit cceeabf3d41c98ee896d75eb6b1515fadf982327
Author: moxun.ljf <furm...@foxmail.com>
Date:   2017-05-03T01:42:15Z

    * [android] enable network inspector on playground

commit 42fd6af71c5ea850eb13e985304244c997c97032
Author: moxun.ljf <furm...@foxmail.com>
Date:   2017-05-04T08:03:36Z

    Merge remote-tracking branch 'remotes/upstream/0.13-dev' into 
android-feature-enable-inspector

commit 099c838af39b6f4f15f14b2479ff3811c395f716
Author: moxun.ljf <furm...@foxmail.com>
Date:   2017-05-04T08:10:06Z

    Merge remote-tracking branch 'remotes/upstream/0.13-dev' into 
android-feature-enable-inspector
    
    # Conflicts:
    #   android/playground/build.gradle

commit fde08a0d4bb54bb39a9fdd7e4adf2d9969706e13
Author: moxun.ljf <furm...@foxmail.com>
Date:   2017-05-04T08:13:40Z

    * [android] remove fixme

commit 718bb7592c467164ba9c89c0651b8c620931af4a
Author: moxun.ljf <furm...@foxmail.com>
Date:   2017-05-08T06:27:16Z

    * [android] add gradle wrapper

commit 347b8e76ac5dbe64e02241b71b6461c6772f9332
Author: moxun.ljf <furm...@foxmail.com>
Date:   2017-05-19T07:57:38Z

    + [android] update dependencies

----


---
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 infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---

Reply via email to