Permalink
Commits on Mar 22, 2018
  1. Merge pull request #409 from Mephistophiles/master

    akheron committed Mar 22, 2018
    Fix error handling in json_pack
Commits on Mar 20, 2018
  1. Merge pull request #404 from coreyfarrell/func-attrs

    akheron committed Mar 20, 2018
    Build: Add JANSSON_ATTRS macro.
Commits on Feb 20, 2018
  1. Merge pull request #400 from coreyfarrell/branch-coverage

    akheron committed Feb 20, 2018
    Enable branch coverage reporting.
  2. Merge pull request #398 from coreyfarrell/test-coverage

    akheron committed Feb 20, 2018
    Improve test coverage.
Commits on Feb 11, 2018
  1. Merge pull request #396 from coreyfarrell/2.11

    akheron committed Feb 11, 2018
    jansson 2.11
Commits on Feb 9, 2018
  1. Merge pull request #395 from akheron/doc-utf-8

    akheron committed Feb 9, 2018
    Document encoding requirements for callbacks
  2. Merge pull request #368 from AmeyaVS/cmake_build_fix

    akheron committed Feb 9, 2018
    Fix generated `pkg-config` file using cmake.
  3. Merge pull request #381 from phst/end-of-file-error-code

    akheron committed Feb 9, 2018
    Use a more specific error code for premature end of input
  4. Merge pull request #380 from phst/doc-error-code

    akheron committed Feb 9, 2018
    document that json_error_code will be added in version 2.11
  5. Document encoding requirements for callbacks

    akheron committed Feb 9, 2018
    Original patch by @phst.
    
    Fixes #369.
  6. Merge pull request #393 from akheron/json_sprintf

    akheron committed Feb 9, 2018
    Add json_sprintf and json_vsprintf
  7. Add json_sprintf and json_vsprintf

    akheron committed Feb 8, 2018
    Fixes #392
Commits on Feb 8, 2018
  1. Merge pull request #389 from coreyfarrell/threadsafety

    akheron committed Feb 8, 2018
    Atomic references and thread safe json_dump
  2. Clarify thread safety docs, rename JANSSON_THREAD_SAFE

    akheron committed Feb 8, 2018
Commits on Dec 16, 2017
  1. Merge pull request #374 from coreyfarrell/always-steal

    akheron committed Dec 16, 2017
    json_pack: Enable more complete stealing of references.
Commits on Dec 13, 2017
  1. Merge pull request #375 from phniix/373_upstream_typo_in_cmakelists

    akheron committed Dec 13, 2017
  2. Merge pull request #377 from coreyfarrell/extra-refs

    akheron committed Dec 13, 2017
    Remove extra reference actions in parsers.
  3. Merge pull request #378 from phst/doc

    akheron committed Dec 13, 2017
    Document that length-aware string functions have been added in 2.7
Commits on Nov 7, 2017
  1. Fix a compile error on macOS clang

    akheron committed Nov 7, 2017
    Reported by Diederick Huijbers
Commits on Oct 9, 2017
  1. Merge pull request #365 from phst/bug352

    akheron committed Oct 9, 2017
    Use last byte of error text as numeric error code
Commits on Aug 19, 2017
  1. Make json_equal() const-correct

    akheron committed Aug 19, 2017
    Fixes #344
Commits on Aug 6, 2017
  1. Merge pull request #359 from sanjay24/master

    akheron committed Aug 6, 2017
    json_dump_file API returns success even when fclose fails
Commits on Jul 20, 2017
  1. Merge pull request #356 from hellojaewon/master

    akheron committed Jul 20, 2017
    Docs - Fix typo
Commits on Apr 19, 2017
  1. Merge pull request #339 from npmccallum/optpack

    akheron committed Apr 19, 2017
    Enable optional object members in json_pack()
Commits on Apr 13, 2017
  1. Merge commit '1b8bebf0bf8f1c0c3d92faf67a830bf8448897ed'

    akheron committed Apr 13, 2017
  2. Allow forward declaring json_error_t values

    akheron committed Apr 13, 2017
Commits on Mar 29, 2017
  1. Merge pull request #336 from akheron/issue-333

    akheron committed Mar 29, 2017
    CMakeLists.txt: Remove extra parenthesis
  2. CMakeLists.txt: Remove extra parenthesis

    akheron committed Mar 29, 2017
    Fixes #333
Commits on Mar 2, 2017
  1. Merge pull request #329 from npmccallum/embed

    akheron committed Mar 2, 2017
    Add JSON_EMBED encoding flag
Commits on Jan 31, 2017
  1. Merge pull request #328 from npmccallum/master

    akheron committed Jan 31, 2017
    Helper functions for network IO
Commits on Nov 16, 2016
  1. Merge pull request #321 from quiet/master

    akheron committed Nov 16, 2016
    parens for LONG_LONG_INT in cmake
Commits on Oct 24, 2016
  1. Merge pull request #314 from martinlindhe/condition-always-true

    akheron committed Oct 24, 2016
    part of conditional expression is always true (!done)
  2. Merge pull request #311 from robertmu/master

    akheron committed Oct 24, 2016
    Fix passing redundant argument to error_set()
  3. Merge pull request #309 from halfaleague/larger-json-buffers

    akheron committed Oct 24, 2016
    Allow parsing of buffers larger than 2GB on most 64 bit arch.