Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: easemob/web-im
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: easemob/web-im
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: release
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.
  • 18 commits
  • 3 files changed
  • 4 contributors

Commits on Jun 2, 2017

  1. release 1.4.11

    @wk3368
    wk3368 committed Jun 2, 2017
    Configuration menu
    Copy the full SHA
    464219b View commit details
    Browse the repository at this point in the history

  2. release branch

    @wk3368
    wk3368 committed Jun 2, 2017
    Configuration menu
    Copy the full SHA
    7003000 View commit details
    Browse the repository at this point in the history

  3. release 1.4.11

    @wk3368
    wk3368 committed Jun 2, 2017
    Configuration menu
    Copy the full SHA
    5c11c37 View commit details
    Browse the repository at this point in the history

  4. notify ok

    @wk3368
    wk3368 committed Jun 2, 2017
    Configuration menu
    Copy the full SHA
    7042294 View commit details
    Browse the repository at this point in the history

Commits on Jun 14, 2017

  1. Merge branch 'master' into release

    clock committed Jun 14, 2017
    Configuration menu
    Copy the full SHA
    eedf7aa View commit details
    Browse the repository at this point in the history

Commits on Jun 20, 2017

  1. Merge branch 'master' into release

    clock committed Jun 20, 2017
    Configuration menu
    Copy the full SHA
    98007cf View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into release

    clock committed Jun 20, 2017
    Configuration menu
    Copy the full SHA
    ffc12f8 View commit details
    Browse the repository at this point in the history

Commits on Jun 21, 2017

  1. Merge branch 'master' into release 

    * master:
  window.location.href = xxxx 如果 修改的的是href.search参数(?a=x&b=y)时候 , 如果遇到file://方式打开本地index.html会直接跳转页面，造成登录一直不成功 需要改成修改 href.hash 参数(#a=x&b=y)
  window.history.pushState在windows的chrome上有兼容性问题，需要统一改成window.location.href
    @wk3368
    wk3368 committed Jun 21, 2017
    Configuration menu
    Copy the full SHA
    32a825d View commit details
    Browse the repository at this point in the history

Commits on Jun 22, 2017

  1. Merge branch 'master' into release 

    * master:
  WebIM.utils.parseUri() -> WebIM.utils.parseHrefHash()
    @wk3368
    wk3368 committed Jun 22, 2017
    Configuration menu
    Copy the full SHA
    2967843 View commit details
    Browse the repository at this point in the history

Commits on Jun 26, 2017

  1. Merge branch 'master' into release

    clock committed Jun 26, 2017
    Configuration menu
    Copy the full SHA
    b3638d7 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'release' of https://github.com/easemob/web-im into release

    clock committed Jun 26, 2017
    Configuration menu
    Copy the full SHA
    97d805b View commit details
    Browse the repository at this point in the history

Commits on Jul 13, 2017

  1. Merge branch 'master' into release

    clock committed Jul 13, 2017
    Configuration menu
    Copy the full SHA
    90d429d View commit details
    Browse the repository at this point in the history

Commits on Jul 28, 2017

  1. Merge branch 'master' into release

    clock committed Jul 28, 2017
    Configuration menu
    Copy the full SHA
    2b44c30 View commit details
    Browse the repository at this point in the history

Commits on Aug 9, 2017

  1. conflict时正常释放资源

    clock committed Aug 9, 2017
    Configuration menu
    Copy the full SHA
    4228aaf View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into release

    clock committed Aug 9, 2017
    Configuration menu
    Copy the full SHA
    e0b0447 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' into release

    clock committed Aug 9, 2017
    Configuration menu
    Copy the full SHA
    60a4569 View commit details
    Browse the repository at this point in the history

Commits on Jan 9, 2018

  1. CLOUD-7799

    @HQ-610
    HQ-610 committed Jan 9, 2018
    Configuration menu
    Copy the full SHA
    213a427 View commit details
    Browse the repository at this point in the history

Commits on Jan 10, 2018

  1. Merge pull request #97 from monkeyMall/release 

    CLOUD-7799
    @HQ-610
    HQ-610 authored Jan 10, 2018
    Configuration menu
    Copy the full SHA
    1838e77 View commit details
    Browse the repository at this point in the history
Loading