Commit Graph

  • 4c06191836 Merge pull request #1799 from nemequ/develop Niels Lohmann 2019-10-17 20:59:49 +02:00
  • fbcbc76d10 Update Hedley to v11. Evan Nemerson 2019-10-16 13:39:40 -07:00
  • c6cbdf96a9 appveyor.yml: Add debug build on x64 and VS 2019 Thomas Braun 2019-10-15 12:13:33 +02:00
  • 01e486bb55 appveyor.yml: Add MSVC 16 2019 support Thomas Braun 2019-10-07 21:36:55 +02:00
  • 35b47c2793 iteration_proxy: Fix integer truncation from std::size_t to int Thomas Braun 2019-10-16 20:00:05 +02:00
  • 5541a2bd25 test/cmake_import: Pass the generator platform required by MSVC 2019 Thomas Braun 2019-10-15 22:36:54 +02:00
  • 7a521150aa appveyor: Pass the generator platform explicitly Thomas Braun 2019-10-12 15:03:34 +02:00
  • ed5541440a Merge pull request #1779 from t-b/avoid-using-glob-in-cmake Niels Lohmann 2019-10-09 07:37:43 +02:00
  • eb6fe421ae test/CMakeLists.txt: Use an explicit list instead of GLOB Thomas Braun 2019-10-07 21:13:09 +02:00
  • d187488e0d Merge pull request #1765 from crazyjul/fix/items-with-alt-string Niels Lohmann 2019-10-05 22:11:14 +02:00
  • dae0fe79af Merge pull request #1769 from chris0x44/json_pointer Niels Lohmann 2019-10-03 10:35:34 +02:00
  • d826282f53 Merge pull request #1767 from 0xflotus/patch-1 Niels Lohmann 2019-10-01 11:32:05 +02:00
  • 4615f5a980 Provide default implementation for int_to_string, but allow for overloaded function Julien Hamaide 2019-10-01 10:34:21 +02:00
  • 7476f5ee0c Make json_pointer::back const (resolves #1764) christian 2019-10-01 00:57:27 +02:00
  • d7579b8cbf did you mean 'serialization'? 0xflotus 2019-09-30 18:11:44 +02:00
  • 0f073e26eb Allow items() to be used with custom string Julien Hamaide 2019-09-26 13:13:01 +02:00
  • 99d7518d21 📝 add OSS Fuzz status badge Niels Lohmann 2019-09-24 21:01:06 +02:00
  • e2c531a1f7 Merge pull request #1760 from Xav83/cppcheckFixes Niels Lohmann 2019-09-24 20:42:38 +02:00
  • 87afee1c39 Runs make amalgamate on the project. Xav83 2019-09-19 19:25:39 +02:00
  • 13a7c60257 Correct a warning from cppcheck: Xav83 2019-09-19 17:58:41 +02:00
  • b9dfdbe6be Correct a warning from cppcheck: Xav83 2019-09-19 17:46:10 +02:00
  • 771d5dadc6 Merge pull request #1741 from tete17/Fix-SFINAE Niels Lohmann 2019-09-16 22:39:42 +02:00
  • cade804c1a make CMake's version config file architecture-independent Hubert Chathi 2019-09-10 23:41:38 -04:00
  • e26a2904fc Fix and add test's for SFINAE problem Miguel Sacristan 2019-09-07 17:36:24 +02:00
  • 06ccd43a2a Merge pull request #1722 from t-b/fix-int64-min-issue Niels Lohmann 2019-09-10 07:58:02 +02:00
  • a6bd798bfa Merge pull request #1728 from t-b/fix-clang-sanitizer-invocation Niels Lohmann 2019-09-10 07:50:02 +02:00
  • 8067c3ca5b Add serialization unit tests for extreme integer values Thomas Braun 2019-08-25 22:02:49 +02:00
  • 70aa8a31a2 Add regression test for dumping the minimum value of int64_t Thomas Braun 2019-08-23 23:50:13 +02:00
  • 6ce2f35ba8 Fix outputting extreme integer values in edge cases Thomas Braun 2019-08-23 23:52:48 +02:00
  • 6d701b29df .travis.yml: Increase the timeout to 45 minutes Thomas Braun 2019-09-03 13:32:25 +02:00
  • d5c0d52f37 external_constructor<std::valarray>: Handle empty array properly Thomas Braun 2019-08-30 13:07:37 +02:00
  • 61fe5f1eee input_buffer_adapter: Fix handling of nullptr input Thomas Braun 2019-08-30 12:39:46 +02:00
  • 9ea3e19121 .travis/cmake: Rework clang sanitizer invocation Thomas Braun 2019-08-27 14:22:19 +02:00
  • f0bff49ffd test/CMakeLists.txt: Remove trailing whitespace Thomas Braun 2019-08-27 14:22:01 +02:00
  • eab68e7750 👷 add test step Niels Lohmann 2019-09-02 22:15:11 +02:00
  • 90c1c24ccb 👷 try GitHub Actions Niels Lohmann 2019-09-02 21:35:53 +02:00
  • bf4156056b ✏️ fix a typo Niels Lohmann 2019-08-27 20:18:04 +02:00
  • b6ee34cc99 Merge branch 'develop' of https://github.com/nlohmann/json into develop Niels Lohmann 2019-08-27 20:03:05 +02:00
  • 7dccfa5355 Merge pull request #1724 from t-b/enhance-travis Niels Lohmann 2019-08-27 19:57:23 +02:00
  • a4eaaa56d1 .travis.yml: Add gcc 9 and compile with experimental C++20 support Thomas Braun 2019-08-26 10:40:13 +02:00
  • fe618ac246 👷 adjust maintainer scripts Niels Lohmann 2019-07-29 18:49:21 +02:00
  • a015b78e81 🔒 add security policy Niels Lohmann 2019-07-28 21:46:32 +02:00
  • 6291803f59 👥 update contributors Niels Lohmann 2019-07-28 21:31:17 +02:00
  • 53c3eefa2c Merge branch 'release/3.7.0' into develop v3.7.0 Niels Lohmann 2019-07-28 21:23:36 +02:00
  • ea60d40f4a Merge branch 'release/3.7.0' Niels Lohmann 2019-07-28 21:23:24 +02:00
  • d275d05514 📝 update documentation Niels Lohmann 2019-07-28 20:54:02 +02:00
  • ddb7f70a12 📝 update documentation Niels Lohmann 2019-07-28 20:53:18 +02:00
  • 48e1fe03b5 🔖 set version to 3.7.0 Niels Lohmann 2019-07-28 20:20:41 +02:00
  • 66d63abe6d Update Makefile Niels Lohmann 2019-07-28 18:40:11 +02:00
  • d4fd731f1f 🔨 fix release target Niels Lohmann 2019-07-28 17:55:01 +02:00
  • d80f8b09f5 🔨 adjust version Niels Lohmann 2019-07-28 15:20:07 +02:00
  • 7bf8a86090 🔨 adjust paths Niels Lohmann 2019-07-28 14:30:17 +02:00
  • 65e4b973bd 🔥 remove leftover file Niels Lohmann 2019-07-21 14:10:37 +02:00
  • 323cf95d8c 🚨 fix linter warning Niels Lohmann 2019-07-21 14:04:49 +02:00
  • 3c4c69a24e 🚨 fix linter warning Niels Lohmann 2019-07-21 13:56:13 +02:00
  • ffe0e3d70f Merge pull request #1673 from remyabel/gnuinstalldirs Niels Lohmann 2019-07-17 06:28:38 +02:00
  • 3184e9bd8b Use GNUInstallDirs instead of hard-coded path. Tommy Nguyen 2019-07-16 11:44:32 -04:00
  • cf8251eb54 🚑 fix compiler errors Niels Lohmann 2019-07-14 21:19:55 +02:00
  • 6c7cde181c Merge branch 'develop' of https://github.com/nlohmann/json into develop Niels Lohmann 2019-07-14 20:58:29 +02:00
  • a501365ea2 Merge branch 'feature/hedley' into develop Niels Lohmann 2019-07-14 20:58:08 +02:00
  • 8d059b96a1 Merge pull request #1670 from podsvirov/readme-package-managers-msys2 Niels Lohmann 2019-07-13 17:58:08 +02:00
  • 6a3cdb281e Package Manager: MSYS2 (pacman) Konstantin Podsvirov 2019-07-12 22:27:17 +03:00
  • b17440c12f 🚨 fix compiler warnings Niels Lohmann 2019-07-12 21:05:16 +02:00
  • 104c5c1996 Merge branch 'feature/json_pointer_contains' into develop Niels Lohmann 2019-07-09 08:08:56 +02:00
  • 7a23aa1c0d Merge branch 'feature/emplace_back' into develop Niels Lohmann 2019-07-09 08:06:27 +02:00
  • 24fa285edb 📝 remove HEDLEY annotation from documentation Niels Lohmann 2019-07-02 21:15:52 +02:00
  • 947656544d 🚨 fix warnings Niels Lohmann 2019-07-02 21:06:42 +02:00
  • 346e9813c5 🚧 add more annotations Niels Lohmann 2019-07-02 20:25:51 +02:00
  • 9289a23a76 Merge pull request #1643 from kevinlul/develop Niels Lohmann 2019-07-01 22:57:04 +02:00
  • 90798caa62 🚚 rename Hedley macros Niels Lohmann 2019-07-01 22:37:30 +02:00
  • 025f4cea42 🚨 fix warning Niels Lohmann 2019-07-01 22:29:21 +02:00
  • 897362191d 🔨 add NLOHMANN_JSON prefix and undef macros Niels Lohmann 2019-07-01 22:24:39 +02:00
  • 1720bfedd1 ⚗️ add Hedley annotations Niels Lohmann 2019-06-30 22:14:02 +02:00
  • e616d095ab Remove boolean regression test for #1642 kevinlul 2019-06-30 11:57:57 -04:00
  • 1be63431f3 make emplace_back return a reference #1609 Niels Lohmann 2019-06-30 12:19:41 +02:00
  • 258fa798f1 add contains function for JSON pointers Niels Lohmann 2019-06-30 10:03:08 +02:00
  • 855156b5e8 Add regression tests for #1642 kevinlul 2019-06-29 19:26:38 -04:00
  • 9a775bcb14 Merge pull request #1570 from nickaein/msvc-regression-tests Niels Lohmann 2019-06-25 07:05:53 +02:00
  • 5b2e2305a0 CI: Skip test-unit_all on MSVC Debug builds Isaac Nickaein 2019-06-24 20:11:56 +04:30
  • 3db14cbfae 📝 Improve doc on const_inter constructor Isaac Nickaein 2019-06-24 15:40:01 +04:30
  • 0a137b78ac Appveyor: Set timeout of unit-tests in appveyor.yml instead of CMake Isaac Nickaein 2019-06-22 21:05:15 +04:30
  • f559142008 Appveyor: Set build mode explicitly Isaac Nickaein 2019-06-22 20:48:02 +04:30
  • eba8244ead Avoid collision of ::max with windows.h macro Isaac Nickaein 2019-06-22 02:33:13 +04:30
  • 798e83a038 Workaround msvc2015 bug with explicit copy-constructor for const_iterator Isaac Nickaein 2019-06-21 23:16:42 +04:30
  • d28b4b900e Add a separate build with Windows.h included Isaac Nickaein 2019-05-21 17:26:30 +04:30
  • 4ac0fe2628 Increase timeout of test-unicode_all in Debug build Isaac Nickaein 2019-04-22 08:16:10 +04:30
  • ec43d27f9f Add Debug builds for AppVeyor Isaac Nickaein 2019-04-22 08:15:53 +04:30
  • 39011a1759 📝 mention json type in documentation start page #1616 Niels Lohmann 2019-06-22 09:54:59 +02:00
  • 3b82a350ed 📝 mention 302 exception in value() documentation #1601 Niels Lohmann 2019-06-22 09:44:12 +02:00
  • 13d4f8f5ad Merge pull request #1639 from taylorhoward92/develop Niels Lohmann 2019-06-22 09:25:02 +02:00
  • f4fca2d59a Fix #1642 kevinlul 2019-06-16 18:22:40 -04:00
  • 2f389cdde7 Added explicit converstion to std::string_view. Fixes failing test with GCC 8.3 Taylor Howard 2019-06-16 14:49:01 +10:00
  • 4fc98e0b34 Merge pull request #1625 from nickaein/fix-docs Niels Lohmann 2019-06-05 20:25:48 +02:00
  • 0c214949f5 ✏️ Fix links to create an issue page Isaac Nickaein 2019-06-04 11:27:10 +04:30
  • b22c577e83 ✏️ Fix brew instructions in README Isaac Nickaein 2019-06-04 11:25:44 +04:30
  • 0d55ddc5bf ✏️ Fix a typo in README Isaac Nickaein 2019-06-04 11:24:22 +04:30
  • 17c0849a63 Merge pull request #1585 from Macr0Nerd/iss916 Niels Lohmann 2019-05-24 09:20:15 +02:00
  • 9f2179deb1 Merge pull request #1598 from nickaein/patch-2 Niels Lohmann 2019-05-24 09:16:38 +02:00
  • 40c3d5024a Fix broken links to documentation Isaac Nickaein 2019-05-12 22:04:01 +04:30
  • 26952500b8 Merge branch 'iss916' of https://github.com/Macr0Nerd/json into iss916 Macr0Nerd 2019-04-26 18:15:52 -05:00