3950 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Francois Chabot	d3caf93ab0	Merge branch 'develop' into 1813-user-input	2020-05-28 03:40:34 -04:00
Francois Chabot	bfcd32c099	removed clang-format	2020-05-28 03:16:24 -04:00
Francois Chabot	3a91a05db6	added custom input to readme	2020-05-28 03:13:39 -04:00
Francois Chabot	a4f1cf4d00	better parse documentation	2020-05-28 02:50:58 -04:00
Francois Chabot	76b49f9ee6	misc formatting fixes	2020-05-28 02:29:53 -04:00
Niels Lohmann	9ec0e4c25b	Merge pull request #2140 from nlohmann/issue1715 ... Respect allow_exceptions=false for binary formats	2020-05-28 07:52:26 +02:00
Niels Lohmann	a01759af0f	Merge pull request #2143 from quentin-dev/develop ... Fix issue#2142: readme: fix typo in CMake FetchContent example	2020-05-28 07:50:27 +02:00
Francois Chabot	377995f495	forcefully exclude arrays from being interpreted as pointers	2020-05-27 18:21:38 -04:00
Francois Chabot	b9416a26aa	correct ADL lookup of arrays on Mac and Windows	2020-05-27 13:21:23 -04:00
Francois Chabot	f1969e60a3	reamalgamate	2020-05-27 12:56:26 -04:00
Francois Chabot	5684d9a498	unified input API	2020-05-27 12:40:04 -04:00
Quentin Barbarat	e44418ea26	readme: fix typo in CMake FetchContent example	2020-05-27 13:51:13 +02:00
Niels Lohmann	bb9619ef8b	📝 request more details in question template	2020-05-27 13:22:34 +02:00
Niels Lohmann	325e8ab8ab	🔧 explicitly switch on tests in CI	2020-05-27 13:22:14 +02:00
Tobias Kux	23051df2c7	Cast character to unsigned for comparison	2020-05-27 13:15:31 +02:00
Niels Lohmann	ed5c28d00c	👥 update contributor list	2020-05-27 13:07:24 +02:00
Niels Lohmann	d70d06ae41	Merge pull request #2137 from dota17/MSC_VER ... Fix issue 2112	2020-05-27 08:49:19 +02:00
Niels Lohmann	e3d9b3d755	📝 add documentation of parser callbacks	2020-05-26 14:16:13 +02:00
Niels Lohmann	ace594da6a	Merge branches 'develop' and 'mkdocs' of https://github.com/nlohmann/json into mkdocs	2020-05-26 13:17:55 +02:00
Niels Lohmann	3c60a66c4c	Merge pull request #2104 from dota17/issue#2086 ... Fix issue#2086: disallow json::value_t type parameter in value()	2020-05-26 13:15:06 +02:00
Niels Lohmann	27fe50dc92	📝 add example for contains #2133 ... Closes #2133.	2020-05-26 12:46:04 +02:00
Niels Lohmann	25aab7ee41	Merge pull request #2136 from aokellermann/CircleCI_GCC_BleedingEdge ... Add bleeding edge GCC to CI	2020-05-26 12:39:42 +02:00
chenguoping	eb50fbf926	fix issue 2112	2020-05-26 16:43:16 +08:00
Antony Kellermann	49000cd77d	Update documentation to reflect addition of Arch Linux CI testing.	2020-05-25 20:46:39 -04:00
Antony Kellermann	5a72cfa0c3	Add base and base-devel to list of arch linux programs to install.	2020-05-25 20:43:15 -04:00
Antony Kellermann	1d57ddd2d4	Add -y flag to pacman to sync repos.	2020-05-25 20:24:54 -04:00
Antony Kellermann	41a84b1202	Add workflows for CircleCI so that build_stable and build_bleeding_edge jobs can run concurrently.	2020-05-25 20:17:02 -04:00
Antony Kellermann	eff2f51071	Add build_bleeding_edge job to CircleCI, mimicking the original job except using the latest Arch Linux docker image.	2020-05-25 20:14:49 -04:00
Antony Kellermann	bf4a090075	Rename build job to build_stable to be more descriptive.	2020-05-25 20:12:54 -04:00
Niels Lohmann	413df0fd88	📝 add more content to iterator page	2020-05-25 14:03:11 +02:00
Niels Lohmann	95a3c76643	📝 make examples collapsible	2020-05-24 22:45:38 +02:00
Niels Lohmann	ddf92606ab	📝 add PlantUML	2020-05-24 21:05:35 +02:00
Niels Lohmann	3400af21cd	📝 add release page	2020-05-24 13:40:43 +02:00
Niels Lohmann	a8f0cd15df	📝 add mkdocs	2020-05-24 13:03:04 +02:00
Niels Lohmann	c92a696852	📝 update documentation	2020-05-22 18:21:37 +02:00
Niels Lohmann	88292d9499	🚨 remove redundant assertions	2020-05-22 14:19:07 +02:00
Niels Lohmann	225fa58f16	🚧 add fix from #1715	2020-05-20 22:20:40 +02:00
Niels Lohmann	a82c80e9af	Merge pull request #2125 from nlohmann/binary_type ... Clean up implementation of binary type	2020-05-20 18:58:29 +02:00
Niels Lohmann	ae29456b3f	🚸 overwork report templates	2020-05-20 18:57:21 +02:00
Niels Lohmann	a861bdb81f	Merge pull request #2121 from gistrec/fix_compilation_error_msvc ... Fixed a compilation error in MSVC	2020-05-19 13:55:37 +02:00
Niels Lohmann	4d39644bd0	💚 fix build	2020-05-19 13:45:52 +02:00
Niels Lohmann	21b1680ea1	🚚 rename binary_array() to binary()	2020-05-19 13:30:22 +02:00
Niels Lohmann	86b053e916	Merge branches 'binary_type' and 'develop' of https://github.com/nlohmann/json into binary_type	2020-05-19 13:10:35 +02:00
Niels Lohmann	952a87a4f4	🚚 move byte container outside detail namespace	2020-05-19 13:08:18 +02:00
Niels Lohmann	79347b484b	✅ improve test coverage	2020-05-19 12:40:32 +02:00
Niels Lohmann	5cfa8a586e	👷 run workflows on pull requests	2020-05-18 14:01:54 +02:00
Niels Lohmann	b7ff40029a	💥 change serialization of binary values	2020-05-18 13:53:20 +02:00
Niels Lohmann	9eb19bcc27	✅ add more tests for binary type	2020-05-18 12:33:26 +02:00
gistrec	9e765f5aed	Fixed std::numeric_limit::max() call	2020-05-18 10:25:55 +00:00
gistrec	3f0cf26f7a	changes to the single header were applied	2020-05-18 10:17:45 +00:00