774 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Sean Leary	37f1f4c8ca	Merge pull request #83 from johnjaylward/FixNPE ... add test cases for null keys	2018-03-11 15:59:21 -05:00
Sean Leary	1c1ef5b211	Merge pull request #405 from johnjaylward/FixNPE ... Updates javadoc to match actual exceptions thrown.	2018-03-11 15:57:23 -05:00
John J. Aylward	193a3823b5	new test cases to support bean annotation	2018-03-11 16:56:07 -04:00
John J. Aylward	74b9a60f98	Adds annotation to support custom field names during Bean serialization	2018-03-11 16:28:24 -04:00
John J. Aylward	b63b976acb	Updates javadoc to match actual exceptions thrown. ... Also optimizes some boxing statements and returns.	2018-03-07 12:35:56 -05:00
John J. Aylward	aa5e80bc8d	add test cases for null keys	2018-03-07 12:11:17 -05:00
Pavel Polushkin	97e180444d	ignore Intellij Idea project files	2018-02-25 13:08:58 +03:00
Sean Leary	d402a99fd8	Merge pull request #400 from foldvari/master ... XML toJSONObject(Reader reader)	2018-02-10 11:09:26 -06:00
György Földvári	7073bc8c47	XML toJSONObject(Readre reader)	2018-02-04 18:43:35 +01:00
Sean Leary	fc881e2631	Merge pull request #82 from billdeng/master ... Correct the message to match the function	2018-02-02 23:56:36 -06:00
dengjianbao	cc2ed79e57	Correct the message to match the function	2018-02-02 22:54:08 +08:00
Sean Leary	61cdfefc36	Update README.md	2018-01-30 19:46:24 -06:00
Sean Leary	fbad2d0017	Merge pull request #392 from philippgille/patch-1 ... Remove wrong apostrophe	2018-01-20 03:39:07 -06:00
Philipp Gillé	15719886f7	Remove wrong apostrophe	2018-01-17 18:41:48 +01:00
Sean Leary	ca45b02ffc	Merge pull request #381 from fleipold/maven-badge ... Adding maven badge to readme	2018-01-14 10:18:46 -06:00
Felix Leipold	b6efbabc32	Making links markdown links	2017-11-17 12:47:49 +01:00
Felix Leipold	9eb8c27724	Marking up class and method names as inline code	2017-11-17 12:33:50 +01:00
Felix Leipold	195963357c	Make file names bold	2017-11-17 12:24:17 +01:00
Felix Leipold	28efdb4860	Moving Badge below title	2017-11-17 12:24:03 +01:00
Felix Leipold	c88653ca2e	History with fixed font	2017-11-14 17:23:53 +01:00
Felix Leipold	b3068d9fe4	Marking file and class names with single quotes	2017-11-14 17:23:52 +01:00
Felix Leipold	dba4afd0cf	Adding maven repo badge	2017-11-14 17:23:36 +01:00
Felix Leipold	26160e1619	Remove trailing whitespace	2017-11-14 17:23:36 +01:00
Felix Leipold	b7e2eee4d6	Renaming README to README.md	2017-11-14 17:23:36 +01:00
Sean Leary	77d142d494	Merge pull request #81 from johnjaylward/FixFalsePositiveSimilar ... Test cases to verify Similar methods	2017-11-11 16:12:26 -06:00
Sean Leary	28e09dc493	Merge pull request #380 from johnjaylward/FixFalsePositiveSimilar ... Fix for false positives in similar functions	2017-11-11 16:12:06 -06:00
John J. Aylward	dae88d7c5c	fix method names	2017-11-06 10:35:49 -05:00
John J. Aylward	4a4b2db8c1	fix for issue #379	2017-11-06 10:28:28 -05:00
John J. Aylward	08d93f3eb5	test cases for issue https://github.com/stleary/JSON-java/issues/379	2017-11-06 10:27:45 -05:00
Sean Leary	f16682bf44	Merge pull request #375 from johnjaylward/FixExceptionWrapping ... fixes wrapped exceptions	2017-11-02 21:42:29 -05:00
John J. Aylward	18952b5ac0	fixes wrapped exceptions	2017-11-02 22:32:24 -04:00
Sean Leary	bf26eba0d2	Merge pull request #80 from johnjaylward/UnclosedJSONArray ... New test to verify unclosed array	2017-11-02 20:03:00 -05:00
Sean Leary	d2a66a4287	Merge pull request #373 from johnjaylward/UnclosedJSONArray ... Fixes Unclosed json array stack overflow	2017-11-02 20:02:26 -05:00
Sean Leary	722003d479	Merge pull request #350 from johnjaylward/AndroidSupport ... Updates for supporting the Android API	2017-10-30 11:33:10 -05:00
Sean Leary	936db93445	Update README.md	2017-10-30 08:46:43 -05:00
Sean Leary	e0801befe5	Update README.md	2017-10-30 08:45:41 -05:00
Sean Leary	ee3aa03da1	Update README.md	2017-10-30 08:44:21 -05:00
Sean Leary	578a442ef7	Update README.md	2017-10-30 08:43:56 -05:00
John J. Aylward	dfa37a298f	Add more tests for unclosed arrays	2017-10-30 08:53:50 -04:00
John J. Aylward	bde6ba1c52	Updates exception expected message	2017-10-30 08:53:50 -04:00
John J. Aylward	52ecc89702	New test to verify unclosed array	2017-10-30 08:53:50 -04:00
John J. Aylward	ed8745cd63	fixes #372. ... Corrects behavior of unclosed arrays	2017-10-30 08:18:59 -04:00
John J. Aylward	057e0c75ca	Merge remote-tracking branch 'origin/master' into AndroidSupport	2017-10-27 13:28:20 -04:00
Sean Leary	cdf3cf7f81	Update README	2017-10-17 20:05:29 -05:00
Sean Leary	af3b7dc443	Merge pull request #79 from johnjaylward/FixXMLUnescape ... New tests for XML unescaping	2017-08-27 10:59:36 -05:00
Sean Leary	2565abdaaa	Merge pull request #362 from johnjaylward/FixXMLUnescape ... Fixes XML Unescaping	2017-08-27 10:59:26 -05:00
John J. Aylward	2713f2e2a4	Adds testing for unicode entities	2017-08-19 18:45:53 -04:00
John J. Aylward	de855c50aa	Fixes #361. ... * Removes unescape from the XML class calls * fixes bug with unescape method * moves unescape logic into the XMLTokener class for more consistency	2017-08-19 18:23:07 -04:00
John J. Aylward	cb61bbf720	New tests for XML unescaping	2017-08-19 18:19:22 -04:00
Sean Leary	4cb1ae802a	Merge pull request #360 from migueltt/tokener-fix ... Creating a JSONObject from a string that contains a duplicate key (any level) throws a JSONException that includes location	2017-08-17 21:30:01 -05:00