Commit Graph

  • 84bffd5d36 move amalgamate tool to third_party folder Théo DELRIEU 2018-01-13 13:05:42 +01:00
  • 922b56e492 cmake: add back trailing slash to NLOHMANN_JSON_SOURCE_DIR Théo DELRIEU 2018-01-13 12:27:33 +01:00
  • a66b2d20c6 🚨 removed linter warnings for Python code Niels Lohmann 2018-01-13 11:15:23 +01:00
  • f4a55f26b0 added amalgamate Python script Niels Lohmann 2018-01-13 10:59:49 +01:00
  • 241eea0c0e 📝 documentation Niels Lohmann 2018-01-12 09:23:33 +01:00
  • 10bad9381d 🚧 added size benchmark for binary formats Niels Lohmann 2018-01-10 23:13:48 +01:00
  • 3a7585e738 added more tests Niels Lohmann 2018-01-10 22:47:07 +01:00
  • 31bfabc4c0 🔨 optimized input format Niels Lohmann 2018-01-10 16:14:43 +01:00
  • 965a70e38d 🔨 optimized output format Niels Lohmann 2018-01-10 11:22:19 +01:00
  • 85173f5627 🔨 some clean up Niels Lohmann 2018-01-10 10:18:31 +01:00
  • ce53537ba2 replaces amalgamation tool Niels Lohmann 2018-01-09 23:15:06 +01:00
  • 0a2920e0fd ♻️ reorganized code Niels Lohmann 2018-01-09 18:30:02 +01:00
  • b67e00b9b5 Merge pull request #700 from theodelrieu/refactor/split_it Niels Lohmann 2018-01-09 07:57:01 +01:00
  • fd04967676 🐛 fixed copy-paste error Niels Lohmann 2018-01-08 21:37:51 +01:00
  • fb1154c237 🚧 debug Niels Lohmann 2018-01-08 21:26:41 +01:00
  • 97e0d20ce9 🚧 debug Niels Lohmann 2018-01-08 21:16:20 +01:00
  • ebf28a26ee 🚧 another try Niels Lohmann 2018-01-08 20:49:02 +01:00
  • 7e4ee23f40 add single_header CMake target Théo DELRIEU 2017-08-14 20:45:33 +02:00
  • 57d822b6e2 add missing includes, put back include comments Théo DELRIEU 2017-08-14 19:28:01 +02:00
  • 9cab30cfce add adl_serializer.hpp Théo DELRIEU 2017-08-14 18:22:49 +02:00
  • 8e9714fe3d add detail/json_ref.hpp Théo DELRIEU 2017-08-14 18:14:27 +02:00
  • a3473fda6a add detail/serializer.hpp Théo DELRIEU 2017-08-14 18:04:51 +02:00
  • c117515e31 add detail/parsing/binary_writer.hpp Théo DELRIEU 2017-08-14 17:55:06 +02:00
  • d620f76f0d add detail/parsing/binary_reader.hpp Théo DELRIEU 2017-08-14 17:50:24 +02:00
  • 4dbb433a79 add detail/parsing/output_adapters.hpp Théo DELRIEU 2017-08-14 17:41:23 +02:00
  • ae6f66048c add detail/iterators/json_reverse_iterator.hpp Théo DELRIEU 2017-08-14 17:29:55 +02:00
  • 5fc9ef2b90 add detail/iterators/iteration_proxy.hpp Théo DELRIEU 2017-08-14 17:26:22 +02:00
  • bf06cf6c22 add detail/iterators/iter_impl.hpp Théo DELRIEU 2017-08-14 17:23:15 +02:00
  • 3e65a65290 add detail/iterators/internal_iterator.hpp Théo DELRIEU 2017-08-14 17:18:07 +02:00
  • 51ecc31db7 add detail/iterators/primitive_iterator.hpp Théo DELRIEU 2017-08-14 17:10:32 +02:00
  • 9ea25685a8 add detail/parsing/parser.hpp Théo DELRIEU 2017-08-14 17:02:40 +02:00
  • 3a0743db97 add detail/parsing/lexer.hpp Théo DELRIEU 2017-08-14 16:54:16 +02:00
  • 7ab3e8d7b3 add detail/parsing/input_adapters.hpp Théo DELRIEU 2017-08-14 16:48:55 +02:00
  • 21881606f2 add detail/conversions/to_json.hpp Théo DELRIEU 2017-08-14 16:40:38 +02:00
  • e0c02c14f0 add detail/conversions/from_json.hpp Théo DELRIEU 2017-08-14 16:33:55 +02:00
  • 7056b375c4 add detail/value_t.hpp Théo DELRIEU 2017-08-14 15:58:56 +02:00
  • 8c555db970 add detail/exceptions.hpp Théo DELRIEU 2017-08-14 15:19:40 +02:00
  • f364f5ac5a add detail/meta.hpp Théo DELRIEU 2017-08-14 15:06:35 +02:00
  • d686713f91 add detail/macro_{un}scope.hpp Théo DELRIEU 2017-08-14 14:59:17 +02:00
  • 5bffc95773 add json_fwd.hpp Théo DELRIEU 2017-08-14 14:41:01 +02:00
  • 3d7658da89 🚧 working on AppVeyor's errors Niels Lohmann 2018-01-08 19:48:18 +01:00
  • 126ce2e56c 🚧 further UBJSON Niels Lohmann 2018-01-08 18:54:17 +01:00
  • c9938ea838 🚧 started UBJSON implementation Niels Lohmann 2018-01-07 22:09:12 +01:00
  • 15b6421d07 added UTF-8 decoder capability and stress test Niels Lohmann 2018-01-05 23:26:22 +01:00
  • 78f8f837e6 added items() function #874 Niels Lohmann 2018-01-05 18:34:10 +01:00
  • 96b40b27a5 📝 fixed Doxygen warnings Niels Lohmann 2018-01-05 18:33:42 +01:00
  • 337e9824ea Merge pull request #900 from Dobiasd/patch-1 Niels Lohmann 2018-01-04 17:11:18 +01:00
  • ba2316372a fix link to the documentation of the emplace function Tobias Hermann 2018-01-03 11:06:32 +01:00
  • a43347e1f9 Merge branch 'develop' Niels Lohmann 2017-12-29 20:35:02 +01:00
  • ce1dccf347 Merge branch 'release/3.0.1' into develop v3.0.1 Niels Lohmann 2017-12-29 20:24:49 +01:00
  • 5681e55da8 Merge branch 'release/3.0.1' 3.0.1 Niels Lohmann 2017-12-29 20:24:20 +01:00
  • 92484f0caf 🔖 set version to 3.0.1 Niels Lohmann 2017-12-29 18:31:13 +01:00
  • ebc6849b71 added test for #894 Niels Lohmann 2017-12-29 16:53:04 +01:00
  • 3c76ff353d 📝 updated docs after PRs Niels Lohmann 2017-12-29 16:52:09 +01:00
  • d45183d426 Merge branch 'develop' of https://github.com/nlohmann/json into develop Niels Lohmann 2017-12-28 13:52:26 +01:00
  • 3b3b6e8e69 🚑 fix for #894 Niels Lohmann 2017-12-28 13:52:23 +01:00
  • f28fc2261a Merge pull request #858 from mattismyname/develop Niels Lohmann 2017-12-28 12:13:19 +01:00
  • 72bff90ed9 🔧 Fix up a few more effc++ items Matthew K. Gumbel 2017-12-04 15:42:08 -08:00
  • 3113a52a7d 📝 added exception 403 to documentation of at (#888) Niels Lohmann 2017-12-23 18:38:18 +01:00
  • 184e9c6aa7 Merge pull request #885 from TinyTinni/develop Niels Lohmann 2017-12-23 11:09:46 +01:00
  • d1cda6888e includes CTest module resp. BUILD_TESTING option Matthias Möller 2017-12-20 17:54:45 +01:00
  • 88ddb12afc 📝 fix for #883 Niels Lohmann 2017-12-18 19:46:53 +01:00
  • e54b6ace94 Merge pull request #882 from erengy/fix-msvc-c4819 Niels Lohmann 2017-12-17 19:52:57 +01:00
  • ab0e8b2f3a Fix MSVC warning C4819 Eren Okka 2017-12-17 18:02:55 +03:00
  • 1ca6ec1dc0 Merge pull request #880 from nlohmann/coverity_scan Niels Lohmann 2017-12-17 11:24:40 +01:00
  • 1856f38c85 📝 removed paragraph on version 3.0.0 Niels Lohmann 2017-12-17 11:22:35 +01:00
  • afebb6a3bb Merge branch 'release/3.0.0' into develop v3.0.0 Niels Lohmann 2017-12-17 11:04:53 +01:00
  • 9f81beb5e2 Merge branch 'release/3.0.0' 3.0.0 Niels Lohmann 2017-12-17 11:04:04 +01:00
  • 106f9f5436 ⬆️ updated git-update-ghpages script Niels Lohmann 2017-12-17 10:20:30 +01:00
  • 9eb5e2c271 🔖 set version to 3.0.0 Niels Lohmann 2017-12-17 08:40:19 +01:00
  • 9e3c4ad11f 🔖 set version to 3.0.0 Niels Lohmann 2017-12-17 08:31:18 +01:00
  • 314e4e7699 📝 improved documentation for dump and iterator_wrapper Niels Lohmann 2017-12-16 23:58:10 +01:00
  • 9a51fb4da2 🚨 fixed some warnings Niels Lohmann 2017-12-16 22:19:30 +01:00
  • 7bf007f2bc Merge pull request #879 from nlohmann/feature/algorithms Niels Lohmann 2017-12-16 12:41:07 +01:00
  • 980795b644 ✏️ fixed typos Niels Lohmann 2017-12-16 12:37:44 +01:00
  • f3bd755cab removing <iomanip> header Niels Lohmann 2017-12-16 12:37:25 +01:00
  • 4c871c58f8 re-added tests for algorithms Niels Lohmann 2017-12-16 11:16:34 +01:00
  • c23f5dcea6 📝 fixed year Niels Lohmann 2017-12-15 23:49:37 +01:00
  • 2e1b1061cd Merge pull request #875 from nlohmann/feature/spelling Niels Lohmann 2017-12-14 22:31:19 +01:00
  • 261caec2de 👥 added contributor image Niels Lohmann 2017-12-14 22:29:39 +01:00
  • f80827d068 Merge pull request #873 from nlohmann/feature/issue872 Niels Lohmann 2017-12-14 09:35:48 +01:00
  • 9a70c60fa5 Revert "⬆️ updated to Catch 2.0.1" Niels Lohmann 2017-12-14 07:49:16 +01:00
  • fb8482db76 👌 fixed some issues from the last commit #875 Niels Lohmann 2017-12-13 23:44:53 +01:00
  • c6e7eae394 implemented JSON Merge Patch (RFC 7396) Niels Lohmann 2017-12-13 23:36:22 +01:00
  • 920f64c01c ⬆️ updated to Catch 2.0.1 Niels Lohmann 2017-12-13 22:18:05 +01:00
  • 293748a9a9 📝 overworked README Niels Lohmann 2017-12-13 22:17:02 +01:00
  • e8d9963abe 👌 cosmetic changes and overworked spelling Niels Lohmann 2017-12-13 22:15:53 +01:00
  • a9a4ff61c6 🚨 remove C4996 warnings #872 Niels Lohmann 2017-12-13 17:01:39 +01:00
  • f7ae143a93 Merge pull request #870 from nlohmann/feature/issue838 Niels Lohmann 2017-12-13 06:34:11 +01:00
  • 8419bfbbd2 improved test coverage Niels Lohmann 2017-12-12 20:44:57 +01:00
  • 569d275f65 💥 throwing an exception in case dump encounters a non-UTF-8 string #838 Niels Lohmann 2017-12-11 22:38:05 +01:00
  • 383743c6c0 Merge pull request #868 from nlohmann/feature/issue867 Niels Lohmann 2017-12-11 08:55:26 +01:00
  • 7de009edd1 ✏️ fixing typos #869 Niels Lohmann 2017-12-10 13:07:47 +01:00
  • 772bb3cc20 📝 fixing documentation #867 Niels Lohmann 2017-12-10 12:32:20 +01:00
  • 0693945230 Merge pull request #860 from bogemic/std_iterator_conformance_cpp17 Niels Lohmann 2017-12-08 07:55:47 +01:00
  • 64d6daa76e iter_impl template conformance with C++17 Mike Bogdanov 2017-12-07 11:28:28 +03:00
  • 7c2d4f1852 👷 added Xcode 9.1 and 9.2 Niels Lohmann 2017-12-06 22:32:03 +01:00
  • 9e2f185ac6 💄 reformatted code after PRs Niels Lohmann 2017-12-06 22:21:11 +01:00
  • c5e731774a Merge pull request #856 from bogemic/std_allocator_conformance_cpp17 Niels Lohmann 2017-12-06 21:52:52 +01:00
  • 25d205c16d 📝 clarified difference between serialization and string value retrieval #853 Niels Lohmann 2017-12-06 21:42:36 +01:00