Commits

Commit history

1. Commits on Nov 14, 2011

   • Minor update to Generics

     

     zb939r

     committed
     6878b3fView commit details

     Copy full SHA for 6878b3f

     Browse repository at this point
2. Commits on Oct 29, 2011

   • update readme to reflect the conversions to Java-5+ including

     Show description for 320113b
     ansell

     committed
     320113bView commit details

     Copy full SHA for 320113b

     Browse repository at this point

   • modify cherrypicked rakefile from @jamesottaway

     Show description for 2de546c
     ansell

     committed
     2de546cView commit details

     Copy full SHA for 2de546c

     Browse repository at this point

   • wrote a few rake files to compile and jar the source files

     

     James Ottaway

     authored and

     ansell

     committed
     1fd267bView commit details

     Copy full SHA for 1fd267b

     Browse repository at this point

   • remove dist jar file properly

     ansell

     committed
     d52203dView commit details

     Copy full SHA for d52203d

     Browse repository at this point

   • remove jar file

     ansell

     committed
     067a6ffView commit details

     Copy full SHA for 067a6ff

     Browse repository at this point

   • cherrypick from @stellaeof 48b3bd34d159b072aad91effb0a30d438ba3bf30

     ansell

     committed
     af824b2View commit details

     Copy full SHA for af824b2

     Browse repository at this point

   • complete the merge

     ansell

     committed
     89107b3View commit details

     Copy full SHA for 89107b3

     Browse repository at this point

   • update StringBuffer to StringBuilder

     ansell

     committed
     aa780f9View commit details

     Copy full SHA for aa780f9

     Browse repository at this point

   • update JSONException to modern style

     ansell

     committed
     b684a5eView commit details

     Copy full SHA for b684a5e

     Browse repository at this point

   • cherrypick from

     Show description for cbb88d3
     ansell

     committed
     cbb88d3View commit details

     Copy full SHA for cbb88d3

     Browse repository at this point

   • Add GNUMakefile to make it easy to build, etc.

     

     Dyrcona

     authored and

     ansell

     committed
     60c17cfView commit details

     Copy full SHA for 60c17cf

     Browse repository at this point

   • Merge remote branch 'upstream/master'

     ansell

     committed
     0005c32View commit details

     Copy full SHA for 0005c32

     Browse repository at this point
3. Commits on Oct 25, 2011

   • extra long integer test

     douglascrockford

     committed
     df6190fView commit details

     Copy full SHA for df6190f

     Browse repository at this point
4. Commits on Oct 24, 2011

   • corrected test

     douglascrockford

     committed
     d34be7fView commit details

     Copy full SHA for d34be7f

     Browse repository at this point
5. Commits on Oct 16, 2011

   • non-number numbers

     douglascrockford

     committed
     88f27f3View commit details

     Copy full SHA for 88f27f3

     Browse repository at this point
6. Commits on Oct 5, 2011

   • Bad XML

     douglascrockford

     committed
     3e3951fView commit details

     Copy full SHA for 3e3951f

     Browse repository at this point

   • Bad XML

     douglascrockford

     committed
     90e62b0View commit details

     Copy full SHA for 90e62b0

     Browse repository at this point

   • hygiene

     douglascrockford

     committed
     294c16bView commit details

     Copy full SHA for 294c16b

     Browse repository at this point
7. Commits on Oct 4, 2011

   • Merge remote branch 'douglascrockford/master'

     Show description for 3935455
     ansell

     committed
     3935455View commit details

     Copy full SHA for 3935455

     Browse repository at this point
8. Commits on Oct 3, 2011

   • number

     douglascrockford

     committed
     e13de0bView commit details

     Copy full SHA for e13de0b

     Browse repository at this point
9. Commits on Sep 7, 2011

   • add **/Test.java to ensure that it is matched after copying it to the build directory

     ansell

     committed
     5f459ebView commit details

     Copy full SHA for 5f459eb

     Browse repository at this point

   • Merge pull request #1 from ciaranj/master

     Show description for fa7b81f
     ansell

     committed
     fa7b81fView commit details

     Copy full SHA for fa7b81f

     Browse repository at this point

   • Add missing imports

     ciaranj

     committed
     fcd3ef0View commit details

     Copy full SHA for fcd3ef0

     Browse repository at this point

   • Add build & dist to .gitignore

     ciaranj

     committed
     ac8b3b8View commit details

     Copy full SHA for ac8b3b8

     Browse repository at this point

   • Update build script to ignore the test class unless explicitly required. (As Junit isn't bundled this allows people to build out of the box)

     ciaranj

     committed
     17eb755View commit details

     Copy full SHA for 17eb755

     Browse repository at this point
10. Commits on Aug 29, 2011

    • manually apply patch from https://github.com/douglascrockford/JSON-java/commit/5a4fb657a8eca50e612b772611a2439ff23dab50#diff-0

      ansell

      committed
      440c672View commit details

      Copy full SHA for 440c672

      Browse repository at this point
11. Commits on Aug 25, 2011

    • JSONArray.optString when NULL

      douglascrockford

      committed
      5a4fb65View commit details

      Copy full SHA for 5a4fb65

      Browse repository at this point
12. Commits on Aug 10, 2011

    • Merge branch 'master' of git@github.com:ansell/JSON-java.git

      ansell

      committed
      982d585View commit details

      Copy full SHA for 982d585

      Browse repository at this point

    • manually merge generics changes from https://github.com/dslmeinte/JSON-java/commit/2e2bd9d343cbb56592f0aa4fd3ede5ceaebe6644

      ansell

      committed
      55c2287View commit details

      Copy full SHA for 55c2287

      Browse repository at this point

    • * Added an And build file

      

      Aidan Delaney

      authored and

      ansell

      committed
      063db7fView commit details

      Copy full SHA for 063db7f

      Browse repository at this point
13. Commits on Aug 9, 2011

    • make JSONObject use ordered map so that tests won't randomly fail

      Show description for 316223d
      ansell

      committed
      316223dView commit details

      Copy full SHA for 316223d

      Browse repository at this point

    • add .gitignore file for eclipse and maven directories

      ansell

      committed
      401fcdfView commit details

      Copy full SHA for 401fcdf

      Browse repository at this point

    • add maven pom.xml file

      ansell

      committed
      e6522baView commit details

      Copy full SHA for e6522ba

      Browse repository at this point
14. Commits on May 22, 2011

    • Remove bad tests.

      douglascrockford

      committed
      ce2f5edView commit details

      Copy full SHA for ce2f5ed

      Browse repository at this point