aboutsummaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2013-06-17Make the argument of json_deep_copy() constpull-126Petri Lehtinen3-13/+21
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
2013-06-07Merge pull request #121 from jjwchoy/masterPetri Lehtinen1-2/+2
2013-06-07Added missing rv check - caught by clangJason Choy1-2/+2
2013-06-02Adjust CMakeLists.txt and .def: add _d postfix onto jansson_d.lib/dllPaul Harris2-2/+8
2013-05-21Don't shadow the stdlib function index() with arg namesPetri Lehtinen1-4/+4
2013-05-12Merge pull request #118 from dtgriscom/masterPetri Lehtinen4-2/+56
2013-05-12Fixed "comparison between signed and unsigned" warningDaniel Griscom2-2/+2
2013-05-12Removed (non-functioning) printfs from test codeDaniel Griscom1-6/+0
2013-05-12Added test cases and documentation for json_array_foreach()Daniel Griscom3-2/+57
2013-05-12Add json_array_foreach() #define, parallelling json_object_foreach()Daniel Griscom1-0/+5
2013-05-06Merge pull request #115 from JoakimSoderberg/cmake_pkgconfigPetri Lehtinen2-8/+32
2013-05-06Create and install the pkg-config file jansson.pc for CMake.Joakim Soderberg1-3/+23
2013-05-06Fix the cmake Sphinx find script.Joakim Soderberg1-5/+9
2013-04-29jansson:doc: modified incref docAndrei Epure1-1/+1
2013-04-29test:suites:api: modified error messageAndrei Epure1-1/+1
2013-04-29Merge pull request #112 from JoakimSoderberg/fpic_cmake_supportPetri Lehtinen3-55/+469
2013-04-25Fixed some minor issues.Joakim Soderberg2-46/+6
2013-04-24Added more detailed CMake documentation.Joakim Soderberg3-55/+505
2013-04-18Use -fPIC when possible.Joakim Soderberg1-0/+4
2013-04-15Document CMake build process, deprecate the VS2010 projectPetri Lehtinen1-0/+20
2013-04-15Tweak Android build documentationPetri Lehtinen1-2/+5
2013-04-15Merge branch 'master' of git://github.com/svic/janssonPetri Lehtinen4-0/+122
2013-04-15Merge branch '2.4'Petri Lehtinen1-1/+4
2013-04-15Fix the signature again, and also rest of the errorsPetri Lehtinen1-1/+4
2013-04-15Merge branch '2.4'Petri Lehtinen1-1/+1
2013-04-15Fix the signature of a test functionPetri Lehtinen1-1/+1
2013-04-15Merge branch '2.4'Petri Lehtinen2-0/+24
2013-04-15json_dump*(): Don't crash if json is NULL and JSON_ENCODE_ANY is setPetri Lehtinen2-0/+24
2013-04-11Add android doc.Garner Lee1-0/+5
2013-04-02Merge pull request #108 from Zillode/1edff47af38a2335f88300ee6dc437118f5a20ffPetri Lehtinen4-0/+11
2013-04-01Merge branch '2.4'Petri Lehtinen1-1/+1
2013-04-01Fix a typoPetri Lehtinen1-1/+1
2013-03-27Create Android.mk, preconfigured jansson_config.h and CleanSpec.mk for Androi...Garner Lee3-0/+117
2013-03-14Do not define _GNU_SOURCE is already definedLode Hoste4-0/+11
2013-03-14Fix a refleak in test/bin/json_process.cPetri Lehtinen1-0/+1
2013-03-14Remove trailing whitespacePetri Lehtinen2-44/+44
2013-03-14cmake: Add stripped testsPetri Lehtinen1-0/+4
2013-03-14Merge branch 'rebased_cmake_patch' of git://github.com/JoakimSoderberg/janssonPetri Lehtinen17-44/+781
2013-03-13Got rid of some warnings for unused variables.Joakim Söderberg1-6/+6
2013-03-13Add back the old ENV variabe approach to json_process.Joakim Söderberg6-19/+141
2013-03-09Merge branch '2.4'Petri Lehtinen2-0/+9