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

161 commits

This branch
This branch
All branches
Author SHA1 Message Date
Bence Erős
c1a789a70c adding missing license headers 2016-04-27 00:11:47 +02:00
Bence Erős
bff352791c removed @author tag from JSONPointerException 2016-04-27 00:10:45 +02:00
Bence Erős
5223aadd67 added some javadoc to JSONPointer 2016-04-27 00:10:06 +02:00
Bence Erős
45bd72c15d added JSONObject#query() and JSONPointer#query() methods 2016-04-26 23:48:14 +02:00
Bence Erős
792c6f6a9c improved failure handling 2016-04-26 23:32:15 +02:00
Bence Erős
5bee7e3b45 escape handling improvements & URL fragment notation handling 2016-04-26 23:00:16 +02:00
Bence Erős
612e41950c initial implementation of JSONPointer 2016-04-17 23:21:38 +02:00
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
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
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
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
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
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
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
a109f581c8 Update JSONArray.java 
Update version for https://github.com/douglascrockford/JSON-java/pull/153
 2015-10-29 18:25:27 -05:00
Sean Leary
33ae025e78 Update JSONObject.java 
Update version for https://github.com/douglascrockford/JSON-java/pull/153
 2015-10-29 18:24:46 -05:00
Sean Leary
564ad2c2fb Merge pull request #153 from treyerl/master 
JSONObject and JSONArray initialization for Map<?,?> and Collection<?>
 2015-10-29 18:07:43 -05:00
Sean Leary
dfd19116d3 Merge pull request #168 from douglascrockford/readme-maven-info 
Include latest Maven release information
 2015-10-29 18:04:31 -05:00
John J. Aylward
105426b53f Formatting 2015-10-26 18:35:40 -04:00
John J. Aylward
7886c96204 Changes JSONArray for loops to use the new iterators. 2015-10-26 18:30:41 -04:00
John J. Aylward
91c6f09be8 Modifies XML output to be handled the same for a native java array as well as a JSONArray. 2015-10-26 18:17:37 -04:00
stleary
a07d391eae Include latest Maven release information 2015-10-25 11:05:16 -05:00
Sean Leary
e7f4eb5f67 Set version date to match commit date, convert tabs to spaces. 2015-10-18 11:05:29 -05:00
Sean Leary
b0a9507add Merge pull request #159 from johnjaylward/FixExceptionInheritance 
Properly overrides the Exception class.
 2015-10-18 11:02:11 -05:00
Sean Leary
6757e04c0a Fix NullPointerException in XML.toString(object, tagName) 
Setting version date to match commit date.
 2015-10-18 10:23:43 -05:00