3527 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Niels Lohmann	7444c7fa25	Merge pull request #2145 from FrancoisChabot/1813-user-input ... Fix Issue#1813: user defined input adapters	2020-06-05 14:30:39 +02:00
Niels Lohmann	dd7e25927f	🚨 fix warning	2020-06-05 08:27:15 +02:00
Niels Lohmann	5fe6b83c26	Merge pull request #2158 from dota17/output_adapter ... Fix PR#1006	2020-06-05 08:25:19 +02:00
chenguoping	ad2b4ff23b	recover original blank line	2020-06-05 14:23:00 +08:00
chenguoping	0f67c5849f	undo: remove comment	2020-06-05 10:09:15 +08:00
Niels Lohmann	9212590764	👥 update contributor list	2020-06-03 13:56:01 +02:00
Niels Lohmann	9708b1e9c3	🔥 remove Code Inspector	2020-06-03 13:49:46 +02:00
Niels Lohmann	68fd772fdf	👷 add Code Inspector via GitHub Action	2020-06-03 13:44:33 +02:00
Niels Lohmann	9bc2a7fa25	👷 add Code Inspector via GitHub Action	2020-06-03 13:39:56 +02:00
Niels Lohmann	c24218afe8	Merge remote-tracking branch 'origin/develop' into develop	2020-06-03 13:38:15 +02:00
Niels Lohmann	2c4be7d65c	Merge pull request #2152 from TotalCaesar659/patch-1 ... Update URLs to HTTPS	2020-06-03 12:31:33 +02:00
Niels Lohmann	2ad847f21b	🔨 fix doxygen link	2020-06-03 12:30:42 +02:00
Niels Lohmann	fdf5a63dfd	🔨 fix Doxygen link	2020-06-03 12:30:10 +02:00
Niels Lohmann	309acb445a	Merge pull request #2153 from dota17/issue#1972 ... Fix issue#1972	2020-06-03 12:26:17 +02:00
chenguoping	eca4b8785c	fix test case in PR#1006	2020-06-02 15:44:26 +08:00
chenguoping	fff1499963	add comment about PR#1006	2020-06-02 15:43:57 +08:00
chenguoping	8cd39578e3	add test case	2020-06-01 11:34:03 +08:00
chenguoping	4350c5ed97	fix bug in issue#1972	2020-05-30 17:15:56 +08:00
TotalCaesar659	0aa13599f0	Update URLs to HTTPS	2020-05-30 06:02:25 +03:00
Francois Chabot	0da131d717	minor readme correction	2020-05-28 17:12:26 -04:00
Francois Chabot	b715a70673	changed macro order to satisfy clang	2020-05-28 12:26:29 -04:00
Francois Chabot	7646253940	fix inconsistent fwd declaration	2020-05-28 12:20:02 -04:00
Francois Chabot	ce3143a038	use correct deprecation macro	2020-05-28 12:16:10 -04:00
Francois Chabot	d575534471	brought back the from_*(ptr, len) syntax with a deprecation warning	2020-05-28 12:13:43 -04:00
Francois Chabot	248f310215	cleaned up custom iterator example	2020-05-28 10:14:55 -04:00
Francois Chabot	897061c434	amalgamate	2020-05-28 10:11:19 -04:00
Francois Chabot	7ceb06baac	Merge branch '1813-user-input' of https://github.com/FrancoisChabot/json into 1813-user-input	2020-05-28 09:30:07 -04:00
Francois Chabot	dcf6175978	use the correct convention for boolean operators	2020-05-28 09:29:38 -04:00
Niels Lohmann	23c8ab95da	👥 update contributor list	2020-05-28 14:24:08 +02:00
Niels Lohmann	53ef076715	🔧 add more warning flags from GCC 10	2020-05-28 13:46:56 +02:00
Niels Lohmann	2edb5cb999	👷 fix -DJSON_BuildTests=On parameter placement	2020-05-28 13:46:47 +02:00
Niels Lohmann	61832afe15	Merge pull request #2144 from XyFreak/gcc10_type_limits ... Fix issue#1939: Cast character to unsigned for comparison	2020-05-28 12:59:57 +02:00
Niels Lohmann	5ff4d7b7ff	Merge branch 'develop' of https://github.com/nlohmann/json into develop	2020-05-28 12:54:13 +02:00
Niels Lohmann	fcda998ee2	🔧 add more warning flags from GCC 10	2020-05-28 12:53:22 +02:00
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