Commit graph

  • 67b0daf27b Add the possibility of using FILE * from cstdio library to read a file. This enable the possibility of using low eand device with this library. Jonathan Dumaresq 2018-12-11 09:33:30 -0500
  • 2c23f0a346 Changes requested from code review. David Avedissian 2018-12-08 15:46:33 +0000
  • e73dfef6e5
    Merge pull request #1382 from kjpus/patch-1 Niels Lohmann 2018-12-04 20:02:38 +0100
  • 767a3a327d
    Link to issue #958 broken kjpus 2018-12-04 10:03:10 -0500
  • d53873a251
    Merge pull request #1363 from theodelrieu/doc/implicit_conversions Niels Lohmann 2018-12-02 17:27:46 +0100
  • 7a56f5a42b
    Merge pull request #1380 from manu-chroma/patch-1 Niels Lohmann 2018-12-02 17:25:38 +0100
  • 5de184b8fb
    readme: fix typo Manvendra Singh 2018-12-02 01:50:57 +0530
  • ef90d62ddf
    🚨 fixed warning #1364 Niels Lohmann 2018-11-21 21:17:38 +0100
  • 7b961368d5
    recommend using explicit from JSON conversions Théo DELRIEU 2018-11-19 14:25:29 +0100
  • da81e7be22
    🏁 adding parentheses around std::snprintf calls #1337 Niels Lohmann 2018-11-09 21:18:02 +0100
  • f80efd3954
    💄 cleanup Niels Lohmann 2018-11-09 21:10:32 +0100
  • 35829928da
    Merge pull request #1343 from mefyl/develop Niels Lohmann 2018-11-09 21:07:36 +0100
  • f86090aafc
    Merge pull request #1345 from mpoquet/feature/meson-install-pkgconfig Niels Lohmann 2018-11-08 18:39:26 +0100
  • 30e1cbb0df
    Merge pull request #1346 from ax3l/fix-mergePatchShadowParam Niels Lohmann 2018-11-08 18:38:40 +0100
  • aa10382629 Set eofbit on exhausted input stream. mefyl 2018-11-07 16:02:50 +0100
  • 798754dfb6
    Amalgamate Headers Axel Huebl 2018-11-08 10:35:45 +0100
  • 97b81da840
    merge_patch: rename parameter Axel Huebl 2018-11-08 10:31:47 +0100
  • ffe08983dd :meson: install headers + pkg-config Millian Poquet 2018-11-07 23:56:55 +0100
  • f665a92330 Implement SFINAE friendly iterator_traits and use that instead. David Avedissian 2018-11-07 18:39:25 +0000
  • d2e6e1bf58
    Merge pull request #1329 from ax3l/fix-typosWhitespaces Niels Lohmann 2018-11-02 18:23:42 +0100
  • a7567bc596
    Remove EOL whitespaces in natvis Axel Huebl 2018-11-02 10:42:48 +0100
  • f049836d68
    CMake: Optional Install if Embedded Axel Huebl 2018-11-02 10:15:27 +0100
  • 689382a722
    Fix EOL Whitespaces & CMake Spelling Axel Huebl 2018-11-02 09:35:17 +0100
  • 2f73a4d1f3
    🚨 fixed a linter warning Niels Lohmann 2018-10-31 20:30:24 +0100
  • e3c28afb61
    Merge branch 'release/3.4.0' into develop Niels Lohmann 2018-10-30 22:20:29 +0100
  • 6708f22cd4
    Merge branch 'release/3.4.0' Niels Lohmann 2018-10-30 22:20:12 +0100
  • 0f3c74d821
    🔖 set version to 3.4.0 Niels Lohmann 2018-10-30 22:18:45 +0100
  • 7b2f8cce03
    🔖 set version to 3.4.0 Niels Lohmann 2018-10-30 21:30:20 +0100
  • 8cee0e38d9
    🚑 fixed #1319 Niels Lohmann 2018-10-30 17:29:05 +0100
  • 856fc31d0a
    💄 fixed indentation Niels Lohmann 2018-10-29 19:44:19 +0100
  • 39419cd5c4
    🚨 fixed another linter warning Niels Lohmann 2018-10-29 18:51:30 +0100
  • 86b5ce953a
    📝 added examples for BSON functions Niels Lohmann 2018-10-28 15:09:26 +0100
  • d2e4f0b0d9
    ✏️ fixed some typos Niels Lohmann 2018-10-28 14:20:20 +0100
  • f0c1459554
    🐛 fixed a bug parsing BSON strings #1320 Niels Lohmann 2018-10-28 09:16:40 +0100
  • 24946f67f1
    🚨 fixed some more linter warnings Niels Lohmann 2018-10-28 09:15:41 +0100
  • 7d0dc10169
    🚨 fixed a linter warning Niels Lohmann 2018-10-27 18:34:35 +0200
  • 45a761bd60
    Merge branch 'develop' of https://github.com/nlohmann/json into develop Niels Lohmann 2018-10-27 18:31:06 +0200
  • 4e765596f7
    🔨 small improvements Niels Lohmann 2018-10-27 18:31:03 +0200
  • 1308ea055d
    Merge pull request #1315 from nlohmann/feature/convert_char Niels Lohmann 2018-10-27 16:56:00 +0200
  • 0e7be06bef
    Merge pull request #1323 from nlohmann/feature/enum_json_mapping Niels Lohmann 2018-10-27 16:55:39 +0200
  • 85aaf91b85
    Merge branch 'develop' into feature/enum_json_mapping Niels Lohmann 2018-10-27 16:52:59 +0200
  • 5a6bdf5934
    Merge branch 'develop' into feature/convert_char Niels Lohmann 2018-10-27 16:48:48 +0200
  • 037e93f5c0
    Merge pull request #1320 from nlohmann/julian-becker-feature/bson Niels Lohmann 2018-10-27 16:37:54 +0200
  • 9f48bb6937
    replaced vector by array #1323 Niels Lohmann 2018-10-27 09:58:23 +0200
  • 6384fe28db
    🚨 fixed another linter warning Niels Lohmann 2018-10-26 23:12:41 +0200
  • ad639ad5e6
    added NLOHMANN_JSON_SERIALIZE_ENUM marco #1208 Niels Lohmann 2018-10-26 14:48:20 +0200
  • 544150d5a5
    🚨 fixed another linter warning Niels Lohmann 2018-10-26 11:10:49 +0200
  • c2e175763c
    👌 added another conversion function #1315 Niels Lohmann 2018-10-25 22:47:08 +0200
  • d97fa30795
    👌 fixed comment #1320 Niels Lohmann 2018-10-25 22:29:27 +0200
  • 7ce720b700
    🚨 fixed coverage Niels Lohmann 2018-10-25 18:21:50 +0200
  • 19647e083c
    🚨 fixed compiler warnings Niels Lohmann 2018-10-25 14:27:55 +0200
  • 62126278a6
    🔨 added fix for arrays Niels Lohmann 2018-10-25 13:01:18 +0200
  • 1968e5c793
    🎨 clean up binary formats Niels Lohmann 2018-10-24 23:39:30 +0200
  • 4d1eaace8c
    🔨 fixed fuzz code to avoid false positives in case of discarded values Niels Lohmann 2018-10-24 18:55:08 +0200
  • e2c5913a50
    🚧 some changes to the BSON code Niels Lohmann 2018-10-24 15:43:37 +0200
  • bba159121f
    Merge branch 'feature/bson' of https://github.com/julian-becker/json into julian-becker-feature/bson Niels Lohmann 2018-10-24 15:03:15 +0200
  • f102df3cba
    📝 updated documentation #1314 Niels Lohmann 2018-10-24 09:28:57 +0200
  • 7b501de054
    Merge pull request #1314 from nlohmann/feature/codec_errors Niels Lohmann 2018-10-24 08:40:58 +0200
  • 20038e2703
    📝 added a note to the discussion #1286 Niels Lohmann 2018-10-23 23:00:43 +0200
  • 87ef3f25f2
    ✏️ fixed a typo #1314 Niels Lohmann 2018-10-23 22:56:10 +0200
  • b49f76931f
    👌 replaced static_cast to CharType by conversion function #1286 Niels Lohmann 2018-10-23 17:49:04 +0200
  • 2343d9caeb
    💚 additional tests from the Unicode spec #1198 Niels Lohmann 2018-10-23 17:22:13 +0200
  • 951a7a6455
    🚧 fixed test cases #1198 Niels Lohmann 2018-10-22 18:20:45 +0200
  • c51b1e6fab
    🚧 fixed an issue with ensure_ascii #1198 Niels Lohmann 2018-10-22 15:53:36 +0200
  • c7af027cbb
    🚧 respect ensure_ascii parameter #1198 Niels Lohmann 2018-10-22 09:18:16 +0200
  • e5dce64115
    💚 added tests #1198 Niels Lohmann 2018-10-21 23:26:25 +0200
  • c5821d91e5
    🚧 overworked error handlers #1198 Niels Lohmann 2018-10-21 11:49:37 +0200
  • ad11b6c35e BSON: Improved exception-related tests and report location of U+0000 in the key-string as part of out_of_range.409-message Julian Becker 2018-10-18 20:05:46 +0200
  • 9294e25c98
    Merge pull request #1301 from theodelrieu/fix/1299 Niels Lohmann 2018-10-18 19:18:48 +0200
  • b553a8a93c
    Merge pull request #1305 from koponomarenko/add-meson-info Niels Lohmann 2018-10-18 10:55:25 +0200
  • 5ba812d518 BSON: fixed incorrect casting in unit-bson.cpp Julian Becker 2018-10-18 06:38:34 +0200
  • 8de10c518b BSON: Hopefully fixing ambiguity (on some compilers) to call to string::find() Julian Becker 2018-10-17 21:47:01 +0200
  • f0c55ce0e0 Add Meson related info to README Kostiantyn Ponomarenko 2018-10-17 21:37:08 +0300
  • 2a63869159 Merge branch 'develop' of https://github.com/nlohmann/json into feature/bson Julian Becker 2018-10-17 19:06:22 +0200
  • 4b2a00641c
    Merge pull request #1303 from nlohmann/feature/binary_errors Niels Lohmann 2018-10-17 17:54:14 +0200
  • dbb0b63187
    improved error messages for binary formats #1288 Niels Lohmann 2018-10-17 12:15:58 +0200
  • a946dfc19c
    add a note to maintainers in type_traits.hpp Théo DELRIEU 2018-10-17 12:03:10 +0200
  • 978c3c4116 BSON: throw json.exception.out_of_range.409 in case a key to be serialized to BSON contains a U+0000 Julian Becker 2018-10-16 20:42:00 +0200
  • 0671e92ced
    🚧 proposal for different error handlers #1198 Niels Lohmann 2018-10-16 20:38:50 +0200
  • daa3ca8a2e BSON: Adjusted documentation of binary_writer::to_bson() Julian Becker 2018-10-16 19:29:42 +0200
  • 5bccacda30 BSON: throw json.exception.out_of_range.407 in case a value of type std::uint64_t is serialized to BSON. Also, added a missing EOF-check to binary_reader. Julian Becker 2018-10-16 19:13:07 +0200
  • 45c8af2c46
    add new is_constructible_* traits used in from_json Théo DELRIEU 2018-10-16 14:00:34 +0200
  • dd672939a0
    Merge pull request #1294 from theodelrieu/fix/json_ref_ctor Niels Lohmann 2018-10-12 17:35:41 +0200
  • 11fecc25af
    add constraints for variadic json_ref constructors Théo DELRIEU 2018-10-12 10:54:58 +0200
  • e426219256
    Merge pull request #1282 from nlohmann/feature/lines_columns Niels Lohmann 2018-10-08 22:17:33 +0200
  • adfa961ed0
    Merge pull request #1280 from nlohmann/feature/linter Niels Lohmann 2018-10-08 21:05:33 +0200
  • 6d34d64bfd
    🚑 fixed compilation error Niels Lohmann 2018-10-08 06:54:51 +0200
  • 74a31075e3
    improved parse error messages Niels Lohmann 2018-10-07 22:39:17 +0200
  • 6e49d9f5ff
    🚑 fixed compilation error Niels Lohmann 2018-10-07 21:34:40 +0200
  • f8158997b5
    📝 fixed documentation Niels Lohmann 2018-10-07 21:30:58 +0200
  • df0f612d1b BSON: allow and discard values and object entries of type value_t::discarded Julian Becker 2018-10-07 20:08:05 +0200
  • 3abb788139
    🚨 fixed some more clang-tidy warnings Niels Lohmann 2018-10-07 19:07:58 +0200
  • 858e75c4df
    🚨 fixed some clang-tidy warnings Niels Lohmann 2018-10-07 18:39:18 +0200
  • 062aeaf7b6 BSON: Reworked the binary_writer such that it precomputes the size of the BSON-output. This way, the output_adapter can work on simple output iterators and no longer requires random access iterators. Julian Becker 2018-10-07 17:57:13 +0200
  • 6d09cdec34
    🐛 fixed a bug in the unget function Niels Lohmann 2018-10-07 16:48:45 +0200
  • 011b15dd08
    added line positions to error messages Niels Lohmann 2018-10-07 12:27:24 +0200
  • 81f4b34e06 BSON: Improved documentation and error handling/reporting Julian Becker 2018-10-07 07:52:12 +0200
  • ac38e95780
    Merge pull request #1277 from performous/fix-clang-detection Niels Lohmann 2018-10-06 16:29:26 +0200
  • fa722d5ac3
    🚨 fixed another linter warning Niels Lohmann 2018-10-06 16:26:47 +0200
  • ec95438a59
    🚨 fixed some linter warnings Niels Lohmann 2018-10-06 13:49:02 +0200