amorfo77/json
1
0
Fork 0
mirror of https://github.com/nlohmann/json.git synced 2026-07-16 23:44:54 +00:00
Code Issues Packages Projects Releases Wiki Activity
4,326 Commits 24 Branches 57 Tags
9105f5514e2094de8a583df83368c0b16febf658
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Niels Lohmann 9105f5514e 🔀 merge develop branch 2021-12-31 14:57:35 +01:00
Niels Lohmann 9dfe422e65 Merge branch 'develop' of https://github.com/nlohmann/json into bon8 
 Conflicts:
	doc/mkdocs/docs/api/basic_json/index.md
	doc/mkdocs/docs/features/binary_formats/bson.md
	doc/mkdocs/docs/features/binary_formats/index.md
	doc/mkdocs/mkdocs.yml
	include/nlohmann/json.hpp
	single_include/nlohmann/json.hpp
 2021-12-31 14:53:13 +01:00
Niels Lohmann 7c26010380 Merge branch 'develop' of https://github.com/nlohmann/json into bon8 2021-11-01 13:31:49 +01:00
Niels Lohmann d997d1b275 Merge branch 'develop' of https://github.com/nlohmann/json into bon8 2021-10-17 15:27:48 +02:00
Niels Lohmann 67c8ead923 Merge branch 'release/3.10.4' into develop 2021-10-16 14:47:23 +02:00
Niels Lohmann a09bfa5faa 🔖 set version to 3.10.4 2021-10-16 13:34:31 +02:00
Niels Lohmann 4b1cb9eee1 Merge branch 'release/3.10.3' into develop 2021-10-08 14:39:34 +02:00
Niels Lohmann ab6a2c7425 🔖 set version to 3.10.3 2021-10-08 13:58:48 +02:00
Niels Lohmann cec6b21695 🚨 fix warning 2021-09-12 22:48:34 +02:00
Niels Lohmann cf81564797 ✅ improve coverage 2021-09-12 22:21:08 +02:00
Niels Lohmann e6013608cc ✅ improve coverage 2021-09-12 19:04:24 +02:00
Niels Lohmann 96b9877d20 Merge branch 'develop' of https://github.com/nlohmann/json into bon8 2021-09-12 18:57:18 +02:00
Niels Lohmann 95d75c2346 🚨 fix warnings 2021-09-12 13:33:45 +02:00
Niels Lohmann b932217c15 🚧 add object and string parser for BON8 2021-09-11 23:28:16 +02:00
Niels Lohmann e27c127068 🚧 start BON8 parser 2021-09-11 22:46:49 +02:00
Niels Lohmann 627eefa5ad 🏁 set flag for MSVC for test-binary_formats 2021-09-11 16:01:10 +02:00
Niels Lohmann e9b1ab4e0a 📝 update table for binary formats 2021-09-11 15:40:47 +02:00
Niels Lohmann 7c55a91004 📝 add documentation 2021-09-11 14:59:21 +02:00
Niels Lohmann 5221115ff1 ♻️ implement floating-point special values 2021-09-11 14:27:38 +02:00
Niels Lohmann 6bfd21e321 ♻️ adjust negative integer representation 2021-09-11 13:50:54 +02:00
Niels Lohmann d798ca24aa ♻️ adjust positive integer representation 2021-09-11 13:22:23 +02:00
Niels Lohmann 623f0e96e2 ✅ improve coverage 2021-09-05 12:44:39 +02:00
Niels Lohmann 62487fcf68 ✅ improve coverage 2021-09-05 11:26:12 +02:00
Niels Lohmann f444d9c14f ✅ improve coverage 2021-09-05 09:25:58 +02:00
Niels Lohmann b4f2cf769a 🚨 fix warnings 2021-09-04 23:26:37 +02:00
Niels Lohmann 78e59f502b 🚨 fix warnings 2021-09-04 22:59:43 +02:00
Niels Lohmann f16465c614 🚨 fix warnings 2021-09-04 22:48:08 +02:00
Niels Lohmann 526bee2bfb 🚨 fix warnings 2021-09-04 22:36:43 +02:00
Niels Lohmann 6cf42d1b55 🚨 fix warnings 2021-09-04 15:54:17 +02:00
Niels Lohmann e6518ff2d6 🚧 add integer support 2021-09-04 14:54:54 +02:00
Niels Lohmann c7440a6da2 Merge branch 'develop' of https://github.com/nlohmann/json into bon8 2021-09-01 20:49:24 +02:00
Niels Lohmann f656f535e1 🚧 begin BON8 implementation 2021-08-31 15:04:06 +02:00
Niels Lohmann 9dfd91695c Merge branch 'release/3.10.2' into develop 2021-08-26 09:08:33 +02:00
Niels Lohmann 33b674b4b2 🔖 set version to 3.10.2 2021-08-26 08:13:04 +02:00
Niels Lohmann 1fd2213fd2 Merge branch 'release/3.10.1' into develop 2021-08-24 21:08:43 +02:00
Niels Lohmann 8ad66e9136 🔖 set version to 3.10.1 2021-08-24 20:19:55 +02:00
Niels Lohmann 97c7a35a2b ✅ add regression test 2021-08-20 14:49:58 +02:00
Niels Lohmann e8e93ee43b 👷 update Travis badge 2021-08-20 13:53:31 +02:00
Niels Lohmann 55281e03af 📝 add documentation for integration via vcpkg 2021-08-18 21:25:23 +02:00
Niels Lohmann 23e3b622aa 📝 add documentation for integration via vcpkg 2021-08-18 20:49:13 +02:00
Niels Lohmann f79bed6d39 👷 avoid duplicate AppVeyor builds 2021-08-18 19:53:35 +02:00
Niels Lohmann cfb71ad1bf 🐛 adding missing header 2021-08-18 13:33:35 +02:00
Niels Lohmann 54d9cd5a12 🔧 guard tests with JSON_Install flag 2021-08-18 13:24:12 +02:00
Niels Lohmann 5d3ad31d7e 🔥 remove outdated json_unit binary 2021-08-18 12:41:03 +02:00
Niels Lohmann f42a74b8f5 Merge branch 'release/3.10.0' into develop 2021-08-17 20:40:42 +02:00
Niels Lohmann 1de378f580 🔖 set version to 3.10.0 2021-08-17 15:23:23 +02:00
Niels Lohmann f1e63a8322 👷 run CI for release branches 2021-08-16 15:40:57 +02:00
Niels Lohmann fa5d3b5a9b 👷 run CI for release branches 2021-08-15 22:49:31 +02:00
Niels Lohmann 09237272bc 👥 update documentation 2021-08-15 21:05:26 +02:00
Niels Lohmann 1aceeff3fc 🚨 fix C4244 warning 2021-08-14 13:40:52 +02:00
Niels Lohmann 0a0eb7a850 Merge branch 'develop' of https://github.com/nlohmann/json into issue2863 
 Conflicts:
	.github/workflows/windows.yml
 2021-08-14 11:19:48 +02:00
