aboutsummaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2014-07-12Document JANSSON_BUILD_SHARED_LIBS CMake option2.6Petri Lehtinen1-1/+1
2014-04-30Check uint16_t and uint8_t support correctlyPetri Lehtinen3-2/+40
2014-02-16Merge pull request #164 from vincentbernat/fix/gitignorePetri Lehtinen1-0/+4
2014-02-16Merge pull request #163 from vincentbernat/fix/unpack-mix-optional-and-strictPetri Lehtinen2-5/+41
2014-02-16Merge pull request #162 from nmlgc/masterPetri Lehtinen1-6/+5
2014-02-12Make valgrind happyv2.6Petri Lehtinen1-0/+2
2014-02-12Fix feature checks to use correct __ATOMIC flagsPetri Lehtinen2-2/+2
2014-02-11Oops, ATOMIC_ACQ_REL is not a correct memmodel for __atomic_store_nPetri Lehtinen1-1/+1
2014-02-11jansson 2.6Petri Lehtinen6-7/+37
2014-02-11Document json_object_seed()Petri Lehtinen2-3/+60
2014-02-11CVE-2013-6401: Change hash function, randomize hashesPetri Lehtinen19-122/+873
2014-02-11expect "export" in test configsChip Salzenberg1-4/+3
2013-12-27github_commits.c: GitHub API v3 requires a User-Agent header2.5Petri Lehtinen1-0/+9
2013-12-13MergePetri Lehtinen1-1/+1
2013-12-13Include CMake specific files in release tarballsPetri Lehtinen1-1/+1
2013-11-14doc: Set all memory to zero in secure_freePetri Lehtinen2-2/+2
2013-09-23Add versionadded to the new json_pack() format specifiersPetri Lehtinen1-0/+6
2013-09-19jansson 2.5v2.5Petri Lehtinen6-8/+67
2013-09-19doc: Fix index type for json_array_foreach()Petri Lehtinen1-1/+1
2013-09-19Merge branch '2.4'Petri Lehtinen0-0/+0
2013-09-19Mention success first in json_load_callback_t docs2.4Petri Lehtinen1-4/+4
2013-09-19Clarified json_load_callback_t return value docsPhillip Howell1-2/+3
2013-09-19Merge branch '2.4'Petri Lehtinen0-0/+0
2013-09-19Mention success first in json_load_callback_t docsPetri Lehtinen1-3/+4
2013-09-16Mention success first in json_load_callback_t docsPetri Lehtinen1-4/+4
2013-09-16Clarified json_load_callback_t return value docsPhillip Howell1-2/+3
2013-08-27Merge pull request #134 from lano1106/masterPetri Lehtinen1-1/+1
2013-08-27Replace strcpy with memcpyOlivier Langlois1-1/+1
2013-08-14pack: Add format specifiers s#, + and +#Petri Lehtinen6-81/+267
2013-08-06doc: Add an example for circumventing problems with Windows heapsPetri Lehtinen1-1/+6
2013-07-27Fix memory leaks and warnings in github_commits.cPetri Lehtinen1-10/+22
2013-07-23Update copyrights for 2013Petri Lehtinen41-41/+41
2013-07-21Fix integer overflow in jsonp_strdup()Petri Lehtinen1-1/+6
2013-07-08Make the argument of json_deep_copy() constPetri Lehtinen3-13/+21
2013-07-01Merge pull request #128 from JoakimSoderberg/lex_unget_unsave_fixPetri Lehtinen1-1/+10
2013-06-26BUGFIX: Compilation error with -DNDEBUG defined.Joakim Soderberg1-1/+10
2013-06-25Merge pull request #127 from cryptobiote/masterPetri Lehtinen1-4/+19
2013-06-25Update CMakeLists.txtcryptobiote1-5/+5
2013-06-20Adding option for MSVC for those who are linking statically.cryptobiote1-1/+16
2013-06-13Merge pull request #125 from jjwchoy/masterPetri Lehtinen1-0/+2
2013-06-13Prevent unused-variable warningJason Choy1-0/+2
2013-06-12Tweak the JSON_DECODE_INT_AS_REAL test introduced in #123Petri Lehtinen1-6/+10
2013-06-12Fix indentation in docsPetri Lehtinen1-1/+1
2013-06-11Merge pull request #123 from jjwchoy/decode-ignore-intPetri Lehtinen5-5/+51
2013-06-11Using jsonp_strtod instead of casting to double to catch double overflowJason Choy3-5/+23
2013-06-11Changed :versionadded for JSON_DECODE_INT_AS_REAL docsJason Choy1-1/+1
2013-06-11Renamed flag to JSON_DECODE_INT_AS_REAL and added documentationJason Choy5-7/+18
2013-06-09Merge pull request #120 from paulharris/mine_pre_2.5Petri Lehtinen2-2/+8
2013-06-09Added a simple test for the JSON_DECODE_NO_INT optionJason Choy1-0/+12
2013-06-09Implemented a decode option to only decode numbers to reals and never integersJason Choy2-1/+6