| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge "libjson: Initial version with support for android"HEADreplicant-6.0-0004-rc1replicant-6.0-0003replicant-6.0-0002replicant-6.0-0001stable/cm-13.0-ZNH5Ystable/cm-13.0-ZNH2KBstable/cm-13.0-ZNH2Kstable/cm-13.0-ZNH0Ecm-14.1cm-14.0cm-13.0 | Linux Build Service Account | 2015-03-31 | 54 | -2331/+219 |
|\ |
|
| * | libjson: Initial version with support for android | Ameya Thakur | 2015-03-06 | 54 | -2331/+219 |
* | | Merge "Merge remote-tracking branch 'remotes/origin/caf/json-c/master'" | Linux Build Service Account | 2015-03-29 | 94 | -0/+9820 |
|\| |
|
| * | Merge remote-tracking branch 'remotes/origin/caf/json-c/master' | Ameya Thakur | 2015-03-06 | 94 | -0/+9820 |
|/| |
|
| * | Merge pull request #153 from LeSpocky/doc | Eric Haszlakiewicz | 2014-09-13 | 1 | -0/+5 |
| |\ |
|
| | * | improve doc for json_object_to_json_string() | Alexander Dahl | 2014-08-18 | 1 | -0/+5 |
| * | | Merge pull request #151 from mjchinn/json_type-comma | Eric Haszlakiewicz | 2014-09-13 | 1 | -3/+3 |
| |\ \ |
|
| | * | | Remove json_type enum trailing comma | Michael J. Chinn | 2014-08-10 | 1 | -3/+3 |
| | |/ |
|
| * | | Merge pull request #150 from ams-cs/master | Eric Haszlakiewicz | 2014-09-13 | 1 | -0/+3 |
| |\ \ |
|
| | * | | Fix build using MinGW. | Andrew Stubbs | 2014-08-04 | 1 | -0/+3 |
| | |/ |
|
| * | | Merge pull request #141 from AlexandruCostache/master | Eric Haszlakiewicz | 2014-09-13 | 1 | -5/+2 |
| |\ \
| | |/
| |/| |
|
| | * | Removed duplicate check in random_seed test - bug #140 | Alexandru Costache | 2014-07-04 | 1 | -5/+2 |
| |/ |
|
| * | Move the json_min() and json_max() macros to json_util.h and mark everything ... | Eric Haszlakiewicz | 2014-05-04 | 7 | -17/+34 |
| * | Fix the definition of the error_description() macro in bits.h now that json_t... | Eric Haszlakiewicz | 2014-05-03 | 1 | -1/+1 |
| * | Check for failures when allocating memory; return NULL and set errno=ENOMEM i... | Eric Haszlakiewicz | 2014-04-19 | 1 | -1/+26 |
| * | Reformat some code in json_object.c | Eric Haszlakiewicz | 2014-04-19 | 1 | -198/+231 |
| * | Add an empty README file to placate autoconf. | Eric Haszlakiewicz | 2014-04-19 | 1 | -0/+0 |
| * | Fix minor typo in README file. | Eric Haszlakiewicz | 2014-04-19 | 1 | -1/+1 |
| * | Merge pull request #133 from haneefmubarak/patch-1 | Eric Haszlakiewicz | 2014-04-19 | 2 | -45/+63 |
| |\ |
|
| | * | Update README.md | Haneef Mubarak | 2014-04-12 | 1 | -13/+14 |
| | * | Update and rename README to README.md | Haneef Mubarak | 2014-04-12 | 2 | -45/+62 |
| * | | Merge pull request #132 from pkoretic/master | Eric Haszlakiewicz | 2014-04-19 | 1 | -2/+0 |
| |\ \
| | |/
| |/| |
|
| | * | Remove unused variable 'size' | Petar Koretić | 2014-04-11 | 1 | -2/+0 |
| * | | Update the release checklist to include calculating the tarball checksums and... | Eric Haszlakiewicz | 2014-04-11 | 1 | -0/+15 |
| |/ |
|
| * | Bump versions up to 0.12.99 since a 0.12 release was just created. | Eric Haszlakiewicz | 2014-04-10 | 5 | -6/+10 |
| * | Update the ChangeLog with the changes for the 0.12 release. | Eric Haszlakiewicz | 2014-04-10 | 2 | -2/+34 |
| * | Patch to address the following issues: | Michael Clark | 2014-04-09 | 11 | -13/+691 |
| * | Eliminate the deprecated mc_abort() function and MC_ABORT macro. | Eric Haszlakiewicz | 2014-03-22 | 2 | -23/+0 |
| * | Make the json_tokener_errors array local. It has been deprecated for a while... | Eric Haszlakiewicz | 2014-03-22 | 2 | -10/+1 |
| * | Simplify the tests Makefile to avoid repeating the name of each test. | Eric Haszlakiewicz | 2014-03-22 | 2 | -18/+20 |
| * | Rename the "test_case" test to "test_charcase" to make it slightly less confu... | Eric Haszlakiewicz | 2014-03-22 | 5 | -27/+5 |
| * | Fix warnings from autoconf about "...no AC_LANG_SOURCE call detected..." by a... | Eric Haszlakiewicz | 2014-03-22 | 1 | -2/+2 |
| * | Issue #103: allow Infinity and -Infinity to be parsed. | Eric Haszlakiewicz | 2014-03-22 | 7 | -2/+97 |
| * | Merge pull request #123 from fingon/use-NAN-if-available | Eric Haszlakiewicz | 2014-03-22 | 1 | -1/+6 |
| |\ |
|
| | * | nan function requires -lm on some platforms; use of NAN is better, if available. | Markus Stenberg | 2014-03-18 | 1 | -1/+6 |
| |/ |
|
| * | Issue#102 - add support for parsing "NaN". | Eric Haszlakiewicz | 2014-03-09 | 6 | -10/+44 |
| * | Issue#114: check for the presence of isnan and isinf, and provide compat macr... | Eric Haszlakiewicz | 2014-03-02 | 4 | -1/+42 |
| * | Merge pull request #121 from TazeTSchnitzel/LowercaseLiterals | Eric Haszlakiewicz | 2014-02-12 | 3 | -0/+53 |
| |\ |
|
| | * | Merge branch 'master' into LowercaseLiterals | Andrea Faulds | 2014-02-12 | 3 | -0/+53 |
| | |\ |
|
| | | * | Missing tests | Andrea Faulds | 2014-02-12 | 3 | -0/+53 |
| * | | | Merge commit '89535bb' | Eric Haszlakiewicz | 2014-02-11 | 1 | -0/+1 |
| |\ \ \ |
|
| | * | | | build: call AM_PROG_CC_C_O as requested by autoreconf | Ross Burton | 2013-11-18 | 1 | -0/+1 |
| | | |/
| | |/| |
|
| * | | | Merge pull request #112 from TazeTSchnitzel/LowercaseLiterals | Eric Haszlakiewicz | 2014-02-11 | 2 | -33/+50 |
| |\ \ \
| | | |/
| | |/| |
|
| | * | | Only allow lowercase literals in STRICT mode | Andrea Faulds | 2013-11-14 | 2 | -33/+50 |
| | |/ |
|
| * | | Fix Issue #111: Fix off-by-one error when range checking the input to json_to... | Eric Haszlakiewicz | 2014-02-11 | 1 | -1/+1 |
| * | | Merge pull request #109 from kdopen/use_strtod | Eric Haszlakiewicz | 2014-02-11 | 1 | -1/+32 |
| |\ \ |
|
| | * | | Avoid potential overflow in json_object_get_double | Keith Derrick | 2013-10-01 | 1 | -1/+32 |
| | |/ |
|
| * | | Merge branch 'ebassi-master' | Eric Haszlakiewicz | 2014-02-11 | 2 | -1/+27 |
| |\ \ |
|
| | * \ | Merge branch 'master' of https://github.com/ebassi/json-c into ebassi-master | Eric Haszlakiewicz | 2014-02-11 | 2 | -1/+27 |
| | |\ \ |
|
| | | * | | Add a check for the -Bsymbolic-functions linker flag | Emmanuele Bassi | 2013-09-17 | 2 | -2/+28 |
| | | |/ |
|