Commit Graph

  • 24237af983 🎨 fix format Niels Lohmann 2020-05-03 13:40:23 +02:00
  • 2f0d37d7d2 🔥 remove fastcov Niels Lohmann 2020-05-02 23:48:11 +02:00
  • 9c0c58d948 🔥 remove Doozer CI Niels Lohmann 2020-05-02 23:41:28 +02:00
  • 929f5d398c 🔨 fix coverage tests Niels Lohmann 2020-05-02 23:24:21 +02:00
  • 752c62b4bd 🔨 remove double tests Niels Lohmann 2020-05-02 16:07:09 +02:00
  • f0050c9ba0 Merge pull request #2019 from dota17/contains_v2 Niels Lohmann 2020-05-02 11:04:57 +02:00
  • bec554936c 🔨 fix paths Niels Lohmann 2020-05-02 10:56:01 +02:00
  • 08c9472184 🔨 simplify workflow Niels Lohmann 2020-05-01 21:06:41 +02:00
  • 3ae7237f5a 🔨 clean up Niels Lohmann 2020-05-01 21:01:47 +02:00
  • cfb2f34ebb 🔨 fix benchmarks Niels Lohmann 2020-05-01 20:59:47 +02:00
  • d0ef591ce2 Merge branches 'develop' and 'external_test_data' of https://github.com/nlohmann/json into external_test_data Niels Lohmann 2020-05-01 20:23:08 +02:00
  • ec5cfdd307 🔨 properly find and use Git Niels Lohmann 2020-05-01 16:18:04 +02:00
  • d144459f1e add git Niels Lohmann 2020-05-01 16:14:13 +02:00
  • f58383b8ee 🔊 output on failure Niels Lohmann 2020-05-01 15:22:18 +02:00
  • 7ade3a0efb remove dependency to FetchContent Niels Lohmann 2020-05-01 15:14:37 +02:00
  • dbf1a1f413 ♻️ download test data from external repository Niels Lohmann 2020-05-01 14:32:37 +02:00
  • 2251741b53 Merge pull request #2077 from ArthurSonzogni/develop-2 Niels Lohmann 2020-05-01 14:08:59 +02:00
  • f26689e006 Fix README.md ArthurSonzogni 2020-05-01 13:55:24 +02:00
  • 798dbb5c19 📝 add detail Niels Lohmann 2020-05-01 13:19:49 +02:00
  • c9f404dc98 Merge pull request #2076 from rmisev/patch-1 Niels Lohmann 2020-05-01 12:47:39 +02:00
  • b27d8a3253 Merge pull request #2074 from ArthurSonzogni/develop Niels Lohmann 2020-05-01 12:42:29 +02:00
  • 6f1800889a Fix tests Rimas Misevičius 2020-05-01 00:59:12 +03:00
  • 4c053e3ec9 Fix tests Rimas Misevičius 2020-05-01 00:48:24 +03:00
  • 6815968a42 Fix error message about invalid surrogate pairs Rimas Misevičius 2020-05-01 00:02:07 +03:00
  • 4be4a038cc Apply suggestions from code review Arthur Sonzogni 2020-04-29 21:08:39 +02:00
  • db013c9428 Merge pull request #2071 from nlohmann/issue2067 Niels Lohmann 2020-04-29 19:39:58 +02:00
  • c331706644 Add CMake fetchcontent documentation and tests ArthurSonzogni 2020-04-29 14:29:17 +02:00
  • b1fe6ee0d1 Merge pull request #2069 from nlohmann/issue2064 Niels Lohmann 2020-04-28 20:56:48 +02:00
  • 2e5727d778 🐛 properly pass serialize_binary to dump function #2067 Niels Lohmann 2020-04-27 15:10:23 +02:00
  • 9e0180b698 🐛 fix returning reference to local temporary object #2064 Niels Lohmann 2020-04-27 14:43:49 +02:00
  • d9d1279a94 Merge pull request #2060 from alexandermyasnikov/develop Niels Lohmann 2020-04-24 09:18:23 +02:00
  • b01bc05b2b updated wandbox link Alexander Myasnikov 2020-04-23 13:32:42 +03:00
  • 63afc8e3f8 Merge pull request #2043 from dota17/unit-constructor1 Niels Lohmann 2020-04-21 07:35:44 +02:00
  • a29e3b1318 Merge pull request #2054 from nlohmann/feature/issue1983 Niels Lohmann 2020-04-20 19:44:35 +02:00
  • c0a39b22a6 🚨 fix compiler warning Niels Lohmann 2020-04-20 19:42:58 +02:00
  • 8bfc692602 update condition chenguoping 2020-04-20 16:00:55 +08:00
  • 3607687a14 Merge pull request #2053 from nlohmann/gcc10warnings Niels Lohmann 2020-04-20 08:05:42 +02:00
  • 721a1a0b5d Merge pull request #2051 from nlohmann/clang10warnings Niels Lohmann 2020-04-20 08:04:23 +02:00
  • f14a7d8af7 Merge pull request #2050 from nlohmann/doctest_update Niels Lohmann 2020-04-20 08:02:58 +02:00
  • c379d02b3e Add missing testcase about NaN in unit-constructor1.cpp chenguoping 2020-04-16 10:23:21 +08:00
  • e8356928bd 🚨 fix compiler warnings #2052 Niels Lohmann 2020-04-19 13:25:02 +02:00
  • 4fb0795ec1 🚨 fix compiler warnings #2049 Niels Lohmann 2020-04-19 13:01:36 +02:00
  • 45d5b09425 ⬆️ doctest 2.3.7 #2048 Niels Lohmann 2020-04-19 12:33:42 +02:00
  • be137609df Merge pull request #1746 from uhoreg/cmake_arch_indep Niels Lohmann 2020-04-19 10:09:28 +02:00
  • 2b0e4c7a94 add comments Hubert Chathi 2020-04-17 15:44:12 -04:00
  • 3bc9e053c9 Merge pull request #1969 from dota17/dota17-warning Niels Lohmann 2020-04-17 10:10:38 +02:00
  • 69ac336042 Merge pull request #1967 from dota17/dota17-disable Niels Lohmann 2020-04-17 10:08:21 +02:00
  • f2b43a36b2 Merge pull request #1662 from OmnipotentEntity/develop Niels Lohmann 2020-04-16 11:14:32 +02:00
  • 012c9665ac Add binary type support to all binary file formats, as well as an internally represented binary type Michael Reilly 2019-07-05 00:13:25 -04:00
  • dd04a32918 🐛 fix bug in diff function #1983 Niels Lohmann 2020-04-13 14:35:36 +02:00
  • f5a487d1b4 fix issue1982: contains() exceptions are incorrectly raised chenguoping 2020-04-13 19:41:13 +08:00
  • b7be613b6e Merge pull request #1990 from dota17/json_pointer Niels Lohmann 2020-04-13 13:29:33 +02:00
  • 84f19d6333 Merge pull request #2034 from ArtemSarmini/gh-1920-gcc-10-incomplete-types Niels Lohmann 2020-04-13 13:19:28 +02:00
  • b0a3883081 🎨 fix format Niels Lohmann 2020-04-13 13:11:26 +02:00
  • 3483d923d4 Merge pull request #2033 from nlohmann/feature/issue1913 Niels Lohmann 2020-04-13 12:32:37 +02:00
  • 70be9751cd typo fix Artöm Bakri Al-Sarmini 2020-04-12 23:42:26 +03:00
  • ec955f08b4 Templatize basic_json ctor from json_ref Artöm Bakri Al-Sarmini 2020-04-12 22:32:39 +03:00
  • 7fcc860329 🔥 remove WhiteSource Niels Lohmann 2020-04-12 16:35:41 +02:00
  • 4396a68d2d Merge pull request #1984 from dota17/document-fix Niels Lohmann 2020-04-11 18:55:18 +02:00
  • 062fd3842c Merge pull request #2004 from wsjcpp/develop Niels Lohmann 2020-04-11 11:48:04 +02:00
  • 9154e991b8 Merge branch 'develop' into feature/issue1913 Niels Lohmann 2020-04-11 11:33:46 +02:00
  • d164a2bf09 Added wsjcpp.yml: C++ Source Package Manager Evgenii Sopov 2020-01-18 17:16:25 +07:00
  • 6121fc52cf 🎨 fix indentation Niels Lohmann 2020-04-10 13:22:58 +02:00
  • ea0a7c7b4f Merge pull request #2025 from ArtemSarmini/issue-1971-basic_json-push_back Niels Lohmann 2020-04-10 13:19:14 +02:00
  • d01193a4e4 🎨 run "make amalgamate" Niels Lohmann 2020-04-10 13:18:12 +02:00
  • 299feb13e7 Merge pull request #1958 from t-b/add-zc-flag-for-msvc Niels Lohmann 2020-04-10 13:12:34 +02:00
  • 8db02bcc55 Fix for gcc Artöm Bakri Al-Sarmini 2020-04-08 15:53:14 +03:00
  • fec0bdd93b still fixing Artöm Bakri Al-Sarmini 2020-04-08 00:42:03 +03:00
  • 4ce31695f1 Fixed formatting, trying to fix msvc build error in appveyor Artöm Bakri Al-Sarmini 2020-04-08 00:26:43 +03:00
  • c6b298799a 👷 remove failing Travis workers Niels Lohmann 2020-04-07 09:09:44 +02:00
  • 34cf7b7a48 just restart ci chenguoping 2020-04-07 10:00:21 +08:00
  • 5607dfb48a appveyor.yml: Compile and test with latest version for __cplusplus macro on MSVC Thomas Braun 2019-10-23 14:07:19 +02:00
  • 6a53a95c32 ⬆️ Hedley 13 Niels Lohmann 2020-03-19 11:08:02 +01:00
  • 3884d33c60 Merge pull request #1980 from linev/fix_warning Niels Lohmann 2020-04-05 22:00:41 +02:00
  • 554e8c7356 Merge pull request #2002 from alexandermyasnikov/develop Niels Lohmann 2020-04-05 21:58:21 +02:00
  • 5c00308de7 Merge pull request #2010 from magamig/patch-1 Niels Lohmann 2020-04-05 21:55:47 +02:00
  • 83e36f314f Merge pull request #2008 from garethsb-sony/implicit-cast-vs2019 Niels Lohmann 2020-04-05 21:53:47 +02:00
  • 379ed1f67e 💰 add sponsor Niels Lohmann 2020-04-05 15:23:00 +02:00
  • a74a031bba Fix build error Artöm Bakri Al-Sarmini 2020-04-02 15:47:08 +03:00
  • e4d8dc02e8 Fixes #1971 (memory leak in basic_json::push_back) Artöm Bakri Al-Sarmini 2020-04-02 15:20:25 +03:00
  • 3df622a417 Update LICENSE.MIT Miguel Magalhães 2020-03-25 17:24:23 +00:00
  • e07686f0c7 update array_index() and add testcases chenguoping 2020-03-25 15:56:45 +08:00
  • 2e7d340dad docs:modify the document about operator== chenguoping 2020-03-25 10:12:19 +08:00
  • 7fe16f9400 PR for #2006 to test in AppVeyor. garethsb-sony 2020-03-24 12:53:59 +00:00
  • dcd3a6c62b move the catch of std::invalid_argument into array_index() chenguoping 2020-03-23 17:24:47 +08:00
  • 59cb4c93be fix C26451 warnning in serializer.hpp for VS2019 chenguoping 2020-03-23 16:08:47 +08:00
  • 0a8216890d fix C26451 warnnings in to_chars.hpp chenguoping 2020-03-23 15:27:35 +08:00
  • 4df7dc04f6 fix error 'setw' is not a member of 'std' in Wandbox example Alexander Myasnikov 2020-03-21 18:34:40 +03:00
  • 78e911b8c3 Use array_idx as methods args Sergey Linev 2020-03-19 11:52:40 +01:00
  • 19843b038c Merge pull request #1933 from dota17/dota17-FAQ Niels Lohmann 2020-03-19 11:25:47 +01:00
  • ebb5a4c09f 💰 add sponsor Niels Lohmann 2020-03-19 11:14:50 +01:00
  • bfc003cadf catch exceptions for json_point : /xx/+99 chenguoping 2020-03-17 20:49:28 +08:00
  • 2ccdfebaa7 fix typo chenguoping 2020-03-14 18:10:55 +08:00
  • 54656ef279 Merge pull request #1956 from dota17/dota17-fix-typo Niels Lohmann 2020-03-13 17:26:24 +01:00
  • d102da61ad Merge pull request #1979 from alex-weej/patch-2 Niels Lohmann 2020-03-13 16:49:13 +01:00
  • 00049c20d0 Rename argument array_index to array_indx in json_pointer methods Sergey Linev 2020-03-11 07:41:53 +01:00
  • 5fdb1d08aa README: Fix string representation of dumped json Alexander “weej” Jones 2020-03-10 19:37:20 +00:00
  • 41b0704ce1 removed move assignments from input adapters Francois Chabot 2020-03-02 23:50:01 -05:00
  • 7eadd6daef added back forward declaration to address warnings Francois Chabot 2020-02-28 18:15:11 -05:00
  • 699e0a923c fix typo in examples dota17 2020-02-26 13:44:08 +08:00