Commit Graph

  • 7dd3e6384b 👷 added Fedora and CentOS Niels Lohmann 2019-03-23 23:42:29 +01:00
  • 490c6e926e 👷 using raspbian Niels Lohmann 2019-03-23 23:27:39 +01:00
  • 2fcca259b0 👷 added cmake Niels Lohmann 2019-03-23 23:21:17 +01:00
  • 72dd6f349e 👷 trying doozer Niels Lohmann 2019-03-23 23:18:27 +01:00
  • baaa2a4d0f 🏁 trying to use constructors from std::allocator #1536 Niels Lohmann 2019-03-21 14:09:29 +01:00
  • 1126c9ca74 Merge branch 'release/3.6.1' into develop v3.6.1 Niels Lohmann 2019-03-20 21:03:43 +01:00
  • 295732a817 Merge branch 'release/3.6.1' 3.6.1 Niels Lohmann 2019-03-20 21:03:30 +01:00
  • efa1b9a7bb 🔖 set version to 3.6.1 Niels Lohmann 2019-03-20 20:50:05 +01:00
  • b33093d610 🐛 fixed regression #1530 Niels Lohmann 2019-03-20 14:40:23 +01:00
  • 9d6ab9014f 🏁 fixed a compilation error in MSVC #1531 Niels Lohmann 2019-03-20 14:13:29 +01:00
  • c790b9f8c0 🐛 fixed regression #1530 Niels Lohmann 2019-03-20 12:41:08 +01:00
  • 483a086562 ⚗️ added funding link Niels Lohmann 2019-03-20 11:42:24 +01:00
  • d2a08ddafd Merge branch 'develop' of https://github.com/nlohmann/json into develop Niels Lohmann 2019-03-20 11:06:55 +01:00
  • 7c55510f76 🚨 fixed some warnings #1527 Niels Lohmann 2019-03-20 11:06:39 +01:00
  • 3ac5fa31c5 💬 update issue templates Niels Lohmann 2019-03-20 01:27:37 +01:00
  • 51e1564c9e Merge branch 'release/3.6.0' into develop v3.6.0 Niels Lohmann 2019-03-20 00:38:29 +01:00
  • 944267f522 Merge branch 'release/3.6.0' Niels Lohmann 2019-03-20 00:38:16 +01:00
  • 0abf0f80c9 🔖 set version to 3.6.0 Niels Lohmann 2019-03-20 00:22:12 +01:00
  • b37392b7ac 🔖 set version to 3.6.0 Niels Lohmann 2019-03-20 00:19:07 +01:00
  • 002addabd8 🚨 fixed a warning Niels Lohmann 2019-03-19 23:10:21 +01:00
  • a6f9b4e36d 👥 added contributors Niels Lohmann 2019-03-19 17:18:33 +01:00
  • 18cc7ddd62 📝 completed documentation index page Niels Lohmann 2019-03-19 16:03:02 +01:00
  • e07e8e7912 📝 updated documentation Niels Lohmann 2019-03-19 15:40:23 +01:00
  • 710f26f95c 📝 added documentation Niels Lohmann 2019-03-19 10:06:35 +01:00
  • b224c52376 🎨 cleanup Niels Lohmann 2019-03-19 09:17:14 +01:00
  • 37a72dac48 💚 forgot two semicolons Niels Lohmann 2019-03-18 17:23:34 +01:00
  • 155d196bfa Update CMakeLists.txt Viktor Kirilov 2019-03-18 17:58:35 +02:00
  • 365944b0bc Merge branch 'develop' into doctest Viktor Kirilov 2019-03-18 16:59:36 +02:00
  • 8d3f4f21bc 🔨 clean up Niels Lohmann 2019-03-18 13:53:48 +01:00
  • 9fc093c9e0 👷 added targets for infer and oclint Niels Lohmann 2019-03-18 00:19:28 +01:00
  • 22c733e6fe 📝 added documentation Niels Lohmann 2019-03-17 22:25:18 +01:00
  • 56f6d1d68e 💚 fix CI and #1521 Niels Lohmann 2019-03-17 15:20:22 +01:00
  • df0f7f2b5d 👷 overworked clang-tidy target Niels Lohmann 2019-03-17 12:02:23 +01:00
  • 9f26dac9b3 ⬆️ updated Doxyfile Niels Lohmann 2019-03-17 12:02:05 +01:00
  • b8451c236f 🚨 fixed warnings Niels Lohmann 2019-03-17 12:01:49 +01:00
  • d6c4cd3b6d 🚨 adding targets for static analyzers Niels Lohmann 2019-03-17 00:30:08 +01:00
  • baf8b4be7c adding cpplint Niels Lohmann 2019-03-17 00:28:14 +01:00
  • 34f8b4f711 🚨 fixed more warnings Niels Lohmann 2019-03-17 00:27:44 +01:00
  • 02b3494711 🔥 removing unstable macOS builds on Traivs Niels Lohmann 2019-03-16 08:28:44 +01:00
  • b02ee16721 🚨 fixed warnings Niels Lohmann 2019-03-15 15:55:52 +01:00
  • 8d6c033f80 Merge branch 'develop' of https://github.com/nlohmann/json into develop Niels Lohmann 2019-03-15 14:55:15 +01:00
  • 27011e3718 🚨 fixed warnings Niels Lohmann 2019-03-15 14:55:13 +01:00
  • 9dc3552931 Merge pull request #1514 from naszta/macrofix Niels Lohmann 2019-03-15 12:46:42 +01:00
  • 0067ea8f9e Change macros to numeric_limits #1483 Ferenc Nasztanovics 2019-03-13 23:42:46 +01:00
  • 0c65ba960e Merge branch 'develop' of https://github.com/nlohmann/json into develop Niels Lohmann 2019-03-13 22:14:57 +01:00
  • 546e2cbf5e 🚨 fixed some warnings Niels Lohmann 2019-03-13 22:14:53 +01:00
  • c6fc902184 Merge pull request #1489 from andreas-schwab/develop Niels Lohmann 2019-03-13 11:57:58 +01:00
  • d39842e68f Merge pull request #1330 from ax3l/topic-installEmbed Niels Lohmann 2019-03-13 11:13:09 +01:00
  • 670f42b561 🔥 removing Xcode 6.4 builder Niels Lohmann 2019-03-11 22:59:22 +01:00
  • c983b67112 Merge pull request #1469 from garethsb-sony/json_pointer-append Niels Lohmann 2019-03-11 22:47:08 +01:00
  • c11bead2ae 👷 removing more retired Travis images Niels Lohmann 2019-03-11 21:22:30 +01:00
  • 3cd1dac653 🚨 fix MSVC warning #1502 Niels Lohmann 2019-03-11 15:33:23 +01:00
  • cabe2357b8 Merge pull request #1492 from stac47/fix_gcc9_allocator Niels Lohmann 2019-03-11 15:21:54 +01:00
  • 16d9cdce45 📝 updated documentation of CI Niels Lohmann 2019-03-11 15:19:50 +01:00
  • e3729ba0a5 💚 fix compiler selection Niels Lohmann 2019-03-11 07:44:40 +01:00
  • e5c7fd488d 👷 trying new Travis workers Niels Lohmann 2019-03-10 22:56:14 +01:00
  • 5047c7a217 🐛 added missing include #1500 Niels Lohmann 2019-03-10 22:26:57 +01:00
  • 8eb7db7277 Merge pull request #1441 from iwanders/support-cmake-older-than-3-8-with-if Niels Lohmann 2019-03-10 22:08:16 +01:00
  • 393410e61a Merge pull request #1495 from njlr/patch-1 Niels Lohmann 2019-03-10 22:03:49 +01:00
  • 30edcaab3a Merge pull request #1496 from lieff/develop Niels Lohmann 2019-03-10 22:01:52 +01:00
  • 7b31e56fbf fix GCC 7.1.1 - 7.2.1 on CentOS closes https://github.com/nlohmann/json/issues/670 lieff 2019-02-25 16:38:22 +03:00
  • bb22b1003f Do proper endian conversions Andreas Schwab 2019-02-21 11:55:21 +01:00
  • 8aeee4f7e3 Update README.md njlr 2019-02-25 09:44:38 +00:00
  • d183bd0456 Tests for json_pointer::empty and json_pointer::parent_pointer garethsb-sony 2019-02-25 09:25:02 +00:00
  • 08de9eeaca Add json_pointer::parent_pointer (cf. std::filesystem::path::parent_path) garethsb-sony 2019-02-25 09:10:45 +00:00
  • 164e0e54d9 Rename private json_pointer::is_root as public json_pointer::empty for consistency with std::filesystem::path garethsb-sony 2019-02-25 08:57:12 +00:00
  • ddc9f201f4 Fix gcc9 build error test/src/unit-allocator.cpp (Issue #1472) Laurent Stacul 2019-02-22 16:05:41 +00:00
  • 21516f2bae Merge pull request #1491 from nickaein/patch-1 Niels Lohmann 2019-02-22 09:50:45 +01:00
  • 088a245218 Fix typo in README.ME Isaac Nickaein 2019-02-22 01:05:00 +03:30
  • e326df211b Merge pull request #1474 from nickaein/develop Niels Lohmann 2019-02-13 13:05:21 +01:00
  • c55cacee1e Merge pull request #1477 from nickaein/fix-doc Niels Lohmann 2019-02-13 13:03:46 +01:00
  • e93f305494 Add unit-test for contains() member function Isaac Nickaein 2019-02-10 16:42:01 +03:30
  • 6a5db00951 Implement contains() to check existence of a key Isaac Nickaein 2019-02-10 16:40:30 +03:30
  • fb5ceb26ac Fix documentation Isaac Nickaein 2019-02-11 17:00:48 +03:30
  • 46ff13d39e Merge pull request #1468 from past-due/disable_Wmismatched_tags_on_tuple Niels Lohmann 2019-02-10 21:50:12 +01:00
  • eee3bc0c79 Merge pull request #1464 from elvisoric/update_meson_install_step Niels Lohmann 2019-02-10 21:48:20 +01:00
  • 5da757bbb3 Attempt to satisfy Coveralls by adding a test for (unchanged) operator std::string garethsb-sony 2019-01-31 23:39:12 +00:00
  • c850e9d82d Add operator/= and operator/ to construct a JSON pointer by appending two JSON pointers, as well as convenience op/= and op= to append a single unescaped token or array index; inspired by std::filesystem::path garethsb-sony 2019-01-31 19:15:36 +00:00
  • 45819dce54 Disable -Wmismatched-tags warning on tuple_size / tuple_element past-due 2019-01-30 12:59:50 -05:00
  • 77d1d37290 Disable installation when used as meson subproject. #1463 Elvis Oric 2019-01-30 11:40:06 +01:00
  • 372c4d2125 Merge branch 'develop' into iterate-on-destruction Isaac Nickaein 2019-01-28 02:41:22 +03:30
  • 68ec3eb8d6 Merge pull request #1451 from Afforix/Afforix-fix-extra-semicolon Niels Lohmann 2019-01-25 13:36:18 +01:00
  • de14b5ee2f Merge pull request #1455 from wythe/patch-2 Niels Lohmann 2019-01-25 13:36:07 +01:00
  • cca6d0dbae docs: README type Mark Beckwith 2019-01-24 10:49:45 -06:00
  • a06e7f5d80 JSON-pointer: add operator+() returning a new json_pointer Patrick Boettcher 2019-01-24 16:46:51 +01:00
  • dc21cbb751 remove extra semicolon Matěj Plch 2019-01-22 10:13:12 +01:00
  • e89c946451 Merge branch 'feature/nodiscard' into develop Niels Lohmann 2019-01-20 15:41:30 +01:00
  • 6de4df23e4 🐛 fixed integer overflow in dump function #1447 Niels Lohmann 2019-01-20 12:26:01 +01:00
  • e17e0d031f Merge pull request #1446 from scinart/develop Niels Lohmann 2019-01-20 12:18:02 +01:00
  • e36593e960 🔨 trying code from https://godbolt.org/z/-tLO1K Niels Lohmann 2019-01-20 11:12:20 +01:00
  • 20db020c1f move newly-added tests in unit-regression.cpp scinart 2019-01-19 11:36:50 -05:00
  • d359fd3a8d 🚧 trying nodiscard attribute #1433 Niels Lohmann 2019-01-19 17:32:23 +01:00
  • b9a39b38bf Merge pull request #1434 from pboettch/develop Niels Lohmann 2019-01-19 17:07:36 +01:00
  • 83e84446d6 fix typo scinart 2019-01-18 20:55:01 -05:00
  • 899bd94b43 flush buffer in serializer::dump_escaped case UTF8_REJECT scinart 2019-01-18 20:27:49 -05:00
  • 4fd9b52fc2 Use C++11 features supported by CMake 3.1. Ivor Wanders 2019-01-16 08:21:49 -05:00
  • dffae1082f Merge pull request #1435 from pboettch/warning-fix Niels Lohmann 2019-01-15 22:18:13 +01:00
  • 851fe8a5ef Merge pull request #1430 from nicoddemus/conda-docs Niels Lohmann 2019-01-15 22:16:49 +01:00
  • a2c074fd4d this should really fix the XCode 6/7 builds onqtam 2019-01-15 22:58:12 +02:00
  • 3340162efd fixing osx builds - had forgotten to define this for the object file where the test runner is compiled onqtam 2019-01-15 22:48:37 +02:00