1
0
Fork 0
mirror of https://github.com/ethauvin/JSON-java.git synced 2025-06-17 16:00:51 -07:00
Commit graph

769 commits

Author SHA1 Message Date
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
stleary
a5390a0685 Replace util compare method with JsonPath 2015-12-26 19:02:02 -06:00
stleary
c6204a9f01 Replace util compare method with JsonPath 2015-12-26 13:21:06 -06:00
stleary
8688494876 change to public, write(writer, indentfactor, indent) 2015-12-23 19:53:30 -06:00
John J. Aylward
48302592cf Merge branch 'master' of https://github.com/douglascrockford/JSON-java 2015-12-09 10:07:36 -05:00
Sean Leary
03dd662e72 Merge pull request #180 from netheril96/my
Remove executable bit
2015-12-09 01:08:47 -06:00
Siyuan Ren
23cf659730 Remove executable permission bit from file mode 2015-12-09 09:50:59 +08:00
John J. Aylward
ec8f649467 Merge branch 'master' of https://github.com/douglascrockford/JSON-java 2015-12-08 09:27:54 -05:00
Sean Leary
39e3ccc671 Update version
Update version after merge of https://github.com/douglascrockford/JSON-java/pull/179
2015-12-05 20:14:15 -06:00
Sean Leary
2ec538f420 Merge pull request #179 from andrew-fletcher/UpdateJavaDocForJSONOBject
Remove throws JSONException JavaDoc from 2 methods that do not throw this exception.
2015-12-05 20:11:40 -06:00
Andrew Fletcher
cadba9400c Update JavaDoc for JSONObject Constructors
Two JSONObject constructors incorrectly specify a @throws JSONException
tag in the JavaDoc for those constructors. Remove the relevant JavaDoc.
2015-12-02 10:49:54 -08:00
Sean Leary
44275e3b3c Merge pull request #175 from douglascrockford/release-20151123
Update readme for 20151123 release
2015-11-24 01:53:19 -06:00
stleary
5f2e77f9dd Update readme with proposed release information 2015-11-21 11:50:31 -06:00
Sean Leary
c578216844 Merge pull request #30 from stleary/confirmValueToStringFix
Fix tabs, add valueToString() test to JSONObjectTest
2015-10-31 04:00:52 -05:00