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: stleary/JSON-java
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: tsohr/JSON-java
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.
  • 17 commits
  • 70 files changed
  • 3 contributors

Commits on Nov 30, 2016

  1. HashMap ==> LinkedHashMap

    ROMAXTECHNOLOGY\Younghwan.kim committed Nov 30, 2016
    Configuration menu
    Copy the full SHA
    5dff875 View commit details
    Browse the repository at this point in the history

  2. doc fix

    ROMAXTECHNOLOGY\Younghwan.kim committed Nov 30, 2016
    Configuration menu
    Copy the full SHA
    ab2dd68 View commit details
    Browse the repository at this point in the history

  3. pom

    Younghwan committed Nov 30, 2016
    Configuration menu
    Copy the full SHA
    1790ba0 View commit details
    Browse the repository at this point in the history

  4. pom

    ROMAXTECHNOLOGY\Younghwan.kim committed Nov 30, 2016
    Configuration menu
    Copy the full SHA
    5055c90 View commit details
    Browse the repository at this point in the history

  5. pom developer

    ROMAXTECHNOLOGY\Younghwan.kim committed Nov 30, 2016
    Configuration menu
    Copy the full SHA
    98580ea View commit details
    Browse the repository at this point in the history

  6. pom scm

    ROMAXTECHNOLOGY\Younghwan.kim committed Nov 30, 2016
    Configuration menu
    Copy the full SHA
    a37f625 View commit details
    Browse the repository at this point in the history

  7. sonatype released 0.0.1

    Younghwan committed Nov 30, 2016
    Configuration menu
    Copy the full SHA
    44d909d View commit details
    Browse the repository at this point in the history

  8. README

    Younghwan committed Nov 30, 2016
    Configuration menu
    Copy the full SHA
    3b960d2 View commit details
    Browse the repository at this point in the history

  9. README

    Younghwan committed Nov 30, 2016
    Configuration menu
    Copy the full SHA
    e974f54 View commit details
    Browse the repository at this point in the history

Commits on Mar 8, 2021

  1. Merge branch 'master' of https://github.com/stleary/JSON-java 

    # Conflicts:
#	.gitignore
#	CDL.java
#	Cookie.java
#	CookieList.java
#	HTTP.java
#	HTTPTokener.java
#	JSONArray.java
#	JSONException.java
#	JSONML.java
#	JSONObject.java
#	JSONPointer.java
#	JSONPointerException.java
#	JSONStringer.java
#	JSONTokener.java
#	JSONWriter.java
#	Property.java
#	README
#	XML.java
#	XMLTokener.java
#	pom.xml
#	src/com/github/tsohr/CDL.java
#	src/com/github/tsohr/Cookie.java
#	src/com/github/tsohr/CookieList.java
#	src/com/github/tsohr/HTTP.java
#	src/com/github/tsohr/HTTPTokener.java
#	src/com/github/tsohr/JSONArray.java
#	src/com/github/tsohr/JSONException.java
#	src/com/github/tsohr/JSONML.java
#	src/com/github/tsohr/JSONObject.java
#	src/com/github/tsohr/JSONPointer.java
#	src/com/github/tsohr/JSONPointerException.java
#	src/com/github/tsohr/JSONString.java
#	src/com/github/tsohr/JSONStringer.java
#	src/com/github/tsohr/JSONTokener.java
#	src/com/github/tsohr/JSONWriter.java
#	src/com/github/tsohr/Property.java
#	src/com/github/tsohr/XML.java
#	src/com/github/tsohr/XMLTokener.java
#	src/main/java/org/json/CDL.java
#	src/main/java/org/json/Cookie.java
#	src/main/java/org/json/CookieList.java
#	src/main/java/org/json/HTTP.java
#	src/main/java/org/json/HTTPTokener.java
#	src/main/java/org/json/JSONArray.java
#	src/main/java/org/json/JSONException.java
#	src/main/java/org/json/JSONML.java
#	src/main/java/org/json/JSONObject.java
#	src/main/java/org/json/JSONPointer.java
#	src/main/java/org/json/JSONPointerException.java
#	src/main/java/org/json/JSONStringer.java
#	src/main/java/org/json/JSONTokener.java
#	src/main/java/org/json/JSONWriter.java
#	src/main/java/org/json/Property.java
#	src/main/java/org/json/XML.java
#	src/main/java/org/json/XMLTokener.java
    @tsohr
    tsohr committed Mar 8, 2021
    Configuration menu
    Copy the full SHA
    8e777e1 View commit details
    Browse the repository at this point in the history

  2. package renamed, receive update from stleary/JSON-java

    @tsohr
    tsohr committed Mar 8, 2021
    Configuration menu
    Copy the full SHA
    df884fc View commit details
    Browse the repository at this point in the history

  3. new HashMap() => new LinkedHashMap()

    @tsohr
    tsohr committed Mar 8, 2021
    Configuration menu
    Copy the full SHA
    3547406 View commit details
    Browse the repository at this point in the history

  4. fix test resource path

    @tsohr
    tsohr committed Mar 8, 2021
    Configuration menu
    Copy the full SHA
    612e860 View commit details
    Browse the repository at this point in the history

  5. Adding nullable functions

    @tsohr
    tsohr committed Mar 8, 2021
    Configuration menu
    Copy the full SHA
    5129bca View commit details
    Browse the repository at this point in the history

  6. Minimum java version set to 1.8

    @tsohr
    tsohr committed Mar 8, 2021
    Configuration menu
    Copy the full SHA
    5d0dd06 View commit details
    Browse the repository at this point in the history

  7. Update pipeline.yml 

    Dropping 1.6 and 1.7 compatibility
    @tsohr
    tsohr authored Mar 8, 2021
    Configuration menu
    Copy the full SHA
    eb5dc80 View commit details
    Browse the repository at this point in the history

  8. Update README.md

    @tsohr
    tsohr authored Mar 8, 2021
    Configuration menu
    Copy the full SHA
    5f3447f View commit details
    Browse the repository at this point in the history
Loading