aboutsummaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2018-02-11Merge pull request #396 from coreyfarrell/2.11v2.112.11Petri Lehtinen6-7/+49
2018-02-09jansson 2.11Corey Farrell6-7/+49
2018-02-09Merge pull request #395 from akheron/doc-utf-8Petri Lehtinen1-3/+15
2018-02-09Merge pull request #368 from AmeyaVS/cmake_build_fixPetri Lehtinen1-2/+3
2018-02-09Merge pull request #381 from phst/end-of-file-error-codePetri Lehtinen2-0/+12
2018-02-09Merge pull request #380 from phst/doc-error-codePetri Lehtinen1-0/+4
2018-02-09Document encoding requirements for callbacksdoc-utf-8Petri Lehtinen1-3/+15
2018-02-09Merge pull request #393 from akheron/json_sprintfPetri Lehtinen8-1/+78
2018-02-09Add json_sprintf and json_vsprintfjson_sprintfPetri Lehtinen8-1/+78
2018-02-08Merge pull request #389 from coreyfarrell/threadsafetyPetri Lehtinen9-78/+118
2018-02-08Merge pull request #1 from akheron/threadsafetyCorey Farrell3-15/+27
2018-02-08Clarify thread safety docs, rename JANSSON_THREAD_SAFEthreadsafetyPetri Lehtinen3-15/+27
2018-02-01Docs: Update information on thread safety.Corey Farrell2-17/+12
2018-02-01json_dump: Fix thread safety issue.Corey Farrell3-48/+48
2018-01-29Use thread-safe reference counting if supported by the compiler.Corey Farrell4-7/+40
2017-12-20Use a more specific error code for premature end of inputPhilipp Stephani2-0/+12
2017-12-18document that json_error_code will be added in version 2.11Philipp Stephani1-0/+4
2017-12-16Merge pull request #374 from coreyfarrell/always-stealPetri Lehtinen4-25/+60
2017-12-13apiref: Clarify documentation for unpack `O` format.Corey Farrell1-1/+4
2017-12-13json_object_iter_set_new: Fix error branch leak.Corey Farrell1-0/+3
2017-12-13json_pack: Enable more complete stealing of references.Corey Farrell2-24/+53
2017-12-13Merge pull request #375 from phniix/373_upstream_typo_in_cmakelistsPetri Lehtinen1-1/+1
2017-12-13Merge pull request #377 from coreyfarrell/extra-refsPetri Lehtinen1-6/+2
2017-12-13Merge pull request #378 from phst/docPetri Lehtinen1-0/+10
2017-12-10Document that length-aware string functions have been added in 2.7Philipp Stephani1-0/+10
2017-11-14Remove extra reference actions in parsers.Corey Farrell1-6/+2
2017-11-07Fixes akheron/jansson#373Joe Hura1-1/+1
2017-11-07Fix a compile error on macOS clangPetri Lehtinen1-1/+1
2017-10-29Fix generated `pkg-config` file using cmake.Ameya Vikram Singh1-2/+3
2017-10-09Merge pull request #365 from phst/bug352Petri Lehtinen10-136/+283
2017-10-03Use last byte of error text as numeric error codePhilipp Stephani10-136/+283
2017-08-19Make json_equal() const-correctPetri Lehtinen2-9/+9
2017-08-19Work around gcc's -Wimplicit-fallthroughPetri Lehtinen1-11/+11
2017-08-06Merge pull request #359 from sanjay24/masterPetri Lehtinen1-1/+3
2017-08-05json_dump_file API returns success even when fclose fails (consider disk full...Sanjay Kumar1-1/+3
2017-07-20Merge pull request #356 from hellojaewon/masterPetri Lehtinen1-2/+2
2017-07-16Fix typo최재원1-2/+2
2017-04-19Merge pull request #339 from npmccallum/optpackPetri Lehtinen3-2/+64
2017-04-19Enable optional object/array members in json_pack()Nathaniel McCallum3-2/+64
2017-04-13Merge commit '1b8bebf0bf8f1c0c3d92faf67a830bf8448897ed'2.10Petri Lehtinen1-1/+1
2017-04-13Allow forward declaring json_error_t valuesPetri Lehtinen1-1/+1
2017-04-12build: Use Autoconf macro @includedir@ for jansson.pc.Mathieu Lirzin1-1/+1
2017-03-29Merge pull request #336 from akheron/issue-333Petri Lehtinen1-1/+1
2017-03-29CMakeLists.txt: Remove extra parenthesisPetri Lehtinen1-1/+1
2017-03-02jansson 2.10v2.10Nathaniel McCallum6-7/+32
2017-03-02Merge pull request #329 from npmccallum/embedPetri Lehtinen4-6/+52
2017-02-27Add JSON_EMBED encoding flagNathaniel McCallum4-6/+52
2017-01-31Merge pull request #328 from npmccallum/masterPetri Lehtinen8-7/+243
2017-01-27Implement json_dumpfd() and json_loadfd()Nathaniel McCallum8-7/+166
2017-01-26Implement json_dumpb()Nathaniel McCallum5-0/+77