Commit Graph

  • *
  • | *
  • |/
  • | *
  • | | *
  • | |/
  • |/|
  • | *
  • | | *
  • | | *
  • | |/
  • |/|
  • * |
  • |\ \
  • | * |
  • |/ /
  • * |
  • |\ \
  • | * |
  • | * |
  • |/ /
  • | *
  • | *
  • | |\
  • | | | *
  • | |_|/
  • |/| |
  • | | | *
  • | | | *
  • | | | *
  • | | | *
  • | | | *
  • | | | *
  • | | | *
  • | | | *
  • | |_|/
  • |/| |
  • * | |
  • |\ \ \
  • | * | |
  • |/ / /
  • | | | *
  • | |_|/
  • |/| |
  • * | |
  • | | | *
  • | | |/|
  • | |/| |
  • * | | |
  • |\ \ \ \
  • | * \ \ \
  • | |\ \ \ \
  • | | * | | |
  • * | | | | |
  • |\ \ \ \ \ \
  • * \ \ \ \ \ \
  • |\ \ \ \ \ \ \
  • * \ \ \ \ \ \ \
  • |\ \ \ \ \ \ \ \
  • | * | | | | | | |
  • | * | | | | | | |
  • |/ / / / / / / /
  • | * / / / / / /
  • |/ / / / / / /
  • * | | | | | |
  • |\ \ \ \ \ \ \
  • * \ \ \ \ \ \ \
  • |\ \ \ \ \ \ \ \
  • * \ \ \ \ \ \ \ \
  • |\ \ \ \ \ \ \ \ \
  • * \ \ \ \ \ \ \ \ \
  • |\ \ \ \ \ \ \ \ \ \
  • | | | | | | | | | | | *
  • | | | | | | | | | | | |\
  • | | | | * | | | | | | | |
  • | |_|_|/ / / / / / / / /
  • |/| | | | | | | | | | |
  • | | | * | | | | | | | |
  • | |_|/ / / / / / / / /
  • |/| | | | | | | | | |
  • | | * | | | | | | | |
  • | |/ / / / / / / / /
  • |/| | | | | | | | |
  • | * | | | | | | | |
  • |/ / / / / / / / /
  • | | | | | | | | *
  • | | | | | | | |/
  • | * | | | | | /
  • |/ / / / / / /
  • | * / / / / /
  • | |/ / / / /
  • | * | | | |
  • | * | | | |
  • |/ / / / /
  • | | | | | *
  • | |_|_|_|/
  • |/| | | |
  • * | | | |
  • |\ \ \ \ \
  • | * | | | |
  • |/ / / / /
  • | | * | |
  • | | * | |
  • | | * | |
  • * | | | |
  • * | | | |
  • |\ \ \ \ \
  • | * | | | |
  • |/ / / / /
  • | | | | | *
  • | |_|_|_|/|
  • |/| | | | |
  • | | | | | *
  • | |_|_|_|/
  • |/| | | |
  • * | | | |
  • |\ \ \ \ \
  • | * | | | |
  • |/ / / / /
  • * | | | |
  • |\ \ \ \ \
  • * \ \ \ \ \
  • |\ \ \ \ \ \
  • | * | | | | |
  • |/ / / / / /
  • | * / / / /
  • |/ / / / /
  • | | | | | *
  • | |_|_|_|/|
  • |/| | | | |
  • | | | | | *
  • | |_|_|_|/
  • |/| | | |
  • | | | | | *
  • | | | | | *
  • | | | | | *
  • | | | | | *
  • | | | | | *
  • | | | | | *
  • | |_|_|_|/
  • |/| | | |
  • * | | | |
  • |\ \ \ \ \
  • | * | | | |
  • |/ / / / /
  • | | | | | *
  • | |_|_|_|/
  • |/| | | |
  • * | | | |
  • * | | | |
  • |\ \ \ \ \
  • * | | | | |
  • * | | | | |
  • * | | | | |
  • |\ \ \ \ \ \
  • | | |_|_|/ /
  • | |/| | | |
  • | * | | | |
  • |/ / / / /
  • * | | | |
  • |\ \ \ \ \
  • | * | | | |
  • |/ / / / /
  • * | | | |
  • * | | | |
  • * | | | |
  • | * | | |
  • | | | * |
  • * | | | |
  • |\| | | |
  • | * | | |
  • |/ / / /
  • | | * |
  • | | * |
  • | | * |
  • | | * |
  • * | | |
  • * | | |
  • c2036ab (refs/pull/485/head) Install CMake module files by myd7349 2019-05-18 19:44:29 +0800
  • 5c07f83 (refs/pull/484/head) Add support for uint64 by Simon Ser 2019-05-05 17:46:20 +0300
  • 2fd29fd Provides conan recipe file to build artifacts (#3) by deekshith-elear 2019-04-29 07:00:07 +0530
  • cedb65d (refs/pull/483/head) compatible with rarely-used Chinese characters in GBK charset, those characters's the second byte is just the backslash '\'(0x5C) by pj81102 2019-03-23 11:06:19 -0400
  • c2a59e6 Add -fPIC compilation flag by vishal-elear 2019-03-14 21:25:46 +0530
  • 94bb66e fix possible leaks in tests/test_string_noalloc.c by Mehmet Akif TASOVA 2019-02-21 18:24:03 +0300
  • 7f3850e introduce json_object_new_string_noalloc() by Mehmet Akif TASOVA 2019-02-21 16:58:57 +0300
  • 3e81b4a Merge pull request #474 from Jehan/fix-pc-file-cmake by Eric Haszlakiewicz 2019-01-26 10:55:50 -0500
  • c46a063 (refs/pull/474/head) Installation directories empty with CMake in pkg-config. by Jehan 2019-01-26 12:30:40 +0100
  • f1713b3 Merge pull request #473 from besser82/fixup/docs_utf8 by Eric Haszlakiewicz 2019-01-23 22:47:27 -0500
  • 259d507 (refs/pull/473/head) Clean trailing white-spaces in ChangeLog. by Björn Esser 2019-01-22 17:07:00 +0100
  • 6b0745e Convert ChangeLog to valid UTF-8 encoding. by Björn Esser 2019-01-22 16:59:50 +0100
  • 674aa56 add android build script by Elear Solutions Dev 2019-01-17 18:10:02 +0000
  • 0d5d8b5 Merge branch 'elear-master' into json-c-0.13 by Ashish Bajaj 2019-01-17 23:23:54 +0530
  • 5ec3d10 (refs/pull/471/head) create folders with mode 0755 when building by Antoine Amarilli 2018-12-23 11:33:41 +0100
  • 38a1123 (refs/pull/464/head) json_object: cleanup of *set_string* functions by Ramiro Polla 2018-12-08 23:30:19 +0100
  • 906188e json_object: speed up creation of objects by Ramiro Polla 2018-12-08 22:14:41 +0100
  • c9a0ac5 json_tokener: optimize parsing of integer values by Ramiro Polla 2018-12-08 19:28:46 +0100
  • d98fc50 json_tokener: optimize check for number characters by Ramiro Polla 2018-12-08 19:17:25 +0100
  • 45c601b json_tokener: optimize check for hex characters by Ramiro Polla 2018-12-08 19:13:25 +0100
  • 158c248 json_tokener: optimize check for whitespace characters by Ramiro Polla 2018-12-08 19:07:49 +0100
  • ab3e40b json_object_deep_copy: fix deep copy of strings containing '\0' by Ramiro Polla 2018-12-02 00:23:30 +0100
  • 1f46d2f json_object_private: remove _delete field by Ramiro Polla 2018-12-01 18:57:22 +0100
  • 39c9fa0 Merge pull request #468 from rkalidas/compiler-fixes by Eric Haszlakiewicz 2018-12-19 11:09:01 -0500
  • 3003161 (refs/pull/468/head) Fix compiler warnings by Rubasri Kalidas 2018-12-18 11:30:57 -0600
  • c534709 (refs/pull/467/head) Fix compiler warnings by Rubasri Kalidas 2018-12-17 16:30:06 -0600
  • 6460446 Switch to building a dynamic lib by default. Tweak language in the README.md slightly. Inspired by PR#452. by Eric Haszlakiewicz 2018-12-11 20:59:08 -0500
  • 0daf8dc (refs/pull/514/head) install json_object_iterator.h header file by Eric Haszlakiewicz 2018-12-11 20:35:56 -0500
  • ee4691c Merge pull request #453 from darjankrijan/master by Eric Haszlakiewicz 2018-12-11 20:17:43 -0500
  • 9c4b07f (refs/pull/453/head) Removed newly created test case and incorporated it into test1.test and test2.test by Darjan Krijan 2018-12-07 17:39:59 +0100
  • 7a9075c Added test cases for spaced pretty and pretty_tab used together by Darjan Krijan 2018-12-07 17:30:15 +0100
  • 240627f Merge pull request #454 from ramiropolla/json_object_private by Eric Haszlakiewicz 2018-11-30 09:49:35 -0500
  • 745cadc Merge pull request #461 from andy5995/issue_422 by Eric Haszlakiewicz 2018-11-28 20:39:42 -0500
  • 83cb93b Merge pull request #462 from andy5995/issue_460 by Eric Haszlakiewicz 2018-11-28 20:39:13 -0500
  • 2942870 (refs/pull/462/head) remove [in] from params description by andy5995 2018-11-28 16:55:19 -0600
  • 3b10893 json_object.h:document json_object_new_string_len() by andy5995 2018-11-27 11:35:45 -0600
  • 506a32d (refs/pull/461/head) json_object.c:set errno in json_object_get_double() by andy5995 2018-11-26 21:12:06 -0600
  • 7539ab2 Merge pull request #459 from andy5995/issue_438 by Eric Haszlakiewicz 2018-11-25 21:19:02 -0500
  • 753de5a Merge pull request #458 from andy5995/README_files_link by Eric Haszlakiewicz 2018-11-25 21:17:40 -0500
  • 80bf857 Merge pull request #457 from andy5995/gitignore_build by Eric Haszlakiewicz 2018-11-25 21:14:34 -0500
  • aa831c7 Merge pull request #456 from andy5995/style_perms by Eric Haszlakiewicz 2018-11-25 21:14:14 -0500
  • 133152a Merge pull request #455 from andy5995/test2_dead by Eric Haszlakiewicz 2018-11-25 21:13:52 -0500
  • fc1b113 (refs/pull/459/head) README.html:fix link to Doxygen docs, remove WIN32 link by andy5995 2018-11-25 07:09:00 -0600
  • 71f5c2d (refs/pull/458/head) README.md:fix dead "file.html" link by andy5995 2018-11-25 06:51:21 -0600
  • c3e11d6 (refs/pull/457/head) .gitignore:add build directory by andy5995 2018-11-25 06:45:21 -0600
  • dba65cb (refs/pull/456/head) STYLE.txt:remove executable permissions by andy5995 2018-11-25 06:43:02 -0600
  • 80fd381 (refs/pull/455/head) index.html:fix dead link by andy5995 2018-11-25 06:11:00 -0600
  • 5bb5e2e (refs/pull/454/head) json_object_private: save 8 bytes in struct json_object in 64-bit architectures by Ramiro Polla 2018-11-24 03:36:51 +0100
  • b0bceaa Added a test for the space after \n issue with flags=JSON_C_TO_STRING_SPACED|JSON_C_TO_STRING_PRETTY|(JSON_C_TO_STRING_PRETTY_TAB) used in json_object_array_to_json_string by Darjan Krijan 2018-11-21 22:41:13 +0100
  • 3943960 Removed spaces after \n for arrays as well by Darjan Krijan 2018-11-21 22:34:01 +0100
  • e8cec5c Fixed misalignment in JSON string due to space after \n being printed when choosing JSON_C_TO_STRING_SPACED together with JSON_C_TO_STRING_PRETTY in json_object_array_to_json_string by Darjan Krijan 2018-11-20 22:21:27 +0100
  • 952e09f (refs/pull/452/head) Update README.md by bit-hemant 2018-10-27 22:38:49 +0530
  • ebe520e Merge pull request #450 from drizt/subproject by Eric Haszlakiewicz 2018-10-20 23:01:20 -0400
  • ba5a02e (refs/pull/450/head) Allow use json-c cmake as subproject by Ivan Romanov 2018-10-20 10:50:15 +0500
  • 5300fb3 remove tab by Elear Solutions Dev 2018-09-09 14:30:13 +0530
  • 8edd9a3 add the right base build folder by Elear Solutions Dev 2018-09-09 14:23:29 +0530
  • b35c8ee added -fPIC for static library generation by Elear Solutions Dev 2018-09-02 21:32:25 +0530
  • 994e6c1 Re-add creation and installation of the json-c.pc file to the cmake build. by Eric Haszlakiewicz 2018-09-01 15:06:14 -0400
  • 705e2fd Merge pull request #444 from Hawk777/document-ref-count-tokener by Eric Haszlakiewicz 2018-08-31 01:16:53 -0400
  • 31d4d3d (refs/pull/444/head) Document refcount of json_tokener_parse_ex return by Christopher Head 2018-08-30 09:18:29 -0700
  • 91f35c4 (refs/pull/443/merge) Merge 40ea3ec009 into 0a8ac2ed92 by Qais Patankar 2018-08-20 07:26:28 +0000
  • 40ea3ec (refs/pull/443/head) remove pretty spaces when using pretty tabs by Qais Patankar 2018-08-20 08:25:46 +0100
  • 0a8ac2e Merge pull request #441 from changyongGuo/c_flag_error by Eric Haszlakiewicz 2018-08-14 20:40:49 -0400
  • 08c8231 (refs/pull/441/head) fix c flag loss during cmake building by changyong guo 2018-08-14 13:52:18 +0800
  • bf29aa0 Merge pull request #434 from unmanned-player/devel by Eric Haszlakiewicz 2018-07-28 11:59:46 -0400
  • 91f9884 Merge pull request #436 from jobol/master by Eric Haszlakiewicz 2018-07-26 23:28:42 -0400
  • d189d7b (refs/pull/436/head) Improve pkgconfig setting by Jose Bollo 2018-07-25 15:45:01 +0200
  • f2e991a (refs/pull/434/head) The real CMake support by Unmanned Player 2018-07-24 08:06:13 +1000
  • 68bdfbb (refs/pull/433/merge) Merge 178aedfd02 into 2327b23d8e by unmanned-player 2018-07-22 23:14:48 +0000
  • 178aedf (refs/pull/433/head) The real CMake support. by Unmanned Player 2018-07-23 08:49:07 +1000
  • 2ac3b94 (refs/pull/432/head) Try 5 by Unmanned Player 2018-07-23 08:15:07 +1000
  • 892bbe5 Try 4 by Unmanned Player 2018-07-23 07:59:00 +1000
  • 6f93e8c Try 3 by Unmanned Player 2018-07-23 07:52:55 +1000
  • ebb7c9e Try 2 by Unmanned Player 2018-07-23 07:44:30 +1000
  • a9d03d2 Adjusting appveyor.yml and CMakeLists.txt by Unmanned Player 2018-07-23 07:39:26 +1000
  • 9fd8d66 The real CMake support. by Unmanned Player 2018-07-22 11:28:58 +1000
  • 2327b23 Merge pull request #431 from LeSpocky/cmake by Eric Haszlakiewicz 2018-07-12 22:26:48 -0400
  • 901d59b (refs/pull/431/head) cmake: Bump required version by Alexander Dahl 2018-07-12 21:25:38 +0200
  • cedc8c7 (refs/pull/428/head) Added new_null() function by root 2018-07-07 04:01:20 -0400
  • 3df1f98 Explain why we're not setting the output name for static libraries when on Windows. by Eric Haszlakiewicz 2018-06-23 22:10:55 -0400
  • a056893 Merge pull request #415 from sgbihu/master by Eric Haszlakiewicz 2018-06-23 22:08:25 -0400
  • e3752b5 Issue #418: Fix docs for json_util_from_fd and json_util_from_file to say that they return NULL on failures. by Eric Haszlakiewicz 2018-06-14 22:24:15 -0400
  • c1c7109 Issue #419: document that NULL may be passed to json_object_put(). by Eric Haszlakiewicz 2018-06-12 23:16:31 -0400
  • fb042f4 Merge pull request #421 from lt-holman/install_header_file by Eric Haszlakiewicz 2018-06-08 23:45:47 -0400
  • 37a2edf (refs/pull/421/head) install json_object_iterator.h header file by Keith Holman 2018-06-07 13:19:27 -0400
  • 4bbc72f Merge pull request #420 from angelskieglazki/master by Eric Haszlakiewicz 2018-06-02 23:01:04 -0400
  • 7a4759f (refs/pull/420/head) arraylist: Fix names of parameters for callback function by max 2018-06-01 18:21:06 +0300
  • 4414d06 Always create debug info (pdb file) even for release builds. by Eric Haszlakiewicz 2018-05-27 21:50:57 -0400
  • 7038bb8 Try the appveyor changes again, using %Configuration% instead of "Debug" by Eric Haszlakiewicz 2018-05-27 18:20:32 -0400
  • dfc0fdd Include the json-c.lib, .pdb and .exp files in the zip file created by the appveyor build, since it seems they're needed for linking and debugging. by Eric Haszlakiewicz 2018-05-27 16:07:11 -0400
  • 0b3616d (refs/pull/415/head) Resolve windows name conflict by Liang, Gao 2018-05-21 16:28:06 +0800
  • aaf5656 Solved repl_realloc issue by himanshushinde 2018-05-07 17:14:52 +0530
  • c75ebe8 Merge pull request #410 from janczer/fix-typos by Eric Haszlakiewicz 2018-04-24 22:01:09 -0400
  • 8bd6217 (refs/pull/410/head) Fixed typos by janczer 2018-04-24 16:00:38 +0200
  • 68803ba Adding android configure script and removing cached files which are present in gitignore by Ubuntu 2018-04-23 12:19:50 +0000
  • 3a08217 update gitignore with temp files by Elear Solutions Dev 2018-04-23 10:20:14 +0000
  • d58416d remove autogen files by Elear Solutions Dev 2018-04-23 10:18:12 +0000
  • 5cc0daa added buildroot patches by Elear Solutions Dev 2018-04-23 10:17:19 +0000
  • f8c632f Issue #407: fix incorrect casts in calls to ctype functions (isdigit and isspace) so we don't crash when asserts are enabled on certain platforms and characters > 128 are parsed. by Eric Haszlakiewicz 2018-03-25 18:25:58 -0400
  • da4b343 Add an parse test for content starting with a UTF8 BOM, which is _not_ a valid start to a JSON message. by Eric Haszlakiewicz 2018-03-25 18:23:42 -0400