Commit Graph

  • 0f6a58eeaf 👥 update contributors Niels Lohmann 2019-11-06 17:35:04 +01:00
  • 1e9f16dff0 🚨 fix linter errors Niels Lohmann 2019-11-05 20:25:53 +01:00
  • c0ae88bf50 🚨 fix linter errors Niels Lohmann 2019-11-05 20:23:17 +01:00
  • 62dada05ca 🐛 fix conversion to std::valarray Niels Lohmann 2019-11-05 19:28:00 +01:00
  • 7bcaba0ca9 Merge pull request #1821 from AnthonyVH/develop Niels Lohmann 2019-11-05 19:15:54 +01:00
  • 1ca6f2901b Merge pull request #1826 from cbegue/develop Niels Lohmann 2019-11-05 19:14:37 +01:00
  • abccafa5c5 ⬆️ upgrade Doctest to 2.3.5 Niels Lohmann 2019-11-05 19:11:54 +01:00
  • c4923e3d05 Merge remote-tracking branch 'upstream/develop' into develop Anthony VH 2019-11-04 20:50:43 +01:00
  • ec9647ae63 Moved test for #1647 regression to regressions file. Anthony VH 2019-11-04 20:45:24 +01:00
  • 8b686b30eb Add restriction for tuple specialization of to_json Camille Bégué 2019-10-31 18:39:01 +01:00
  • 3790bd9ae0 👷 add Xcode 10.2 Niels Lohmann 2019-11-04 06:22:39 +01:00
  • 42e9ad32c6 🔨 remove full path Niels Lohmann 2019-11-03 21:49:22 +01:00
  • e779714dd8 👷 add Xcode 10.2 Niels Lohmann 2019-11-03 20:45:21 +01:00
  • bf2afaeee6 🔊 add version output Niels Lohmann 2019-11-03 20:27:07 +01:00
  • 6a4cc29f01 📝 update examples Niels Lohmann 2019-11-03 19:40:38 +01:00
  • dfe53c36da 🚨 fix UBSAN warnings Niels Lohmann 2019-11-03 13:48:25 +01:00
  • 0db1692f45 👥 update contributors Niels Lohmann 2019-11-02 10:24:06 +01:00
  • 1307862b1d Merge pull request #1694 from eli-schwartz/release-include-meson Niels Lohmann 2019-11-02 09:28:51 +01:00
  • 4d1e4c6d93 Merge pull request #1780 from t-b/add-msvc-16-2019 Niels Lohmann 2019-11-02 08:16:53 +01:00
  • a1828bbf57 Merge pull request #1806 from cbegue/develop Niels Lohmann 2019-11-01 19:46:19 +01:00
  • 794a3d411a Fix issue #1805 Camille Bégué 2019-10-21 17:50:15 +02:00
  • ddda67a096 Don't capture json input by value (fixed #1822). Anthony Van Herrewege 2019-10-30 16:16:34 +01:00
  • fb9a2643c8 Add test for #1647. Anthony Van Herrewege 2019-10-30 15:46:31 +01:00
  • 27d0dfc17a Fix #1647: non-member operator== breaks enum (de)serialization. Anthony Van Herrewege 2019-10-30 14:54:52 +01:00
  • f272ad533d 👥 add CODEOWNERS file Niels Lohmann 2019-10-23 21:41:12 +02:00
  • f7e7a62358 📝 add comment on JSON_THROW_USER, JSON_TRY_USER, and JSON_CATCH_USER Niels Lohmann 2019-10-23 20:58:06 +02:00
  • 507d5676ad 🚨 fix warning Niels Lohmann 2019-10-23 20:57:10 +02:00
  • 00cb98a3d1 Merge pull request #1803 from flopp/spelling Niels Lohmann 2019-10-21 20:50:13 +02:00
  • b93d414a35 Fix some spelling errors - mostly in comments & documentation. Florian Pigorsch 2019-10-19 11:59:46 +02:00
  • f4332d4097 README: describe how to use json as a meson subproject Eli Schwartz 2019-09-02 15:25:11 -04:00
  • 84faa36ec5 release: add singleinclude and meson.build to include.zip Eli Schwartz 2019-07-31 15:43:31 -04:00
  • 0245ae5157 Merge pull request #1797 from t-b/fix-integer-truncation Niels Lohmann 2019-10-17 21:02:48 +02:00
  • 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