Permalink
Commits on Jan 24, 2017
  1. Merge pull request #2401 from cxfeng1/dev

    * [ios] autoreleasepool around the runloop spinning
    cxfeng1 committed on GitHub Jan 24, 2017
Commits on Jan 23, 2017
  1. Merge pull request #2207 from alibaba/develop_cijian_fix

    * [ios] formatting code
    cxfeng1 committed on GitHub Jan 23, 2017
Commits on Jan 22, 2017
  1. Merge pull request #2355 from jiyee/dev

    * [ios] fix typo error and files position
    cxfeng1 committed on GitHub Jan 22, 2017
Commits on Jan 20, 2017
  1. * [ios] move WXBridgeMethod.{h,m} to Bridge folder

    jiyee committed Jan 20, 2017
  2. * [ios] fix comment error

    jiyee committed Jan 20, 2017
  3. * [ios] fix typo error

    jiyee committed Jan 20, 2017
  4. Merge pull request #2337 from jiyee/dev

    * [ios] fix typo errors
    cxfeng1 committed on GitHub Jan 20, 2017
Commits on Jan 19, 2017
  1. * [ios] fix typo error

    jiyee committed Jan 19, 2017
  2. * [ios] fix log error

    jiyee committed Jan 19, 2017
  3. * [ios] fix typo errors

    jiyee committed Jan 19, 2017
  4. Merge pull request #2315 from wj2061/dev

    * [ios]  check progressCallback of WXStreamModule before use it
    cxfeng1 committed on GitHub Jan 19, 2017
Commits on Jan 18, 2017
  1. * [ios] check progressCallback of WXStreamModule before use it

    wj2061 committed Jan 18, 2017
Commits on Jan 16, 2017
  1. Merge pull request #2276 from alibaba/html5-feature-0.10

    Html5 feature 0.10
    Jinjiang committed on GitHub Jan 16, 2017
  2. Merge branch 'html5-feature-0.10' of https://github.com/alibaba/weex

    …into html5-feature-0.10
    MrRaindrop committed Jan 16, 2017
Commits on Jan 13, 2017
  1. Merge pull request #2250 from MrRaindrop/html5-feature-sync-module-call

    [html5] support sync call for callNative.
    Hanks10100 committed on GitHub Jan 13, 2017
  2. * [html5] add argument options.

    MrRaindrop committed Jan 13, 2017
  3. Merge pull request #2199 from MrRaindrop/html5-feature-module-event

    [html5] support module event.
    Hanks10100 committed on GitHub Jan 13, 2017
  4. * [html5] support sync call for callNative.

    MrRaindrop committed Jan 13, 2017
  5. Merge branch 'html5-feature-0.5' into html5-feature-0.10

    MrRaindrop committed Jan 13, 2017
Commits on Jan 11, 2017
  1. Update WXImageComponent.m

    delete redundant space
    cijianzy committed on GitHub Jan 11, 2017
  2. Merge branch 'dev' into develop_cijian_fix

    cijianzy committed on GitHub Jan 11, 2017
  3. Merge branch 'dev-release095' into dev

    sospartan committed Jan 11, 2017
  4. Merge pull request #2223 from alibaba/dev-release095

    Release 095
    sospartan committed on GitHub Jan 11, 2017
  5. Android feature urlconnection interceptor (#92)

    * * [android] support inspection for default http adapter
    
    * * [android] support inspection for default http adapter
    
    * * [android] ignore inspector temporary
    
    * + [android] add delegate
    
    * * [android] for codacy
    
    * * [android] add delegate interface
    
    * * [android] do nothing
    
    * * [android] add static nop delegate
    misakuo committed with sospartan Dec 30, 2016
  6. * [test] revert android ci command

    sospartan committed Jan 11, 2017
  7. Merge branch 'jsfm-feature-0.19' into dev-release095

    # Conflicts:
    #	circle.yml
    sospartan committed Jan 11, 2017
  8. Merge pull request #2220 from boboning/ios-jsframework-0.19.7

    ios update weexSDK Version to 0.9.5
    cxfeng1 committed on GitHub Jan 11, 2017
  9. Merge branch 'v0.10.0-stable' into dev-release095

    # Conflicts:
    #	README.md
    #	android/commons/src/main/java/com/alibaba/weex/commons/AbstractWeexActivity.java
    #	android/sdk/src/main/java/com/taobao/weex/appfram/storage/WXSQLiteOpenHelper.java
    #	android/sdk/src/main/java/com/taobao/weex/ui/component/list/WXListComponent.java
    #	examples/vanilla/index.js
    #	ios/sdk/WeexSDK/Sources/Component/WXImageComponent.m
    sospartan committed Jan 11, 2017
  10. Merge remote-tracking branch 'upstream/ios-feature-20170118' into ios…

    …-jsframework-0.19.7
    boboning committed Jan 11, 2017
  11. Merge pull request #2218 from acton393/ios-feature-20170118

    * [ios] update weexSDK version
    cxfeng1 committed on GitHub Jan 11, 2017