Commit graph

Select branches

Hide pull requests

master

Mono Color

• 6f1800889a Fix tests Rimas Misevičius 2020-05-01 00:59:12 +0300
• 4c053e3ec9 Fix tests Rimas Misevičius 2020-05-01 00:48:24 +0300
• 6815968a42 Fix error message about invalid surrogate pairs Rimas Misevičius 2020-05-01 00:02:07 +0300
• 4be4a038cc
  Apply suggestions from code review Arthur Sonzogni 2020-04-29 21:08:39 +0200
• db013c9428
  Merge pull request #2071 from nlohmann/issue2067 Niels Lohmann 2020-04-29 19:39:58 +0200
• c331706644 Add CMake fetchcontent documentation and tests ArthurSonzogni 2020-04-29 14:29:17 +0200
• b1fe6ee0d1
  Merge pull request #2069 from nlohmann/issue2064 Niels Lohmann 2020-04-28 20:56:48 +0200
• 2e5727d778
  🐛 properly pass serialize_binary to dump function #2067 Niels Lohmann 2020-04-27 15:10:23 +0200
• 9e0180b698
  🐛 fix returning reference to local temporary object #2064 Niels Lohmann 2020-04-27 14:43:49 +0200
• d9d1279a94
  Merge pull request #2060 from alexandermyasnikov/develop Niels Lohmann 2020-04-24 09:18:23 +0200
• b01bc05b2b
  updated wandbox link Alexander Myasnikov 2020-04-23 13:32:42 +0300
• 63afc8e3f8
  Merge pull request #2043 from dota17/unit-constructor1 Niels Lohmann 2020-04-21 07:35:44 +0200
• a29e3b1318
  Merge pull request #2054 from nlohmann/feature/issue1983 Niels Lohmann 2020-04-20 19:44:35 +0200
• c0a39b22a6
  🚨 fix compiler warning Niels Lohmann 2020-04-20 19:42:58 +0200
• 8bfc692602 update condition chenguoping 2020-04-20 16:00:55 +0800
• 3607687a14
  Merge pull request #2053 from nlohmann/gcc10warnings Niels Lohmann 2020-04-20 08:05:42 +0200
• 721a1a0b5d
  Merge pull request #2051 from nlohmann/clang10warnings Niels Lohmann 2020-04-20 08:04:23 +0200
• f14a7d8af7
  Merge pull request #2050 from nlohmann/doctest_update Niels Lohmann 2020-04-20 08:02:58 +0200
• c379d02b3e Add missing testcase about NaN in unit-constructor1.cpp chenguoping 2020-04-16 10:23:21 +0800
• e8356928bd
  🚨 fix compiler warnings #2052 Niels Lohmann 2020-04-19 13:25:02 +0200
• 4fb0795ec1
  🚨 fix compiler warnings #2049 Niels Lohmann 2020-04-19 13:01:36 +0200
• 45d5b09425
  ⬆️ doctest 2.3.7 #2048 Niels Lohmann 2020-04-19 12:33:42 +0200
• be137609df
  Merge pull request #1746 from uhoreg/cmake_arch_indep Niels Lohmann 2020-04-19 10:09:28 +0200
• 2b0e4c7a94 add comments Hubert Chathi 2020-04-17 15:44:12 -0400
• 3bc9e053c9
  Merge pull request #1969 from dota17/dota17-warning Niels Lohmann 2020-04-17 10:10:38 +0200
• 69ac336042
  Merge pull request #1967 from dota17/dota17-disable Niels Lohmann 2020-04-17 10:08:21 +0200
• f2b43a36b2
  Merge pull request #1662 from OmnipotentEntity/develop Niels Lohmann 2020-04-16 11:14:32 +0200
• 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 -0400
• dd04a32918
  🐛 fix bug in diff function #1983 Niels Lohmann 2020-04-13 14:35:36 +0200
• f5a487d1b4 fix issue1982: contains() exceptions are incorrectly raised chenguoping 2020-04-13 19:41:13 +0800
• b7be613b6e
  Merge pull request #1990 from dota17/json_pointer Niels Lohmann 2020-04-13 13:29:33 +0200
• 84f19d6333
  Merge pull request #2034 from ArtemSarmini/gh-1920-gcc-10-incomplete-types Niels Lohmann 2020-04-13 13:19:28 +0200
