Commit Graph

  • fe507a7ee8 🚚 remove < from filename to fix Windows build Niels Lohmann 2020-08-16 21:36:21 +02:00
  • 6b04f05eba 📝 add more API documentation Niels Lohmann 2020-08-16 21:23:44 +02:00
  • 5c4cc20ed8 📝 add more API documentation Niels Lohmann 2020-08-16 20:48:10 +02:00
  • a430d25f22 📝 add more API documentation Niels Lohmann 2020-08-16 14:48:48 +02:00
  • fb5c20134f 📝 add more API documentation Niels Lohmann 2020-08-16 14:27:26 +02:00
  • d8ed98a7af 📝 add more API documentation Niels Lohmann 2020-08-15 15:18:07 +02:00
  • 1ce0ed5a52 👷 ignore gh-pages branch in CircleCI Niels Lohmann 2020-08-14 13:58:55 +02:00
  • 0c2088823d 👷 ignore gh-pages branch in CircleCI Niels Lohmann 2020-08-14 13:56:42 +02:00
  • fb8adb8e93 👷 ignore gh-pages branch in CircleCI Niels Lohmann 2020-08-14 13:52:42 +02:00
  • f6c2947f1e 📝 add more API documentation Niels Lohmann 2020-08-14 13:47:54 +02:00
  • 0356e0c75b 📝 add more API documentation Niels Lohmann 2020-08-14 13:05:16 +02:00
  • 6674561d6a 📝 add more API documentation Niels Lohmann 2020-08-14 10:48:32 +02:00
  • 772f37c12d Merge pull request #2354 from rbuch/develop Niels Lohmann 2020-08-14 06:04:56 +02:00
  • 67d822d951 Fix typos in documentation Ronak Buch 2020-08-13 15:44:58 -04:00
  • 298420263b 🚚 remove quotes from filename to fix Windows build Niels Lohmann 2020-08-13 15:12:41 +02:00
  • dd2fb3b454 📝 add more API documentation Niels Lohmann 2020-08-13 15:03:28 +02:00
  • ce6adc447a 📝 add more API documentation Niels Lohmann 2020-08-13 14:04:08 +02:00
  • d360fec216 📝 add offline pages for docset Niels Lohmann 2020-08-13 13:35:05 +02:00
  • 178125ff9b 📝 add docset Niels Lohmann 2020-08-13 10:52:20 +02:00
  • 8d0aa09ab5 Merge pull request #2352 from nlohmann/private_macro Niels Lohmann 2020-08-13 10:06:59 +02:00
  • 874f49e945 📝 add more API documentation Niels Lohmann 2020-08-12 14:29:25 +02:00
  • fe89049aee 📝 add more API documentation Niels Lohmann 2020-08-12 13:41:59 +02:00
  • 9d726c25d5 ♻️ remove "#define private public" Niels Lohmann 2020-08-12 13:30:06 +02:00
  • 411fc3249b ⬆️ Hedley 14 (dev branch) Niels Lohmann 2020-08-12 13:00:57 +02:00
  • b888afe5f4 Merge pull request #2349 from nlohmann/issue2348 Niels Lohmann 2020-08-11 09:05:02 +02:00
  • 37ce871eeb Merge pull request #2347 from nlohmann/no_exceptions Niels Lohmann 2020-08-10 22:47:27 +02:00
  • dd8cb2acc1 🚨 remove -Wimplicit-fallthrough warning #2348 Niels Lohmann 2020-08-10 20:48:39 +02:00
  • 4080d0b1a4 add test to compile without exceptions Niels Lohmann 2020-08-10 09:48:11 +02:00
  • 1b28a58280 Merge remote-tracking branch 'origin/develop' into develop Niels Lohmann 2020-08-10 09:24:25 +02:00
  • 824d55bf26 📝 fix documentation #1668 Niels Lohmann 2020-08-10 09:24:11 +02:00
  • e030d26089 Merge pull request #2344 from ongjunjie/fix-cmake-overwrite-compiler Niels Lohmann 2020-08-08 12:15:10 +02:00
  • 41a99567e0 fix cmake script overwriting compiler path Jun Jie 2020-08-07 16:08:02 +08:00
  • fedf82c904 Merge branch 'develop' of https://github.com/nlohmann/json into feature/optional Niels Lohmann 2020-08-07 09:37:56 +02:00
  • db78ac1d77 Merge branch 'release/3.9.1' into develop v3.9.1 Niels Lohmann 2020-08-06 13:49:29 +02:00
  • 350ff4f7ce Merge branch 'release/3.9.1' into master Niels Lohmann 2020-08-06 13:49:17 +02:00
  • b3e5cb7f20 🔖 set version to 3.9.1 Niels Lohmann 2020-08-06 13:45:29 +02:00
  • f4155e4727 Merge pull request #2333 from nlohmann/fallthrough Niels Lohmann 2020-08-01 15:32:21 +02:00
  • 8a54617240 Merge pull request #2332 from nlohmann/issue2330 Niels Lohmann 2020-08-01 12:29:33 +02:00
  • 0326e4e2a6 🚨 fix fallthrough warning Niels Lohmann 2020-07-31 19:24:03 +02:00
  • 3888b1642a 🐛 fix lexer to properly cope with repeated comments #2330 Niels Lohmann 2020-07-31 18:59:22 +02:00
  • 1da931730a Merge pull request #2327 from nlohmann/issue2326 Niels Lohmann 2020-07-31 08:00:08 +02:00
  • 1eedee5e4e Merge pull request #2319 from nlohmann/issue2315 Niels Lohmann 2020-07-31 07:59:18 +02:00
  • 501ad6fc59 📝 fix name of Homebrew formula #2326 Niels Lohmann 2020-07-30 13:31:00 +02:00
  • 35daa5c00b Merge pull request #2320 from wx257osn2/fix-typo Niels Lohmann 2020-07-30 12:27:16 +02:00
  • 2326abc547 ♻️ split regression tests Niels Lohmann 2020-07-30 12:13:05 +02:00
  • f13af83a94 🐛 add more functions from std::map to nlohmann::ordered_map Niels Lohmann 2020-07-28 21:47:06 +02:00
  • 2d3fe9d135 fix typo I 2020-07-28 21:54:53 +09:00
  • e590604822 🐛 fix a bug due to missing overloads in ordered_map container Niels Lohmann 2020-07-28 14:20:31 +02:00
  • 1b8efed06f Merge pull request #2318 from eli-schwartz/installfix Niels Lohmann 2020-07-28 13:25:04 +02:00
  • 7d01a9e875 Merge branch 'develop' into installfix Niels Lohmann 2020-07-28 13:24:54 +02:00
  • b3da8b325a Merge pull request #2314 from xvitaly/fix-path Niels Lohmann 2020-07-28 13:24:08 +02:00
  • aa06a4761e cmake: install pkg-config file relative to current_binary_dir Eli Schwartz 2020-07-27 18:15:18 -04:00
  • 8f9dc7eabe Fixed installation of pkg-config file on other than Ubuntu distributions. Vitaly Zaitsev 2020-07-27 16:54:16 +02:00
  • d34771cafc Merge branch 'release/3.9.0' into develop v3.9.0 Niels Lohmann 2020-07-27 15:54:39 +02:00
  • 36e5ecf66d Merge branch 'release/3.9.0' Niels Lohmann 2020-07-27 15:54:24 +02:00
  • e110667d21 🔖 set version to 3.9.0 Niels Lohmann 2020-07-27 15:48:09 +02:00
  • c006fc9bec 📝 add more documentation Niels Lohmann 2020-07-27 14:07:13 +02:00
  • 84c0c76849 🚧 add Clang-Tidy configuration Niels Lohmann 2020-07-27 09:15:57 +02:00
  • 2f05f5175c 🚧 add Clang-Tidy configuration Niels Lohmann 2020-07-26 22:38:14 +02:00
  • 1b06184f22 👥 update list of contributors Niels Lohmann 2020-07-26 20:50:04 +02:00
  • 84a899f511 👥 update list of contributors Niels Lohmann 2020-07-26 14:54:51 +02:00
  • 7a4841a42a 📝 add binary() function to SAX documentation Niels Lohmann 2020-07-26 14:40:46 +02:00
  • bbcdf18ba5 🚚 move test utils header file Niels Lohmann 2020-07-26 14:07:34 +02:00
  • e22cbacc41 🚨 fix warning Niels Lohmann 2020-07-26 12:12:17 +02:00
  • 67ed63b196 Merge pull request #2312 from nlohmann/docs Niels Lohmann 2020-07-26 10:06:01 +02:00
  • a34070d36a fix test for meta() function Niels Lohmann 2020-07-25 22:28:14 +02:00
  • 9c75c7eace 🔧 clean generated XML files Niels Lohmann 2020-07-25 22:04:42 +02:00
  • 7bd6242f04 📝 add more documentation Niels Lohmann 2020-07-25 22:00:28 +02:00
  • 808aca41aa Merge pull request #2305 from AODQ/develop Niels Lohmann 2020-07-25 21:51:54 +02:00
  • 63e7c40e35 Merge pull request #2297 from nlohmann/issue2286 Niels Lohmann 2020-07-25 21:50:53 +02:00
  • 1816aae862 Merge branch 'develop' of https://github.com/nlohmann/json into docs Niels Lohmann 2020-07-25 21:48:51 +02:00
  • 980f8c6f61 🔀 merge develop branch Niels Lohmann 2020-07-25 21:45:47 +02:00
  • 42f8708940 Merge branch 'develop' of https://github.com/nlohmann/json into issue2286 Niels Lohmann 2020-07-25 21:44:58 +02:00
  • 40b78d3847 Merge pull request #2308 from nlohmann/cbor_tags Niels Lohmann 2020-07-25 19:43:11 +02:00
  • fad14aabe7 📝 update output of meta function Niels Lohmann 2020-07-25 14:41:06 +02:00
  • 6e5be17b62 📝 add more documentation Niels Lohmann 2020-07-25 14:40:50 +02:00
  • 62f98b7537 Merge branch 'develop' of https://github.com/nlohmann/json into docs Niels Lohmann 2020-07-25 11:20:13 +02:00
  • a1dbfcd736 Merge pull request #2306 from jwittbrodt/develop Niels Lohmann 2020-07-25 10:52:56 +02:00
  • c00c3162b2 Merge branch 'develop' into develop Niels Lohmann 2020-07-25 10:52:42 +02:00
  • 448ceb2e12 Merge pull request #2303 from nlohmann/cleanup Niels Lohmann 2020-07-25 05:41:51 +02:00
  • 15ec0fe150 change c-style cast to static_cast for #2304 aodq 2020-07-24 16:21:30 -04:00
  • 58167173a2 📝 add more documentation Niels Lohmann 2020-07-24 15:25:53 +02:00
  • d8d499ce9b 📝 add more documentation Niels Lohmann 2020-07-24 14:35:52 +02:00
  • 480ad529e3 🐛 fix bug in CBOR tag handling Niels Lohmann 2020-07-24 14:18:39 +02:00
  • a84370c61f 📝 add more documentation Niels Lohmann 2020-07-24 14:04:58 +02:00
  • 33662417c1 improve coverage Niels Lohmann 2020-07-24 09:32:03 +02:00
  • 0f22ed0b5b added inline to DEFINE_TYPE macro Jonas Wittbrodt 2020-07-23 19:24:21 +02:00
  • 12885446d8 fixes unused variable 'ex' for #2304 aodq 2020-07-23 13:21:38 -04:00
  • 3c7dc635e7 🙈 extend ignore list Niels Lohmann 2020-07-23 14:19:57 +02:00
  • 27232455c8 📝 update documentation Niels Lohmann 2020-07-23 14:17:02 +02:00
  • 59cb7674be 📝 update documentation Niels Lohmann 2020-07-23 14:15:20 +02:00
  • 0cd120f7e1 🚨 fix UBSAN warning Niels Lohmann 2020-07-23 14:06:09 +02:00
  • bba57cc4af 🚨 fix UBSAN warning Niels Lohmann 2020-07-23 14:02:49 +02:00
  • e571c67c0d 🚨 fix implicit conversion warning when opening binary file Niels Lohmann 2020-07-23 14:02:12 +02:00
  • 43e07bb92d Merge pull request #2301 from nlohmann/regression2281 Niels Lohmann 2020-07-23 13:14:24 +02:00
  • fb22233f34 🔊 add message if implicit conversions are switched off Niels Lohmann 2020-07-23 13:11:48 +02:00
  • f9b71afebf 🚚 unify cmake build dir names Niels Lohmann 2020-07-23 13:02:53 +02:00
  • 8159091d8f 🔀 rename variable to avoid shadowing Niels Lohmann 2020-07-23 12:58:09 +02:00
  • 230dcfb7a3 🚨 add prefix to avoid shadowing Niels Lohmann 2020-07-23 12:57:52 +02:00
  • b315fe484a 🔀 merge develop branch Niels Lohmann 2020-07-23 12:30:26 +02:00