Niels Lohmann 4b0e04eb68 🚨 fix C4100 warnings 2021-08-13 17:03:55 +02:00
Niels Lohmann 288cdf9af7 ⚗️ add -WX flag to MSVC builds 2021-08-13 14:07:17 +02:00
Niels Lohmann fecb01858b ⚗️ add -WX flag to MSVC builds 2021-08-13 13:28:17 +02:00
Niels Lohmann 789280fcb2 🚨 fix C4309 warning 2021-08-13 13:20:26 +02:00
Niels Lohmann e65db83448 ⚗️ add -WX flag to MSVC builds 2021-08-13 12:42:38 +02:00
Niels Lohmann e20f3f95eb 🚨 guard GCC pragmas #2924 2021-08-11 23:55:46 +02:00
Niels Lohmann 8ae31a56a5 Merge branch 'develop' of https://github.com/nlohmann/json into issue2824 2021-08-11 08:06:32 +02:00
Niels Lohmann 68d8661f1b 📝 update documentation 2021-08-11 08:06:25 +02:00
Niels Lohmann b792bf5660 ⚗️ try minimal example 2021-08-10 10:29:13 +02:00
Niels Lohmann 26569f8ecc ⚗️ try minimal example 2021-08-10 10:09:31 +02:00
Niels Lohmann edc203a837 ⚗️ try minimal example 2021-08-10 08:35:14 +02:00
Niels Lohmann 0d530c9de8 ⚗️ try minimal example 2021-08-10 08:22:21 +02:00
Niels Lohmann 36394cc262 ⚗️ try minimal example 2021-08-09 21:58:05 +02:00
Niels Lohmann 83c005f881 ⚗️ try minimal example 2021-08-09 21:43:03 +02:00
Niels Lohmann 523f7c2c9d 💡 update documentation 2021-08-08 13:24:17 +02:00
Niels Lohmann db7ccafbda 💚 fix MSVC build 2021-08-07 13:55:25 +02:00
Niels Lohmann a4c3cf7798 💚 fix MSVC build 2021-08-07 13:40:01 +02:00
Niels Lohmann 346c9c1a19 💚 fix MSVC build 2021-08-07 13:37:17 +02:00
Niels Lohmann c5928501b0 💚 fix MSVC build 2021-08-07 13:19:25 +02:00
Niels Lohmann 176e9bf0ab ✅ add tests for CBOR 2021-08-07 13:14:08 +02:00
Niels Lohmann b74474e3fd 💚 fix MSVC build 2021-08-07 13:14:00 +02:00
Niels Lohmann 89c98dfc20 ✨ add option to process binary subtypes in CBOR 2021-08-06 16:41:01 +02:00
Niels Lohmann 51a9880022 ✅ add tests for CBOR 2021-08-06 15:31:11 +02:00
Niels Lohmann b7db1d68d9 ♻️ fix CBOR and BSON 2021-08-06 14:36:38 +02:00
Niels Lohmann 046df035fa ♻️ change type of binary subtype 2021-08-06 13:45:35 +02:00
Niels Lohmann 3eb1fb6be7 ♻️ change type of binary subtype 2021-08-06 13:26:00 +02:00
Niels Lohmann 5c38e76c11 Merge branch 'develop' of https://github.com/nlohmann/json into issue2863 2021-08-06 13:23:26 +02:00
Niels Lohmann 7c19aa2210 ♻️ overwork byte_container_with_subtype 2021-08-01 22:00:57 +02:00
Niels Lohmann eb488bb4d9 📝 add note for wstring handling 2021-08-01 20:54:02 +02:00
Niels Lohmann c3df4ffd5a 🚨 fix warning 2021-08-01 14:08:14 +02:00
Niels Lohmann 5a1bc76f34 ⚗️ switch off exceptions 2021-08-01 13:34:55 +02:00
Niels Lohmann e7260f07f5 Merge branch 'develop' of https://github.com/nlohmann/json into issue2824 2021-08-01 13:07:43 +02:00
Niels Lohmann a54403290e 📄 add CITATION file 2021-08-01 12:42:59 +02:00
Niels Lohmann 8676f6745e ✅ add regression test #2824 2021-07-30 21:18:25 +02:00
Niels Lohmann f4716a0d42 🚨 fix useless-cast warnings 2021-07-30 21:12:55 +02:00
Niels Lohmann 9a459e1bd5 🚨 fix useless-cast warnings 2021-07-30 15:20:22 +02:00
Niels Lohmann c7822840eb ✅ add regression test #2824 2021-07-30 15:00:54 +02:00
Niels Lohmann 7feb2c20cf 🚨 fix useless-cast warnings 2021-07-30 14:48:25 +02:00
Niels Lohmann 2c030bac2c ✅ add regression test #2824 2021-07-30 14:41:06 +02:00
Niels Lohmann 1c030cccf1 ✅ add regression test #2824 2021-07-29 15:23:21 +02:00
Niels Lohmann 03270ef090 👥 update contributors 2021-07-19 16:57:15 +02:00
Niels Lohmann 45016c4429 ⬆️ update Doxyfile 2021-07-19 16:56:43 +02:00
Niels Lohmann 7066ab128f 🎨 reindent code 2021-07-19 16:56:28 +02:00
Niels Lohmann 926fab47d0 📝 fix GIF examples #2457 2021-07-17 14:43:01 +02:00
Niels Lohmann a0863b8c20 📝 add support section 2021-07-17 13:44:54 +02:00
Niels Lohmann 517aeec299 Merge remote-tracking branch 'origin/develop' into develop 2021-07-17 12:39:45 +02:00
Niels Lohmann 3db8903f29 📝 restructure README 2021-07-16 15:00:11 +02:00
Niels Lohmann fb1ee4f94b 📝 update documentation 2021-07-16 14:41:14 +02:00
Niels Lohmann 835749efcc ✅ add test for JSON_SystemInclude flag 2021-07-16 12:34:15 +02:00