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: cgreenhalgh/java-socket.io.client
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: afitz/java-socket.io.client
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.
  • 10 commits
  • 11 files changed
  • 4 contributors

Commits on May 16, 2012

  1. (use "git reset HEAD <file>..." to unstage) 

    new file:   LICENSE
Adding license so people can officially do whatever they want with this code
    Chris committed May 16, 2012
    Configuration menu
    Copy the full SHA
    a612a7b View commit details
    Browse the repository at this point in the history

  2. moving readme to main directory

    Chris committed May 16, 2012
    Configuration menu
    Copy the full SHA
    90e010a View commit details
    Browse the repository at this point in the history

Commits on Jun 22, 2012

  1. Ensure that we pass in the current endpoint (webSocket.getNamespace()… 

    …) when creating an IOMessage.
    @fredsa
    fredsa committed Jun 22, 2012
    Configuration menu
    Copy the full SHA
    ab68620 View commit details
    Browse the repository at this point in the history

  2. Merge pull request clwillingham#4 from fredsa/patch-1 

    Ensure that we pass in the current endpoint (webSocket.getNamespace())
    @clwillingham
    clwillingham committed Jun 22, 2012
    Configuration menu
    Copy the full SHA
    9be98b3 View commit details
    Browse the repository at this point in the history

Commits on Aug 12, 2012

  1. convert to gradle based build, move source from src to src/main/java, 

    get json dependency from maven central
    @afitz
    afitz committed Aug 12, 2012
    Configuration menu
    Copy the full SHA
    ab9bf81 View commit details
    Browse the repository at this point in the history

  2. remove build.xml

    @afitz
    afitz committed Aug 12, 2012
    Configuration menu
    Copy the full SHA
    8a854ed View commit details
    Browse the repository at this point in the history

  3. add example to new build, and move example source to a conventional 

    location
    @afitz
    afitz committed Aug 12, 2012
    Configuration menu
    Copy the full SHA
    67bb45f View commit details
    Browse the repository at this point in the history

  4. remove json.jar from lib directory

    @afitz
    afitz committed Aug 12, 2012
    Configuration menu
    Copy the full SHA
    693327c View commit details
    Browse the repository at this point in the history

  5. add send(JSONObject) overload, with an endpoint String param

    @afitz
    afitz committed Aug 12, 2012
    Configuration menu
    Copy the full SHA
    7f7ab05 View commit details
    Browse the repository at this point in the history

  6. merge endpoint/namespace fix from clwillingham, which uses webSocket.… 

    …getNamespace()
    @afitz
    afitz committed Aug 12, 2012
    Configuration menu
    Copy the full SHA
    61b9fb7 View commit details
    Browse the repository at this point in the history
Loading