Commit Graph

  • 5fe6b83c26 Merge pull request #2158 from dota17/output_adapter Niels Lohmann 2020-06-05 08:25:19 +02:00
  • ad2b4ff23b recover original blank line chenguoping 2020-06-05 14:23:00 +08:00
  • 0f67c5849f undo: remove comment chenguoping 2020-06-05 10:09:15 +08:00
  • 2df5f107a9 📝 add page on parsing and exceptions Niels Lohmann 2020-06-04 14:01:57 +02:00
  • 32bda1a7af Merge branches 'develop' and 'mkdocs' of https://github.com/nlohmann/json into mkdocs Niels Lohmann 2020-06-04 13:07:20 +02:00
  • 24e8562664 👷 remove Clang 8 Niels Lohmann 2020-06-04 12:48:03 +02:00
  • a53e3a5443 👷 try Clang 8 Niels Lohmann 2020-06-04 12:34:56 +02:00
  • dc323314d5 👷 try Clang 10 Niels Lohmann 2020-06-04 12:29:53 +02:00
  • 402c34c526 👷 try Clang 10 Niels Lohmann 2020-06-04 12:27:37 +02:00
  • 65c4b07451 🎨 replace alternative operators (and, not, or) Niels Lohmann 2020-06-03 21:22:07 +02:00
  • 0498202a03 🎨 replace alternative operators (and, not, or) Niels Lohmann 2020-06-03 14:20:36 +02:00
  • 4f04ea1bef Merge branches 'clang_windows' and 'develop' of https://github.com/nlohmann/json into clang_windows Niels Lohmann 2020-06-03 14:01:18 +02:00
  • 9212590764 👥 update contributor list Niels Lohmann 2020-06-03 13:56:01 +02:00
  • 9708b1e9c3 🔥 remove Code Inspector Niels Lohmann 2020-06-03 13:49:46 +02:00
  • 68fd772fdf 👷 add Code Inspector via GitHub Action Niels Lohmann 2020-06-03 13:44:33 +02:00
  • 9bc2a7fa25 👷 add Code Inspector via GitHub Action Niels Lohmann 2020-06-03 13:39:56 +02:00
  • c24218afe8 Merge remote-tracking branch 'origin/develop' into develop Niels Lohmann 2020-06-03 13:38:15 +02:00
  • 2c4be7d65c Merge pull request #2152 from TotalCaesar659/patch-1 Niels Lohmann 2020-06-03 12:31:33 +02:00
  • 2ad847f21b 🔨 fix doxygen link Niels Lohmann 2020-06-03 12:30:42 +02:00
  • fdf5a63dfd 🔨 fix Doxygen link Niels Lohmann 2020-06-03 12:30:10 +02:00
  • 309acb445a Merge pull request #2153 from dota17/issue#1972 Niels Lohmann 2020-06-03 12:26:17 +02:00
  • eca4b8785c fix test case in PR#1006 chenguoping 2020-06-02 15:44:26 +08:00
  • fff1499963 add comment about PR#1006 chenguoping 2020-06-02 15:43:57 +08:00
  • 8cd39578e3 add test case chenguoping 2020-06-01 11:34:03 +08:00
  • 5ea205f570 👷 install clang Niels Lohmann 2020-05-30 18:17:54 +02:00
  • 5f10d5d156 👷 install clang Niels Lohmann 2020-05-30 18:15:13 +02:00
  • 7c0c522b96 👷 install clang Niels Lohmann 2020-05-30 18:11:54 +02:00
  • 522ec5d7bd 👷 install clang Niels Lohmann 2020-05-30 18:06:52 +02:00
  • 7e5c2a480a 👷 install clang Niels Lohmann 2020-05-30 18:04:07 +02:00
  • 9c971c2d2f 👷 install clang Niels Lohmann 2020-05-30 17:40:27 +02:00
  • 4ba8c95794 👷 install clang Niels Lohmann 2020-05-30 13:41:18 +02:00
  • fbd3e8f677 👷 install clang Niels Lohmann 2020-05-30 13:35:19 +02:00
  • 0309025b45 👷 set full path Niels Lohmann 2020-05-30 13:28:44 +02:00
  • 9191926fff 👷 use Makefiles Niels Lohmann 2020-05-30 13:23:13 +02:00
  • 42ef2a5adb 👷 use Clang compiler Niels Lohmann 2020-05-30 13:15:56 +02:00
  • 2182935397 👷 add Clang/Windows step Niels Lohmann 2020-05-30 13:07:23 +02:00
  • 4350c5ed97 fix bug in issue#1972 chenguoping 2020-05-30 17:15:56 +08:00
  • 0aa13599f0 Update URLs to HTTPS TotalCaesar659 2020-05-30 06:02:25 +03:00
  • 0da131d717 minor readme correction Francois Chabot 2020-05-28 17:12:26 -04:00
  • b715a70673 changed macro order to satisfy clang Francois Chabot 2020-05-28 12:26:29 -04:00
  • 7646253940 fix inconsistent fwd declaration Francois Chabot 2020-05-28 12:20:02 -04:00
  • ce3143a038 use correct deprecation macro Francois Chabot 2020-05-28 12:16:10 -04:00
  • d575534471 brought back the from_*(ptr, len) syntax with a deprecation warning Francois Chabot 2020-05-28 12:13:43 -04:00
  • 248f310215 cleaned up custom iterator example Francois Chabot 2020-05-28 10:14:55 -04:00
  • 897061c434 amalgamate Francois Chabot 2020-05-28 10:11:19 -04:00
  • 7ceb06baac Merge branch '1813-user-input' of https://github.com/FrancoisChabot/json into 1813-user-input Francois Chabot 2020-05-28 09:30:07 -04:00
  • dcf6175978 use the correct convention for boolean operators Francois Chabot 2020-05-28 09:29:38 -04:00
  • 23c8ab95da 👥 update contributor list Niels Lohmann 2020-05-28 14:24:08 +02:00
  • 53ef076715 🔧 add more warning flags from GCC 10 Niels Lohmann 2020-05-28 13:46:56 +02:00
  • 2edb5cb999 👷 fix -DJSON_BuildTests=On parameter placement Niels Lohmann 2020-05-28 13:46:47 +02:00
  • 61832afe15 Merge pull request #2144 from XyFreak/gcc10_type_limits Niels Lohmann 2020-05-28 12:59:57 +02:00
  • 5ff4d7b7ff Merge branch 'develop' of https://github.com/nlohmann/json into develop Niels Lohmann 2020-05-28 12:54:13 +02:00
  • fcda998ee2 🔧 add more warning flags from GCC 10 Niels Lohmann 2020-05-28 12:53:22 +02:00
  • d3caf93ab0 Merge branch 'develop' into 1813-user-input Francois Chabot 2020-05-28 03:40:34 -04:00
  • bfcd32c099 removed clang-format Francois Chabot 2020-05-28 03:16:24 -04:00
  • 3a91a05db6 added custom input to readme Francois Chabot 2020-05-28 03:13:39 -04:00
  • a4f1cf4d00 better parse documentation Francois Chabot 2020-05-28 02:50:58 -04:00
  • 76b49f9ee6 misc formatting fixes Francois Chabot 2020-05-28 02:29:53 -04:00
  • 9ec0e4c25b Merge pull request #2140 from nlohmann/issue1715 Niels Lohmann 2020-05-28 07:52:26 +02:00
  • a01759af0f Merge pull request #2143 from quentin-dev/develop Niels Lohmann 2020-05-28 07:50:27 +02:00
  • 377995f495 forcefully exclude arrays from being interpreted as pointers Francois Chabot 2020-05-27 18:21:38 -04:00
  • b9416a26aa correct ADL lookup of arrays on Mac and Windows Francois Chabot 2020-05-27 13:21:23 -04:00
  • f1969e60a3 reamalgamate Francois Chabot 2020-05-27 12:56:26 -04:00
  • 5684d9a498 unified input API Francois Chabot 2020-05-27 12:40:04 -04:00
  • e44418ea26 readme: fix typo in CMake FetchContent example Quentin Barbarat 2020-05-27 13:51:13 +02:00
  • bb9619ef8b 📝 request more details in question template Niels Lohmann 2020-05-27 13:22:34 +02:00
  • 325e8ab8ab 🔧 explicitly switch on tests in CI Niels Lohmann 2020-05-27 13:22:14 +02:00
  • 23051df2c7 Cast character to unsigned for comparison Tobias Kux 2020-05-27 13:15:31 +02:00
  • ed5c28d00c 👥 update contributor list Niels Lohmann 2020-05-27 13:07:24 +02:00
  • d70d06ae41 Merge pull request #2137 from dota17/MSC_VER Niels Lohmann 2020-05-27 08:49:19 +02:00
  • e3d9b3d755 📝 add documentation of parser callbacks Niels Lohmann 2020-05-26 14:16:13 +02:00
  • ace594da6a Merge branches 'develop' and 'mkdocs' of https://github.com/nlohmann/json into mkdocs Niels Lohmann 2020-05-26 13:17:55 +02:00
  • 3c60a66c4c Merge pull request #2104 from dota17/issue#2086 Niels Lohmann 2020-05-26 13:15:06 +02:00
  • 27fe50dc92 📝 add example for contains #2133 Niels Lohmann 2020-05-26 12:46:04 +02:00
  • 25aab7ee41 Merge pull request #2136 from aokellermann/CircleCI_GCC_BleedingEdge Niels Lohmann 2020-05-26 12:39:42 +02:00
  • eb50fbf926 fix issue 2112 chenguoping 2020-05-26 16:43:16 +08:00
  • 49000cd77d Update documentation to reflect addition of Arch Linux CI testing. Antony Kellermann 2020-05-25 20:46:39 -04:00
  • 5a72cfa0c3 Add base and base-devel to list of arch linux programs to install. Antony Kellermann 2020-05-25 20:43:15 -04:00
  • 1d57ddd2d4 Add -y flag to pacman to sync repos. Antony Kellermann 2020-05-25 20:24:54 -04:00
  • 41a84b1202 Add workflows for CircleCI so that build_stable and build_bleeding_edge jobs can run concurrently. Antony Kellermann 2020-05-25 20:17:02 -04:00
  • eff2f51071 Add build_bleeding_edge job to CircleCI, mimicking the original job except using the latest Arch Linux docker image. Antony Kellermann 2020-05-25 20:14:49 -04:00
  • bf4a090075 Rename build job to build_stable to be more descriptive. Antony Kellermann 2020-05-25 20:12:54 -04:00
  • 413df0fd88 📝 add more content to iterator page Niels Lohmann 2020-05-25 14:03:11 +02:00
  • 95a3c76643 📝 make examples collapsible Niels Lohmann 2020-05-24 22:45:38 +02:00
  • ddf92606ab 📝 add PlantUML Niels Lohmann 2020-05-24 21:05:35 +02:00
  • 3400af21cd 📝 add release page Niels Lohmann 2020-05-24 13:40:43 +02:00
  • a8f0cd15df 📝 add mkdocs Niels Lohmann 2020-05-24 13:03:04 +02:00
  • c92a696852 📝 update documentation Niels Lohmann 2020-05-22 18:21:37 +02:00
  • 88292d9499 🚨 remove redundant assertions Niels Lohmann 2020-05-22 14:19:07 +02:00
  • 225fa58f16 🚧 add fix from #1715 Niels Lohmann 2020-05-20 22:20:40 +02:00
  • b61d563ebe Merge branches 'develop' and 'feature/optional' of https://github.com/nlohmann/json into feature/optional Niels Lohmann 2020-05-20 19:00:49 +02:00
  • a82c80e9af Merge pull request #2125 from nlohmann/binary_type Niels Lohmann 2020-05-20 18:58:29 +02:00
  • ae29456b3f 🚸 overwork report templates Niels Lohmann 2020-05-20 18:57:21 +02:00
  • a861bdb81f Merge pull request #2121 from gistrec/fix_compilation_error_msvc Niels Lohmann 2020-05-19 13:55:37 +02:00
  • 4d39644bd0 💚 fix build Niels Lohmann 2020-05-19 13:45:52 +02:00
  • 21b1680ea1 🚚 rename binary_array() to binary() Niels Lohmann 2020-05-19 13:30:22 +02:00
  • 86b053e916 Merge branches 'binary_type' and 'develop' of https://github.com/nlohmann/json into binary_type Niels Lohmann 2020-05-19 13:10:35 +02:00
  • 952a87a4f4 🚚 move byte container outside detail namespace Niels Lohmann 2020-05-19 13:08:18 +02:00
  • 79347b484b improve test coverage Niels Lohmann 2020-05-19 12:40:32 +02:00
  • 5cfa8a586e 👷 run workflows on pull requests Niels Lohmann 2020-05-18 14:01:54 +02:00