wt/json
1
0 Fork 0
mirror of https://github.com/nlohmann/json.git synced 2026-11-12 16:50:22 +00:00
Code Issues Packages Projects Releases Wiki Activity
1,596 Commits 21 Branches 57 Tags
b86d2148ef09f3ec005f39b024f8fff50cedf196
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Niels Lohmann 22b9a301d6 Merge pull request #450 from nlohmann/TurpentineDistillery-feature/locale_independent_str_to_num 
TurpentineDistillery feature/locale independent str to num
 2017-02-14 07:18:35 +01:00
Niels Lohmann 4746a4c536 💄 minor change 2017-02-08 17:56:43 +01:00
Niels Lohmann 163f8397fd ✏️ fixed a typo #446 2017-02-05 17:11:26 +01:00
Niels Lohmann 8d88a1da2a 🔀 merged #379 and fixed conflicts 2017-02-05 13:13:41 +01:00
Niels Lohmann d284c86dd1 ✅ uncommented some tests 2017-02-04 21:00:41 +01:00
Niels Lohmann 922fe693e1 ⬆️ updated Catch to v1.7.0 2017-02-04 15:30:28 +01:00
Niels Lohmann 1cfdc2a753 🐛 fixed test compilation 2017-02-04 08:25:55 +01:00
Niels Lohmann 77d6f70602 📝 acknowledgments for #442 and #445 2017-02-03 18:28:22 +01:00
Niels Lohmann d6afaa8e16 📝 fixing a documentation issue #442 2017-02-03 18:15:37 +01:00
Niels Lohmann 5976caf032 ⚡ improved test compilation speed #445 2017-02-03 18:09:55 +01:00
Niels Lohmann 16af771277 ✅ added roundtrip test for the Big List of Naughty Strings 2017-02-01 17:34:39 +01:00
Niels Lohmann bf8fdac99a 👷 dropped Doozer.io support 2017-02-01 16:41:05 +01:00
Niels Lohmann c75865d88c 🐛 fixed -Weffc++ warnings 2017-02-01 15:13:21 +01:00
Niels Lohmann b210f2dbf4 💄 minor refactoring 2017-01-29 21:40:37 +01:00
Niels Lohmann 0164b10e10 ✅ added missing tests found by mutate++ 2017-01-29 17:18:58 +01:00
Niels Lohmann affa3bf4e9 Merge pull request #439 from jaredgrubb/patch-2 
README: adjust boost::optional example
 2017-01-29 08:18:44 +01:00
Niels Lohmann f642934b18 🔀 merge branch 'release/2.1.0' into develop 2017-01-28 18:43:01 +01:00
Niels Lohmann 6746a57524 📝 updated slides 2017-01-28 18:41:30 +01:00
Niels Lohmann eb08e8b09b 📝 updated documentation 2017-01-28 18:20:12 +01:00
Niels Lohmann 4b5c61075f 📄 changes to let Github detect the license 2017-01-28 18:17:57 +01:00
Niels Lohmann 38e4935db0 📝 added example and documentation for the meta function 2017-01-28 17:12:29 +01:00
Niels Lohmann cdde1a9436 🔖 set version to 2.1.0 2017-01-28 16:46:03 +01:00
Niels Lohmann d870826811 🔖 set version to 2.1.0 2017-01-28 16:03:35 +01:00
Niels Lohmann 2f6260751c 📝 fixed #434 2017-01-27 18:50:52 +01:00
Niels Lohmann 42fa3f0568 🔀 merge pull request #435 (based on #338, #355, and #423) 
conversion from/to user-defined types
 2017-01-27 06:22:10 +01:00
