erik/JSON-java
erik/JSON-java
1
0
Fork 0
mirror of https://github.com/ethauvin/JSON-java.git synced 2025-06-18 00:10:51 -07:00
Code Releases Activity
782 commits 11 branches 11 tags 1.9 MiB
Commit graph

782 commits

This branch
This branch
All branches
Author SHA1 Message Date
Sean Leary
25a87975be Update date of merge. 2016-03-05 15:20:20 -06:00
Sean Leary
2f3af56535 Update date of merge. 2016-03-05 15:19:45 -06:00
Sean Leary
26477f4e76 Merge pull request #203 from joeferner/to-java 
Adds JSONArray toList method and JSONObject toMap method
 2016-03-05 15:18:38 -06:00
Joe Ferner
f024b52108 Adds JSONArray toList method and JSONObject toMap method 2016-02-27 11:20:25 -05:00
Sean Leary
2657915293 Update README 
Include some text about 1.6 compatibility and add the latest release information.
 2016-02-13 22:26:45 -06:00
Sean Leary
07a0f60b6e Merge pull request #195 from publishing-systems/master 
Java 1.6 compatibility.
 2016-02-12 18:10:13 -06:00
skreutzer
60349ece54 Java 1.6 compatibility. 2016-02-08 23:30:27 -05:00
Sean Leary
8f16e065c5 Merge pull request #39 from johnjaylward/FixNegativeZero 
Fix negative zero
 2016-01-30 15:47:06 -06:00
Sean Leary
ba2585fe6c Version date 2016-01-30 15:45:11 -06:00
Sean Leary
93c79ca566 Version date 2016-01-30 15:44:41 -06:00
Sean Leary
62486fdea4 Version date 2016-01-30 15:44:08 -06:00
Sean Leary
97f1b2744f Merge pull request #188 from johnjaylward/FixNegativeZero 
Fix negative zero
 2016-01-30 15:42:34 -06:00
John J. Aylward
c2b3f2bdb1 adds back in the XML.stringToValue method, but deprecates it. 2016-01-27 15:21:11 -05:00
John J. Aylward
3007fc8ebe Removes custom XML stringToValue method in favor of keeping a consistent 
implementation in JSONObject
 2016-01-27 15:03:19 -05:00
John J. Aylward
974c09b22a Fixes typo in assert 2016-01-27 15:02:37 -05:00
John J. Aylward
bd958e0830 fixes formatting 2016-01-27 11:36:15 -05:00
John J. Aylward
67d888e9be Adds test cases to verify that -0 and -0.0 are processed as Double 2016-01-27 11:32:11 -05:00
John J. Aylward
39b1c0cb66 fixes error in -0 check 2016-01-27 10:45:23 -05:00
John J. Aylward
07b2d65e30 Fixes #187 -0 now returns as a double. 2016-01-27 10:39:31 -05:00
John J. Aylward
5b67330b71 Merge branch 'master' of https://github.com/douglascrockford/JSON-java 2016-01-27 09:53:03 -05:00
Sean Leary
d3b197b1b9 Merge pull request #37 from stleary/move-files-to-maven-friendly-dirs 
Move files to maven friendly dirs. Hope it works...
 2016-01-05 20:46:43 -06:00
stleary
706d898648 latest 2016-01-03 21:39:44 -06:00
stleary
ace08f1944 latest 2016-01-03 21:39:30 -06:00
Sean Leary
9950350f12 Merge pull request #186 from douglascrockford/update-readme-with-number-info 
Update README with number information
 2016-01-03 14:52:50 -06:00
Sean Leary
2b2fac3eb1 Broke up some overly long lines. 2016-01-01 16:17:30 -06:00
Sean Leary
e2a0bb16a2 Update README with number information 
See https://github.com/douglascrockford/JSON-java/issues/162
 2016-01-01 14:11:02 -06:00
stleary
280ce71285 tabs to spaces 2016-01-01 13:54:47 -06:00
Sean Leary
a971736f5b Update version string for https://github.com/douglascrockford/JSON-java/pull/170 2016-01-01 13:52:12 -06:00
Sean Leary
147343c51b Merge pull request #29 from johnjaylward/HandleArraysConsistently 
Add tests to verify arrays are handled consistently.
 2016-01-01 13:46:02 -06:00
Sean Leary
757fd566ab Merge pull request #170 from johnjaylward/HandleArraysConsistently 
Handle arrays consistently
 2016-01-01 13:44:57 -06:00
Sean Leary
e6f5047742 Merge pull request #185 from douglascrockford/write-with-indent-params 
change to public: write(writer, indentfactor, indent)
 2015-12-30 15:06:07 -06:00
Sean Leary
dc8c9e382d Merge pull request #35 from stleary/more-todo-cleanup 
clean up a few more todos
 2015-12-30 13:52:55 -06:00
stleary
871a3e46d7 clean up a few more todos 2015-12-30 13:50:51 -06:00
Sean Leary
4df6984233 Merge pull request #34 from stleary/util-cleanup 
util cleanup
 2015-12-30 01:03:31 -06:00
stleary
c88d06eede util cleanup 2015-12-30 01:01:43 -06:00
Sean Leary
0dc886d11b Merge pull request #33 from stleary/Fix-todos-and-cleanup 
Fix some todos, clean up some tests, improve coverage
 2015-12-30 00:03:37 -06:00
stleary
fc318a765c Fix some todos, clean up some tests, improve coverage 2015-12-30 00:00:58 -06:00
Sean Leary
0990f340db Update README.md 2015-12-30 00:00:14 -06:00
Sean Leary
4ddd6a19a7 Merge pull request #32 from stleary/refactor-test-classes-from-JSONObjectTest 
refactor test classes to their own modules
 2015-12-29 18:01:35 -06:00
stleary
7f83a51718 refactor test classes to their own modules 2015-12-29 17:56:43 -06:00
Sean Leary
95cf86688d Update README.md 2015-12-28 12:25:40 -06:00
Sean Leary
91fcd6092f Update README.md 2015-12-28 12:25:11 -06:00
Sean Leary
54cd97ded1 Update README.md 2015-12-28 12:24:46 -06:00
Sean Leary
633ab108e7 Update README.md 2015-12-28 12:22:29 -06:00
Sean Leary
472439546a Update README.md 2015-12-28 12:20:43 -06:00
Sean Leary
cfec741090 Merge pull request #31 from stleary/json-path-for-validation 
Replace util compare method with JsonPath
 2015-12-28 12:11:47 -06:00
stleary
abe421e6bb clean up code 2015-12-28 12:07:44 -06:00
stleary
48c872f66f Replace util compare method with JsonPath 2015-12-28 11:12:41 -06:00
stleary
7187006bae Replace util compare method with JsonPath 2015-12-27 17:01:42 -06:00
stleary
d329b6514c Replace util compare method with JsonPath 2015-12-27 15:17:01 -06:00