• b0a3883081
  🎨 fix format Niels Lohmann 2020-04-13 13:11:26 +0200
• 3483d923d4
  Merge pull request #2033 from nlohmann/feature/issue1913 Niels Lohmann 2020-04-13 12:32:37 +0200
• 70be9751cd typo fix Artöm Bakri Al-Sarmini 2020-04-12 23:42:26 +0300
• ec955f08b4 Templatize basic_json ctor from json_ref Artöm Bakri Al-Sarmini 2020-04-12 22:32:39 +0300
• 7fcc860329
  🔥 remove WhiteSource Niels Lohmann 2020-04-12 16:35:41 +0200
• 4396a68d2d
  Merge pull request #1984 from dota17/document-fix Niels Lohmann 2020-04-11 18:55:18 +0200
• 062fd3842c
  Merge pull request #2004 from wsjcpp/develop Niels Lohmann 2020-04-11 11:48:04 +0200
• 9154e991b8
  Merge branch 'develop' into feature/issue1913 Niels Lohmann 2020-04-11 11:33:46 +0200
• d164a2bf09 Added wsjcpp.yml: C++ Source Package Manager Evgenii Sopov 2020-01-18 17:16:25 +0700
• 6121fc52cf
  🎨 fix indentation Niels Lohmann 2020-04-10 13:22:58 +0200
• ea0a7c7b4f
  Merge pull request #2025 from ArtemSarmini/issue-1971-basic_json-push_back Niels Lohmann 2020-04-10 13:19:14 +0200
• d01193a4e4
  🎨 run "make amalgamate" Niels Lohmann 2020-04-10 13:18:12 +0200
• 299feb13e7
  Merge pull request #1958 from t-b/add-zc-flag-for-msvc Niels Lohmann 2020-04-10 13:12:34 +0200
• 8db02bcc55 Fix for gcc Artöm Bakri Al-Sarmini 2020-04-08 15:53:14 +0300
• fec0bdd93b still fixing Artöm Bakri Al-Sarmini 2020-04-08 00:42:03 +0300
• 4ce31695f1 Fixed formatting, trying to fix msvc build error in appveyor Artöm Bakri Al-Sarmini 2020-04-08 00:26:43 +0300
• c6b298799a
  👷 remove failing Travis workers Niels Lohmann 2020-04-07 09:09:44 +0200
• 34cf7b7a48 just restart ci chenguoping 2020-04-07 10:00:21 +0800
• 5607dfb48a appveyor.yml: Compile and test with latest version for __cplusplus macro on MSVC Thomas Braun 2019-10-23 14:07:19 +0200
• 6a53a95c32 ⬆️ Hedley 13 Niels Lohmann 2020-03-19 11:08:02 +0100
• 3884d33c60
  Merge pull request #1980 from linev/fix_warning Niels Lohmann 2020-04-05 22:00:41 +0200
• 554e8c7356
  Merge pull request #2002 from alexandermyasnikov/develop Niels Lohmann 2020-04-05 21:58:21 +0200
• 5c00308de7
  Merge pull request #2010 from magamig/patch-1 Niels Lohmann 2020-04-05 21:55:47 +0200
• 83e36f314f
  Merge pull request #2008 from garethsb-sony/implicit-cast-vs2019 Niels Lohmann 2020-04-05 21:53:47 +0200
• 379ed1f67e
  💰 add sponsor Niels Lohmann 2020-04-05 15:23:00 +0200
• a74a031bba Fix build error Artöm Bakri Al-Sarmini 2020-04-02 15:47:08 +0300
• e4d8dc02e8 Fixes #1971 (memory leak in basic_json::push_back) Artöm Bakri Al-Sarmini 2020-04-02 15:20:25 +0300
• 3df622a417
  Update LICENSE.MIT Miguel Magalhães 2020-03-25 17:24:23 +0000
• e07686f0c7 update array_index() and add testcases chenguoping 2020-03-25 15:56:45 +0800
• 2e7d340dad docs:modify the document about operator== chenguoping 2020-03-25 10:12:19 +0800
• 7fe16f9400 PR for #2006 to test in AppVeyor. garethsb-sony 2020-03-24 12:53:59 +0000
• dcd3a6c62b move the catch of std::invalid_argument into array_index() chenguoping 2020-03-23 17:24:47 +0800
• 59cb4c93be fix C26451 warnning in serializer.hpp for VS2019 chenguoping 2020-03-23 16:08:47 +0800
• 0a8216890d fix C26451 warnnings in to_chars.hpp chenguoping 2020-03-23 15:27:35 +0800
• 4df7dc04f6 fix error 'setw' is not a member of 'std' in Wandbox example Alexander Myasnikov 2020-03-21 18:34:40 +0300
• 78e911b8c3
  Use array_idx as methods args Sergey Linev 2020-03-19 11:52:40 +0100
