Commit Graph

  • 2dda87c3b7 Merge branch 'feature/coverage_multi' into develop Niels Lohmann 2018-02-09 23:01:56 +01:00
  • 5731695d7b Clarify dev version and add space after the word flag. Paul Fultz II 2018-02-09 15:45:20 -06:00
  • 74675dd69c back to the original version Niels Lohmann 2018-02-09 22:40:52 +01:00
  • 50863c5a09 Latest updates based on feedback Paul Fultz II 2018-02-09 15:35:46 -06:00
  • ab05df3a48 🔨 another try Niels Lohmann 2018-02-09 22:27:08 +01:00
  • b455154cc9 🔨 another try Niels Lohmann 2018-02-09 22:18:51 +01:00
  • 1e8f4d6ab3 🔨 more trying Niels Lohmann 2018-02-09 22:11:05 +01:00
  • 316634e129 🔨 added quotes around parameters Niels Lohmann 2018-02-09 21:54:32 +01:00
  • 0111f3187e 🔨 working on #953 Niels Lohmann 2018-02-09 21:30:15 +01:00
  • 83db7876c5 🏁 removing test case that fails on MSVC #962 Niels Lohmann 2018-02-09 18:32:12 +01:00
  • 33a9b00ce6 🐛 fix for #962 Niels Lohmann 2018-02-06 22:38:53 +01:00
  • 8b457ace25 🐛 fixing CBOR's indefinity length strings #961 Niels Lohmann 2018-02-06 20:43:03 +01:00
  • 556e30f759 Merge pull request #955 from patrikhuber/patch-1 Niels Lohmann 2018-02-06 20:18:14 +01:00
  • ee76436592 Change to angle brackets Patrik Huber 2018-02-06 11:29:37 +00:00
  • 737cffe0cb 🔨 fixed directory for lcov coverage Niels Lohmann 2018-02-04 20:58:50 +01:00
  • ae688016f6 Changed links from master to develop branch Patrik Huber 2018-02-04 12:41:46 +00:00
  • 2b7b39c72d 🚀 added release target #956 Niels Lohmann 2018-02-04 13:29:23 +01:00
  • 44b40d7c6a Fix links in README.md Patrik Huber 2018-02-03 15:48:02 +00:00
  • 3402260983 Add a note about installing the library with cget Paul Fultz II 2018-02-02 11:13:13 -06:00
  • 3a887dc9fe 👷 fixed coveralls Niels Lohmann 2018-02-02 07:56:30 +01:00
  • 5c2a0a511e 👷 fixed coveralls Niels Lohmann 2018-02-02 07:31:57 +01:00
  • b779666916 👷 re-added homebrew tests Niels Lohmann 2018-02-02 00:20:04 +01:00
  • 97309f0da9 Merge branch 'release/3.1.0' into develop v3.1.0 Niels Lohmann 2018-02-02 00:06:17 +01:00
  • 15acf260ca Merge branch 'release/3.1.0' 3.1.0 Niels Lohmann 2018-02-02 00:05:55 +01:00
  • a8fcfd9880 👷 fixed travis file Niels Lohmann 2018-02-01 22:34:14 +01:00
  • f5c03999d0 🔨 fixed benchmark compilation Niels Lohmann 2018-02-01 22:26:26 +01:00
  • 0258484626 🔖 set version to 3.1.0 Niels Lohmann 2018-02-01 22:20:26 +01:00
  • ce7d0ebf5d Merge pull request #944 from theodelrieu/fix/cmake_install Niels Lohmann 2018-02-01 18:39:07 +01:00
  • 14cd019861 fix cmake install directory (for real this time) Théo DELRIEU 2018-01-29 11:21:11 +01:00
  • 9958dde3da Merge pull request #950 from kaidokert/develop Niels Lohmann 2018-02-01 09:29:53 +01:00
  • aed4a080bf Templatize std::string in binary_reader #941 Kaido 2018-01-31 23:01:01 -08:00
  • e8bf1f62f7 added define for library version #948 #943 Niels Lohmann 2018-01-31 22:36:18 +01:00
  • 552d153842 📝 added more statistics on binary formats Niels Lohmann 2018-01-31 21:54:38 +01:00
  • 60e2d28eb7 🐛 fix for #947 Niels Lohmann 2018-01-31 20:53:13 +01:00
  • 51c774f208 📝 added documentation for binary formats Niels Lohmann 2018-01-31 17:23:11 +01:00
  • 57e6fddd90 🚨 fixed warnings Niels Lohmann 2018-01-30 23:57:49 +01:00
  • f7131715b1 Merge branch 'develop' of https://github.com/nlohmann/json into develop Niels Lohmann 2018-01-30 23:20:39 +01:00
  • ce273af9b6 📝 added documentation for binary formats Niels Lohmann 2018-01-30 23:20:36 +01:00
  • ae235139b9 Merge pull request #940 from kaidokert/develop Niels Lohmann 2018-01-29 22:04:26 +01:00
  • 8049442c2a 🔨 rename yytext to token_buffer (fixes #933) Niels Lohmann 2018-01-29 21:56:13 +01:00
  • d0c9e5fffc Allow overriding THROW/CATCH/TRY macros with no-exceptions (redo) #938 Kaido 2018-01-28 14:42:13 -08:00
  • b3bd3b726b 📝 added link to OSS-Fuzz project repository Niels Lohmann 2018-01-28 21:02:02 +01:00
  • 52e9449563 📝 added more functions to overview Niels Lohmann 2018-01-28 20:44:45 +01:00
  • cb4a9c85cb 🔨 excluded code from coverage Niels Lohmann 2018-01-28 17:55:40 +01:00
  • 1483d39c91 🔨 moved class json_pointer into separate file #920 Niels Lohmann 2018-01-28 15:36:56 +01:00
  • e95578f884 📝 documented JSON Merge Patch (RFC 7386) Niels Lohmann 2018-01-28 14:36:17 +01:00
  • 102c474397 🔨 clean up Niels Lohmann 2018-01-28 14:13:02 +01:00
  • 6855bbb902 🔨 split "parsing" directory to "input" and "output" Niels Lohmann 2018-01-28 13:15:03 +01:00
  • 05f49fa401 added roundtrip tests for UBJSON Niels Lohmann 2018-01-27 18:47:32 +01:00
  • f0b26c8f38 added fuzzer for UBJSON input Niels Lohmann 2018-01-27 18:38:11 +01:00
  • b0a68f540f added roundtrip tests for UBJSON Niels Lohmann 2018-01-27 18:37:55 +01:00
  • 1be3935e9d 📝 cleanup after #936 Niels Lohmann 2018-01-27 17:43:44 +01:00
  • 7aace7c976 Merge pull request #936 from zerodefect/improvement/fix_kmin_compiler_warning Niels Lohmann 2018-01-27 16:51:52 +01:00
  • 0e2211df0e Merge pull request #925 from zerodefect/improvement/improve_readme_json_fwd Niels Lohmann 2018-01-25 17:11:21 +01:00
  • 95cf1fefaa Removed compiler warning about unused variable 'kMinExp'. zerodefect 2018-01-25 12:51:48 +00:00
  • 355c1e946b 👷 added task to check amalgamation #906 Niels Lohmann 2018-01-23 18:00:12 +01:00
  • dbfd7e532b Merge branch 'develop' of https://github.com/nlohmann/json into develop Niels Lohmann 2018-01-23 16:33:10 +01:00
  • 3c68a796df 🔥 deprecated iterator_wrapper #874 Niels Lohmann 2018-01-23 16:33:08 +01:00
  • f05c3edc21 Merge pull request #930 from Pipeliner/develop Niels Lohmann 2018-01-23 07:32:23 +01:00
  • f5c4e9f3a1 Merge pull request #919 from theodelrieu/fix/sfinae_for_incomplete_types Niels Lohmann 2018-01-23 07:32:06 +01:00
  • 7eabb6ba36 📝 updated documentation for UBJSON functions Niels Lohmann 2018-01-22 23:23:17 +01:00
  • fc32b8a9bc Fix a typo in README.md Vadim Evard 2018-01-22 13:14:39 +03:00
  • 3cca630836 🔨 cleanup after #915 Niels Lohmann 2018-01-21 15:55:35 +01:00
  • 010e596001 Merge pull request #915 from abolz/dtoa Niels Lohmann 2018-01-21 15:02:57 +01:00
  • 3d776b0582 📝 updated README Niels Lohmann 2018-01-21 14:13:42 +01:00
  • 9e5d901f55 Merge branch 'feature/ubjson' into develop Niels Lohmann 2018-01-21 14:04:29 +01:00
  • 327b8bb09e Merge branch 'feature/strings' into develop Niels Lohmann 2018-01-21 13:55:52 +01:00
  • d2b3fd156e Updated README.md to explain how installation of json_fwd.hpp can be achieved as part of install step. zerodefect 2018-01-19 11:42:53 +00:00
  • b406e3704b using Google Benchmark #921 Niels Lohmann 2018-01-18 22:00:32 +01:00
  • a8f711a2f1 using Google Benchmark #921 Niels Lohmann 2018-01-18 21:57:21 +01:00
  • 6402077ac2 Merge pull request #876 from nlohmann/feature/rfc7396 Niels Lohmann 2018-01-18 06:49:31 +01:00
  • dcee778c1e fix sfinae on basic_json UDT constructor Théo DELRIEU 2018-01-17 12:17:38 +01:00
  • 7456f1d87b ♻️ re-used existing UTF-8 decoder to simplfy string serialization Niels Lohmann 2018-01-16 20:42:00 +01:00
  • afe4571309 🔨 cleanup + some noexcept Niels Lohmann 2018-01-16 20:41:04 +01:00
  • b182308eff 🔨 cleanup Niels Lohmann 2018-01-16 20:40:24 +01:00
  • 9b9919d460 Use max_digits10 in dump_float for float->text->float round-trip abolz 2018-01-15 21:26:03 +01:00
  • 810f81bbd9 Regenerate src/json.hpp abolz 2018-01-15 21:24:59 +01:00
  • 787204f076 Add unit-tests for detail::to_chars abolz 2018-01-15 21:13:17 +01:00
  • 9f7c2c04c8 Use the Grisu2 algorithm for formatting 'float's and 'double's abolz 2018-01-15 20:58:02 +01:00
  • 332f352033 Add an implementation of the Grisu2 algorithm for binary to decimal floating-point conversion abolz 2018-01-15 20:45:51 +01:00
  • 0695ac4001 Add tests for #360 abolz 2018-01-15 20:41:20 +01:00
  • 68a9736738 Tests: Re-enable some round-trip tests abolz 2018-01-15 20:40:57 +01:00
  • 6e2e466c27 Tests: Don't rely on the format used for floating-point formatting abolz 2018-01-15 20:39:16 +01:00
  • 107c21a488 Tests: Exponents are formatted with a leading '+' sign abolz 2018-01-15 20:39:00 +01:00
  • 3ae82d91a2 Tests: Floating-point formatting uses lower case 'e' abolz 2018-01-15 20:38:47 +01:00
  • 92f7295063 🔨 cleanup Niels Lohmann 2018-01-15 13:21:33 +01:00
  • 3ac674562f 🔨 clean up Niels Lohmann 2018-01-14 22:26:20 +01:00
  • d9446b0e6e Merge pull request #911 from theodelrieu/fix/cmake_install Niels Lohmann 2018-01-14 20:08:49 +01:00
  • 9d6b3731b9 improved test coverage Niels Lohmann 2018-01-14 20:07:38 +01:00
  • 06cddd371b 🔨 removed failing amalgamation test Niels Lohmann 2018-01-14 17:22:42 +01:00
  • f85f4967fe improved test coverage Niels Lohmann 2018-01-14 17:22:06 +01:00
  • 6965ff00c8 Merge branch 'develop' into feature/ubjson Niels Lohmann 2018-01-14 13:58:06 +01:00
  • 411c16cbb2 📝 overworked documentation wrt. amalgamation #906 Niels Lohmann 2018-01-14 13:08:28 +01:00
  • fea5f3792b 📝 it's 2018 Niels Lohmann 2018-01-14 10:41:59 +01:00
  • 541b46132d ♻️ adjusted code to split headers Niels Lohmann 2018-01-14 10:34:43 +01:00
  • 0e8f01a963 Merge branch 'develop' into feature/rfc7396 Niels Lohmann 2018-01-14 10:28:09 +01:00
  • c772c01a48 ♻️ refactored code to split headers Niels Lohmann 2018-01-14 10:27:30 +01:00
  • 1b54d4a5aa Merge branch 'develop' into feature/ubjson Niels Lohmann 2018-01-14 10:10:56 +01:00
  • 420dcf1f25 🚧 added check whether code is amalgamated Niels Lohmann 2018-01-14 10:10:23 +01:00
  • 5775084ffc cmake: add option to use/install the non-amalgamated version Théo DELRIEU 2018-01-13 13:07:03 +01:00