3094 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Niels Lohmann	346e9813c5	🚧 add more annotations	2019-07-02 20:25:51 +02:00
Niels Lohmann	90798caa62	🚚 rename Hedley macros	2019-07-01 22:37:30 +02:00
Niels Lohmann	025f4cea42	🚨 fix warning	2019-07-01 22:29:21 +02:00
Niels Lohmann	897362191d	🔨 add NLOHMANN_JSON prefix and undef macros	2019-07-01 22:24:39 +02:00
Niels Lohmann	1720bfedd1	⚗️ add Hedley annotations	2019-06-30 22:14:02 +02:00
Niels Lohmann	9a775bcb14	Merge pull request #1570 from nickaein/msvc-regression-tests ... Regression tests for MSVC	2019-06-25 07:05:53 +02:00
Isaac Nickaein	5b2e2305a0	CI: Skip test-unit_all on MSVC Debug builds	2019-06-24 21:21:58 +04:30
Isaac Nickaein	3db14cbfae	📝 Improve doc on const_inter constructor	2019-06-24 15:40:01 +04:30
Isaac Nickaein	0a137b78ac	Appveyor: Set timeout of unit-tests in appveyor.yml instead of CMake	2019-06-22 22:14:40 +04:30
Isaac Nickaein	f559142008	Appveyor: Set build mode explicitly	2019-06-22 21:15:17 +04:30
Isaac Nickaein	eba8244ead	Avoid collision of ::max with windows.h macro	2019-06-22 21:15:13 +04:30
Isaac Nickaein	798e83a038	Workaround msvc2015 bug with explicit copy-constructor for const_iterator	2019-06-22 21:15:11 +04:30
Isaac Nickaein	d28b4b900e	Add a separate build with Windows.h included	2019-06-22 21:15:07 +04:30
Isaac Nickaein	4ac0fe2628	Increase timeout of test-unicode_all in Debug build	2019-06-22 21:15:03 +04:30
Isaac Nickaein	ec43d27f9f	Add Debug builds for AppVeyor	2019-06-22 21:14:51 +04:30
Niels Lohmann	39011a1759	📝 mention json type in documentation start page #1616	2019-06-22 09:54:59 +02:00
Niels Lohmann	3b82a350ed	📝 mention 302 exception in value() documentation #1601	2019-06-22 09:44:12 +02:00
Niels Lohmann	13d4f8f5ad	Merge pull request #1639 from taylorhoward92/develop ... Add explicit conversion from json to std::string_view in conversion unit test	2019-06-22 09:25:02 +02:00
Taylor Howard	2f389cdde7	Added explicit converstion to std::string_view. Fixes failing test with GCC 8.3	2019-06-16 14:49:01 +10:00
Niels Lohmann	4fc98e0b34	Merge pull request #1625 from nickaein/fix-docs ... Minor fixes in docs	2019-06-05 20:25:48 +02:00
Isaac Nickaein	0c214949f5	✏️ Fix links to create an issue page	2019-06-04 11:27:25 +04:30
Isaac Nickaein	b22c577e83	✏️ Fix brew instructions in README	2019-06-04 11:25:44 +04:30
Isaac Nickaein	0d55ddc5bf	✏️ Fix a typo in README	2019-06-04 11:24:22 +04:30
Niels Lohmann	17c0849a63	Merge pull request #1585 from Macr0Nerd/iss916 ... Added to_string and added basic tests	2019-05-24 09:20:15 +02:00
Niels Lohmann	9f2179deb1	Merge pull request #1598 from nickaein/patch-2 ... Fix broken links to documentation	2019-05-24 09:16:38 +02:00
Isaac Nickaein	40c3d5024a	Fix broken links to documentation ... Fixes #1597 and some other links	2019-05-12 22:04:01 +04:30
Macr0Nerd	26952500b8	Merge branch 'iss916' of https://github.com/Macr0Nerd/json into iss916	2019-04-26 18:15:52 -05:00
Macr0Nerd	aa4c45ee4d	Added to_string (with ugly macro) and tests	2019-04-26 18:10:45 -05:00
Macr0Nerd	293cd6b794	Added to_string and added basic tests	2019-04-25 22:12:15 -05:00
Niels Lohmann	ee4028b8e4	Merge branch 'feature/fastcov' into develop	2019-04-06 09:15:43 +02:00
Niels Lohmann	cf6b6692aa	Merge branch 'develop' into feature/fastcov	2019-04-06 09:03:35 +02:00
Niels Lohmann	f0bc16d899	🔨 overworked coverage targets	2019-04-06 09:02:17 +02:00
Niels Lohmann	b4b06d89b5	⬆️ updated fastcov	2019-04-06 00:24:19 +02:00
Niels Lohmann	e65cff2a8f	🔨 small cleanup	2019-04-05 23:31:04 +02:00
Niels Lohmann	63fe1cbbcf	📝 updated README	2019-04-05 18:29:57 +02:00
Niels Lohmann	0bdadb12c7	Merge branch 'feature/circleci' into develop	2019-04-05 17:50:48 +02:00
Niels Lohmann	0a1ddd6882	⬆️ updated fastcov	2019-04-05 07:54:46 +02:00
Niels Lohmann	4676f759e8	⬆️ updated fastcov	2019-04-04 09:50:27 +02:00
Niels Lohmann	da279234d5	Merge branch 'develop' into feature/fastcov	2019-04-04 09:03:11 +02:00
Niels Lohmann	f05614b240	🏗️ adding anonymous namespace	2019-04-04 08:56:36 +02:00
Niels Lohmann	0da99027b7	🚨 silenced a warning	2019-04-03 17:44:09 +02:00
Niels Lohmann	1f03395e2c	Merge branch 'develop' of https://github.com/nlohmann/json into develop	2019-04-03 17:28:50 +02:00
Niels Lohmann	2f9095ddab	🔨 relaxed requirements to coverage	2019-04-03 17:28:47 +02:00
Niels Lohmann	ee8732c359	Merge pull request #1555 from theodelrieu/fix/1511 ... Fix/1511	2019-04-03 17:24:25 +02:00
Niels Lohmann	d1ef75316e	Merge pull request #1439 from onqtam/doctest ... moved from Catch to doctest for unit tests	2019-04-03 17:01:48 +02:00
Théo DELRIEU	d66abda4ee	tests: fix coverage	2019-04-03 12:34:15 +02:00
Théo DELRIEU	e6e6805c6c	add built-in array support in get_to	2019-04-01 17:47:45 +02:00
Théo DELRIEU	2806b201a8	make sure values are overwritten in from_json overloads ... Caused unexpected behaviors when using get_to with values previously set. Fixes !1511	2019-04-01 17:47:42 +02:00
onqtam	da5b7833a0	fixing the remaining of the pedantic gcc/clang target warnings	2019-03-31 13:57:44 +03:00
Viktor Kirilov	64873fb5b8	Merge branch 'develop' into doctest	2019-03-30 23:23:33 +02:00