• 19843b038c
  Merge pull request #1933 from dota17/dota17-FAQ Niels Lohmann 2020-03-19 11:25:47 +0100
• ebb5a4c09f
  💰 add sponsor Niels Lohmann 2020-03-19 11:14:50 +0100
• bfc003cadf catch exceptions for json_point : /xx/+99 chenguoping 2020-03-17 20:49:28 +0800
• 2ccdfebaa7 fix typo chenguoping 2020-03-14 18:10:55 +0800
• 54656ef279
  Merge pull request #1956 from dota17/dota17-fix-typo Niels Lohmann 2020-03-13 17:26:24 +0100
• d102da61ad
  Merge pull request #1979 from alex-weej/patch-2 Niels Lohmann 2020-03-13 16:49:13 +0100
• 00049c20d0 Rename argument array_index to array_indx in json_pointer methods Sergey Linev 2020-03-11 07:41:53 +0100
• 5fdb1d08aa
  README: Fix string representation of dumped json Alexander “weej” Jones 2020-03-10 19:37:20 +0000
• 41b0704ce1 removed move assignments from input adapters Francois Chabot 2020-03-02 23:50:01 -0500
• 7eadd6daef added back forward declaration to address warnings Francois Chabot 2020-02-28 18:15:11 -0500
• 699e0a923c fix typo in examples dota17 2020-02-26 13:44:08 +0800
• c7282d5b1e simpler endian detection for older gcc versions Francois Chabot 2020-02-20 10:19:29 -0500
• 770ae6e9da accomodate older gcc Francois Chabot 2020-02-19 16:54:09 -0500
• de35fad88e fixed missing return arg of operator=() Francois Chabot 2020-02-19 15:23:49 -0500
• 2e2cf02cfd duck-typed object input adapters Francois Chabot 2020-02-19 14:59:31 -0500
• a0c4fc945a fixed bad friend class declaration Francois Chabot 2020-02-19 11:23:02 -0500
• 617b3cf42e templated input adapters Francois Chabot 2020-02-19 10:32:49 -0500
• 42566c6bef
  Update README.md Chen 2020-02-17 15:40:52 +0800
• 61b46a56fb
  🏗️ replace is_pod by is_trivial Niels Lohmann 2020-02-15 10:12:27 +0100
• 88097a250f
  Update README.md : add a FAQ about memory release Chen 2020-02-10 21:03:57 +0800
• 973c52dd4a
  Merge pull request #1923 from Coeur/typos Niels Lohmann 2020-02-02 14:48:07 +0100
• 8d92ca865f Some typos Antoine Cœur 2020-02-02 17:29:37 +0800
• 6a6790ab68
  Merge pull request #1917 from jothepro/update-links-to-hunter Niels Lohmann 2020-01-31 11:47:42 +0100
• 3eb6b0e7a2
  Merge pull request #1918 from kastiglione/patch-1 Niels Lohmann 2020-01-31 11:46:53 +0100
• f25a1287f9
  Fix link to parse function in README Dave Lee 2020-01-29 14:19:00 -0800
• 0257533866
  Updated links to hunter repo & docs jothepro 2020-01-29 22:33:59 +0100
• 6ca5338a0c
  Merge pull request #1909 from Klaim/patch-1 Niels Lohmann 2020-01-28 19:00:45 +0100
• ab538ba523
  Formatting Joël Lamotte 2020-01-21 17:49:23 +0100
• 708e107d8e
  Adds instruction for using Build2's package manager Joël Lamotte 2020-01-20 14:50:15 +0100
• ad383f66bc
  Merge pull request #1907 from pauljurczak/patch-1 Niels Lohmann 2020-01-19 22:45:53 +0100
• bc95563814
  Update README.md Paul Jurczak 2020-01-18 14:25:03 -0700
• 7acf6218b6
  📝 fix typo #1903 Niels Lohmann 2020-01-15 17:40:03 +0100