Commit Graph

  • 042527aae9 Amend the fix for issue #282 Administrator 2016-05-02 14:54:07 +0200
  • f0949366bb Amend the fix for issue #282 Administrator 2016-05-02 14:26:22 +0200
  • e62bce8761 Amend the fix for issue #282 Administrator 2016-05-02 14:08:49 +0200
  • 2e74e05370 Fix for issue #282 Administrator 2016-05-02 13:59:26 +0200
  • 087ed94c45 Change readthedocs domain Petri Lehtinen 2016-04-28 07:04:00 +0300
  • 9961e4af47 add auto_json_decref macro Steffen Jaeckel 2016-03-25 13:37:17 +0100
  • a3daab7e63 add json_object_update_missing_incref dancal 2016-03-22 12:41:32 +0900
  • 006638a6a2 Merge pull request #275 from Mephistophiles/master Petri Lehtinen 2016-03-03 07:26:20 +0200
  • 130c2fff31 Fix proto in doc Maxim Zhukov 2016-03-02 17:37:09 +0300
  • 24fa13daad VAPI: Error should be a struct, not a class; fixed ownership in getters Marcin Lewandowski 2016-03-02 11:38:22 +0100
  • cbb146156e VAPI: Fixed memory handling in case of Error Marcin Lewandowski 2016-02-28 12:54:38 +0100
  • cca87ce46b VAPI: Fixed how references to error are passed, added loadf and dumpf Marcin Lewandowski 2016-02-27 19:59:38 +0100
  • 998ab3fc9f Added initial version of jansson VAPI Marcin Lewandowski 2016-02-27 19:39:56 +0100
  • cfd817895a doc: Fix a typo Petri Lehtinen 2016-02-25 07:29:28 +0200
  • ac97e0bf79 json_pack(): Document s?, o?, O? Petri Lehtinen 2016-02-25 07:23:53 +0200
  • 1927eeb4b4 Merge pull request #270 from Alteous/master Petri Lehtinen 2016-02-25 07:13:04 +0200
  • c8361441fe Revised commit. David Harvey-Macaulay 2016-02-23 19:33:52 +0000
  • 107cfe9499 Implemented json_pack() format specifiers 's?', 'o?', and 'O?'. David Harvey-Macaulay 2016-02-22 21:32:20 +0000
  • 811965b475 Implemented json_pack() format specifiers 's?', 'o?', and 'O?'. David Harvey-Macaulay 2016-02-22 21:32:20 +0000
  • 18053cfdb9 * Fixed uninit variables * Removed check less 0 with unsigned Mephistopheles 2016-02-07 14:25:00 +0300
  • e08101704c Merge pull request #268 from wingyplus/fix-libdir-pkg-config Petri Lehtinen 2016-02-11 07:29:57 +0200
  • c17be5870b Merge pull request #267 from Mephistophiles/master Petri Lehtinen 2016-02-11 07:26:00 +0200
  • 9d71d006cc Fix libdir is wrong when compile with cmake Thanabodee Charoenpiriyakij 2016-02-10 18:33:48 +0700
  • b698ca13de [Optimized functions] Optimized json_equal, json_delete, json_copy, json_deep_copy Replaced if to switch Removed unnecessary check for NULL. Maxim Zhukov 2016-02-03 17:34:54 +0300
  • 0cd282c580 Merge 5e994c7223 into 0f50bb10b6 Nicolas Mora 2015-12-30 21:31:24 +0000
  • 5e994c7223 Add json_search function, that search if a json element exists within another json element Nicolas Mora 2015-12-30 16:27:34 -0500
  • 0f50bb10b6 Fix a typo Petri Lehtinen 2015-12-23 08:18:27 +0200
  • e6b60da043 Update CHANGES Petri Lehtinen 2015-12-23 08:17:18 +0200
  • 89f4c15e6d Change doc version to 2.8-dev Petri Lehtinen 2015-12-23 07:40:57 +0200
  • 1c2e707b34 Fix a comment Petri Lehtinen 2015-12-23 07:40:02 +0200
  • 52015cf35c Merge pull request #263 from wking/display-first-unrecognized-key Petri Lehtinen 2015-12-23 07:38:03 +0200
  • 1d513d063a pack_unpack: List unrecognized keys in strict unpacking W. Trevor King 2015-12-17 16:56:22 -0800
  • 581d5b899c Add versionadded to json_get_alloc_funcs doc Petri Lehtinen 2015-12-22 13:05:28 +0200
  • 4f49c07781 Merge pull request #264 from npmccallum/master Petri Lehtinen 2015-12-22 13:01:36 +0200
  • 245e532934 Add json_get_alloc_funcs() to allow alloc function fetching Nathaniel McCallum 2015-12-21 11:46:32 -0500
  • 872a7ed12d Merge 5712d55d50 into e44b2231b5 Joakim Söderberg 2015-10-20 16:30:02 +0000
  • 915c879c3a Merge 41148e6aa6 into e44b2231b5 Claudi Martinez 2015-10-20 09:16:35 +0000
  • e44b2231b5 doc: Fix a broken link Petri Lehtinen 2015-10-20 10:21:08 +0300
  • 40bd71f064 Merge pull request #257 from denis2342/master Petri Lehtinen 2015-10-14 08:54:37 +0300
  • 067dc50efe changed code from while to do/while Denis Ahrens 2015-10-12 06:04:22 +0200
  • 4876bda857 Merge pull request #255 from gonzzor/snprintf_dump.c Petri Lehtinen 2015-10-05 15:43:45 +0300
  • e89538f685 Format %x expects unsigned int, not int Jonas Jonsson 2015-10-05 14:00:44 +0200
  • f7331c7194 Use sizeof(seq) instead of magic number 13 Jonas Jonsson 2015-10-05 13:59:09 +0200
  • 8529b95187 Merge ef204d779c into 02464862ed Michael C 2015-09-16 05:25:24 +0000
  • 24063b9316 Merge e19f2ffa63 into 02464862ed Henrik S. Gaßmann 2015-09-10 22:52:29 +0000
  • e19f2ffa63 FIX CMake snprintf DETECTION Henrik S. Gaßmann 2015-09-11 00:45:53 +0200
  • 02464862ed Merge pull request #248 from phoenix0428/patch-1 Petri Lehtinen 2015-09-08 21:13:08 +0300
  • db0213ae56 Merge pull request #252 from OlehKulykov/master Petri Lehtinen 2015-09-01 21:13:25 +0300
  • 8f2298bad8 Buildable with MS Compiler version >= 1900 OlehKulykov 2015-08-31 23:43:29 +0200
  • 4c4f692bd6 Add json_object_foreach_safe Petri Lehtinen 2015-08-26 17:32:55 +0300
  • 875b78dc97 Update test_memory_funcs.c Kinam Kim 2015-08-13 16:44:31 +0900
  • ef204d779c added json_set_flags() method to EXPORTS Michael Chen 2015-07-07 11:03:12 -0400
  • 5487784ef4 updated initialization of static json_t Michael Chen 2015-07-06 16:32:50 -0400
  • c833e08ec0 Merge remote-tracking branch 'origin/akamai_dev_branch' Michael Chen 2015-07-06 15:45:31 -0400
  • e70b9712c7 fixed typos and ready for pull request Michael Chen 2015-07-06 15:45:00 -0400
  • ec1d8280ec Merge branch 'refs/heads/akamai_dev_branch' Michael Chen 2015-07-06 15:35:52 -0400
  • 1ba9d329d2 made flag field plural because it is a bitfield Michael Chen 2015-07-06 15:29:13 -0400
  • 0e115ea1a2 Revert "Revert "Revert "Added is_modified feature to json_t struct""" Michael Chen 2015-07-06 15:21:38 -0400
  • 2b092a017e Changed to unsigned char to avoid library issues Michael Chen 2015-07-06 15:21:04 -0400
  • 580281edcd added return value for success Michael Chen 2015-07-06 13:53:01 -0400
  • 982c2664a8 fixed to uint32 param Michael Chen 2015-07-06 13:50:25 -0400
  • c34cbc5a67 Revert "Revert "Added is_modified feature to json_t struct"" Michael Chen 2015-07-06 13:48:09 -0400
  • 9f04578948 Added getter and changed to unsigned 32 int Michael Chen 2015-07-06 13:47:53 -0400
  • a54b12a45d Revert "Added is_modified feature to json_t struct" Michael Chen 2015-07-06 13:41:34 -0400
  • 31a17a614e Changed bool 'is_modified' field to int 'flag' field Michael Chen 2015-07-06 11:57:55 -0400
  • 4d9524e54c Added is_modified feature to json_t struct Michael Chen 2015-07-06 11:40:13 -0400
  • 7e60fbe049 Added is_modified feature to json_t struct Michael Chen 2015-07-06 11:38:03 -0400
  • 99e7ec4e15 adding (untested) JSON_SEMIPRETTY flag for dumping with some but not systematic indentations Basile Starynkevitch 2015-05-28 11:05:01 +0200
  • fef27e6d3e Merge branch '2.7' Petri Lehtinen 2015-05-19 08:54:13 +0300
  • 1dab656dee doc: Copying doesn't preserve key insertion order 2.7 Petri Lehtinen 2015-05-19 08:48:52 +0300
  • 69678aaa35 doc: Copying doesn't preserve key insertion order Petri Lehtinen 2015-05-19 08:48:52 +0300
  • d384acd706 Merge pull request #234 from flok99/master Petri Lehtinen 2015-05-04 09:00:26 +0300
  • 5d42e1520a Optimized dump_indent to reduce the number of fwrite calls. Folkert van Heusden 2015-05-01 15:18:53 +0200
  • d8753db4ac Merge pull request #233 from haldean/master Petri Lehtinen 2015-04-30 10:43:39 +0300
  • 95dd927857 use snprintf and strncpy in place of sprintf and strcpy Haldean 2015-04-30 00:11:25 -0700
  • 459a79ce10 US1604, TA3325: Streamline makefiles Phillip Howell 2015-04-28 15:54:57 -0500
  • b469f07120 Merge pull request #5 from pkhpkh/refcount-mutex Chris Koenig 2015-04-23 11:13:06 -0500
  • de30721f63 TOOLS: Add mutex protection for jansson reference counts Phillip Howell 2015-04-23 10:29:24 -0500
  • 76760011ff Don't crash when building documentation man pages Petri Lehtinen 2015-03-07 09:14:05 +0200
  • 41148e6aa6 Updated jansson.def for exporting function json_set_alloc_funcs_arg() claudi 2015-03-05 12:37:19 +0100
  • da2db463f4 Added support for passing a user argument to custom memory allocation functions. claudi 2015-03-05 11:09:25 +0100
  • 11813f4128 Fix a use after free Petri Lehtinen 2015-02-07 07:36:29 +0200
  • 8b1bdcacb7 Merge pull request #221 from lioncash/test Petri Lehtinen 2015-02-05 09:28:43 +0200
  • c242b46016 test_object: Fix a duplicate conditional check in test_iterators Lioncash 2015-02-05 01:26:13 -0500
  • 5712d55d50 Use proper free/malloc. Joakim Söderberg 2015-01-16 14:05:05 +0100
  • b378e4e4b9 Get rid of unused variables. Joakim Söderberg 2015-01-16 11:59:52 +0100
  • 1fa63652bf Support for UTF-8 Joakim Söderberg 2015-01-16 11:40:44 +0100
  • b5af5c0716 Some random small changes. Joakim Soderberg 2015-01-15 17:49:13 +0100
  • 08881e0061 Started working on friendly error indicator. Joakim Soderberg 2015-01-13 17:34:11 +0100
  • 58c188e1d5 Merge pull request #217 from JoakimSoderberg/simple_parse_cmake Petri Lehtinen 2015-01-14 08:05:51 +0200
  • ffc18128f4 Merge pull request #216 from JoakimSoderberg/infinity_warning Petri Lehtinen 2015-01-14 08:04:37 +0200
  • 6a38d0d431 Disable warning for deliberate use on MSVS. Joakim Soderberg 2015-01-13 16:11:03 +0100
  • d0a8ad4c06 Compile simple_parse example for CMake project. Joakim Soderberg 2015-01-13 16:17:48 +0100
  • c244b1483e examples/README.rst: Fix formatting Petri Lehtinen 2014-12-30 08:56:04 +0200
  • fc83f10c85 Add Makefile.am for examples Petri Lehtinen 2014-12-30 08:46:09 +0200
  • 8d561cd94e examples/simple_parse.c: Reindent, fix warnings & style Petri Lehtinen 2014-12-30 08:44:36 +0200
  • 970c6988a5 Merge pull request #214 from rdpoor/master Petri Lehtinen 2014-12-30 08:33:34 +0200
  • 220dcb7be3 use fgets() rather than getline() Robert Poor 2014-12-29 06:22:19 -0800
  • 48e0488f07 adding simple-parse example Robert Poor 2014-12-26 10:49:15 -0800
  • ed9a2a83bb Merge pull request #4 from JNiewiadomski/DE2421 Phillip Howell 2014-12-22 13:47:38 -0600