Niels Lohmann cd9701b123 💄 cleanup 2017-01-26 20:51:30 +01:00
Niels Lohmann 1305e03557 📝 fixed documentation 2017-01-26 19:39:34 +01:00
Niels Lohmann 77bb7af5d9 📝 added more documentation 2017-01-26 07:29:37 +01:00
Niels Lohmann 4d3053cd42 💄 some cleanup 2017-01-25 22:21:07 +01:00
Niels Lohmann 94d9b7bc86 📝 overworked documentation (re-added constructor examples) 2017-01-25 21:59:54 +01:00
Niels Lohmann ec03c9c53e 📝 overworked docs #435 2017-01-25 19:01:31 +01:00
Niels Lohmann 4139bb6572 📝 adjusted test count 2017-01-24 15:20:20 +01:00
Niels Lohmann c154f3133d 🚧 rephrased assertions 2017-01-24 15:02:35 +01:00
Niels Lohmann 50a3f3b301 📝 added nicer example 2017-01-24 14:55:51 +01:00
Niels Lohmann 781fd09f2d 📝 cleanup 2017-01-24 14:45:32 +01:00
Niels Lohmann daf8dcdb32 📝 overworked README 2017-01-24 14:37:25 +01:00
Niels Lohmann 250e5bf43d 💄 overworked documentation and indentation 2017-01-24 13:47:33 +01:00
Niels Lohmann 030cf674ef 🚧 fixed a warning 2017-01-24 12:49:38 +01:00
Niels Lohmann 3857e55290 💄 ran "make pretty" 2017-01-24 12:43:43 +01:00
Niels Lohmann 034d5ed97e 💄 some cleanup 2017-01-21 16:14:21 +01:00
Niels Lohmann be1d3de49b 💄 moved changes to re2c file and ran make pretty 2017-01-21 16:14:21 +01:00
Niels Lohmann ce0b3fe5a3 🚧 made type_name() public 2017-01-21 16:12:17 +01:00
Niels Lohmann 145188f264 ⏪ renaming did not help 2017-01-19 19:23:56 +01:00
Niels Lohmann 69be3fa842 📝 small documentation update 2017-01-19 18:19:20 +01:00
Niels Lohmann 5e3f9c8969 📄 help Github find the license 2017-01-19 17:09:55 +01:00
Niels Lohmann e951d198f4 🔀 merge pull request #430 from vjon/patch-1 
Fix documentation error
 2017-01-19 07:42:29 +01:00
Niels Lohmann bae8e70137 🔀 merge branch 'feature/noexceptions_2' into develop 2017-01-18 20:41:17 +01:00
Niels Lohmann 87c5e32e1f 🐛 fixed escaping 2017-01-16 22:46:49 +01:00
Niels Lohmann a00149f8ee 🐛 fixed logic error 2017-01-16 22:36:58 +01:00
Niels Lohmann 1ab26ab367 ✨ option to switch off exceptions 2017-01-16 22:11:07 +01:00
Niels Lohmann 74cbd30cd0 📄 it's 2017 2017-01-16 20:04:47 +01:00
Niels Lohmann a7f3938391 ✅ added Big List of Naughty Strings 2017-01-16 20:03:50 +01:00
Niels Lohmann a9b4cb8bf8 🔀 merge branch 'feature/release_information' into develop #397 2017-01-12 21:37:31 +01:00
Niels Lohmann 3a9ccfac22 🚧 cleanup 2017-01-12 21:35:27 +01:00
Niels Lohmann 98ad3c3ac1 Merge branch 'develop' into feature/release_information 2017-01-12 21:30:08 +01:00
Niels Lohmann 0f03543861 ⬆️ upgraded to Catch 1.6.0 2017-01-11 22:23:02 +01:00
Niels Lohmann e9bbf5aaba 🐛 forgot to remove a test case 2017-01-08 09:31:40 +01:00
Niels Lohmann dd45ba6f89 🚧 renamed version() to meta() 2017-01-08 09:19:44 +01:00
Niels Lohmann e1b89dd1d6 Merge branch 'develop' into feature/release_information 2017-01-04 20:06:23 +01:00
Niels Lohmann 9f6c86f233 🐛 fix for #417 2017-01-04 18:54:44 +01:00
Niels Lohmann 4765070318 📝 added documentation wrt. UTF-8 strings #406 2017-01-04 18:07:46 +01:00
Niels Lohmann cdd3b5a68c 🚑 fix for #416 2017-01-03 23:52:01 +01:00
Niels Lohmann 767637877b 💄 cleanup 2017-01-03 22:37:07 +01:00
Niels Lohmann f8d640b185 👷 better support for OSS-Fuzz 2017-01-03 22:35:31 +01:00
Niels Lohmann 245a69d554 💄 ran clang-tidy 2017-01-03 21:33:23 +01:00
Niels Lohmann ea4d71ee21 Merge branch 'develop' into feature/release_information 2017-01-02 17:26:00 +01:00
Niels Lohmann 9755cc75b1 🔀 merge branch 'release/2.0.10' into develop 2017-01-02 16:38:23 +01:00
Niels Lohmann 7e2c4b3ead 📝 updated online link 2017-01-02 16:37:29 +01:00
Niels Lohmann 69c615e127 🔖 version bump to 2.0.10 2017-01-02 10:00:44 +01:00
Niels Lohmann 4d3bf433b4 🔖 updated ChangeLog 2017-01-02 09:56:21 +01:00
Niels Lohmann 8b46eb8ec0 📄 it's 2017 already 2017-01-02 09:40:00 +01:00
Niels Lohmann 6a20790056 📝 updated test count 2017-01-02 09:36:30 +01:00
Niels Lohmann 60b3703c62 🔖 version bump to 2.0.10 2017-01-02 09:35:57 +01:00
Niels Lohmann d173517212 💄 clean up 2017-01-02 09:21:26 +01:00
Niels Lohmann a3063c2419 🚧 added target to build all fuzzers 2017-01-01 21:51:36 +01:00
Niels Lohmann db33629990 💄 cleanup after #410 2017-01-01 21:34:58 +01:00
Niels Lohmann 712529cd32 🔀 merge pull request #400 from andoma/develop 
Add Doozer build badge
 2017-01-01 19:47:33 +01:00
Niels Lohmann 09b91406c6 🔀 merge pull request #410 from Daniel599/feature/clang_sanitize 
Feature/clang sanitize
 2017-01-01 19:45:11 +01:00
Niels Lohmann ab7d55e7ae 👷 removed failing test suites 2017-01-01 19:38:54 +01:00
Niels Lohmann cf9bf2d913 🚑 fix for #411 and #412 2017-01-01 15:28:01 +01:00
Niels Lohmann 328eb55dc4 🚧 started working on #397 2016-12-30 14:02:51 +01:00
Niels Lohmann d7029c37aa ✅ improved test coverage 2016-12-30 13:04:33 +01:00
Niels Lohmann f7575dee94 Merge branch 'develop' into feature/release_information 2016-12-30 12:29:01 +01:00
Niels Lohmann 42a8c64499 🔖 added version information 2016-12-30 12:28:52 +01:00
Niels Lohmann f0edab2363 🚑 fix for #408 2016-12-29 17:00:02 +01:00
Niels Lohmann 383a29a924 🚑 fix for #407 2016-12-29 16:14:15 +01:00
Niels Lohmann 871cebaf84 🚑 fix for #405 2016-12-29 15:39:16 +01:00
Niels Lohmann 8381cd6020 🚑 removed unsafe call to strerror #403 2016-12-28 14:19:08 +01:00
Niels Lohmann e4c2829aea 🔀 merge branch 'feature/fuzzer' into develop 2016-12-28 12:26:00 +01:00
Niels Lohmann 1dd99d04b6 Merge branch 'develop' into feature/fuzzer 2016-12-28 12:19:12 +01:00
Niels Lohmann 888f5b9f60 🚚 renamed test files to allow windows build 2016-12-28 12:18:48 +01:00
Niels Lohmann 55be721615 Merge branch 'develop' into feature/fuzzer 2016-12-28 12:11:51 +01:00
Niels Lohmann acb7e0558d 🚑 fixed bugs detected by AFL-Fuzz 2016-12-28 12:09:15 +01:00
Niels Lohmann e3b036348b 🚧 added targets for parallel AFL fuzzing 2016-12-25 16:36:43 +01:00
Niels Lohmann 1399abc583 🚧 added MessagePack fuzz target 2016-12-25 16:18:56 +01:00
Niels Lohmann e4cc62e653 🐛 fixed Makefile to work with proper CBOR files 2016-12-25 16:07:10 +01:00
Niels Lohmann 6de9d4035a 🐛 fixed AFL driver to also read binary data 2016-12-25 16:06:56 +01:00
Niels Lohmann dbdcb3fec8 🐛 fixed bug in CBOR/MessagePack deserialization 2016-12-25 16:06:36 +01:00
Niels Lohmann 6e129fbfb7 📝 some small documentation fixes 2016-12-25 14:39:08 +01:00
Niels Lohmann f87f4c06f9 🚧 cleanup 2016-12-22 12:10:52 +01:00