haraldwolff/json
1
0
Fork 0
mirror of https://github.com/nlohmann/json.git synced 2024-07-04 21:36:57 +02:00
Code Issues Packages Projects Releases Wiki Activity
2881 commits 16 branches 56 tags 222 MiB
Commit graph

386 commits

Author SHA1 Message Date
Niels Lohmann 99ea12f304
📝 acknowledgements for #674, #678, #682, #685, and #686 2017-08-10 06:50:34 +02:00
Markus Werle 86b3d06a93 remove duplicate word 
s/to to/to/
 2017-08-09 11:56:48 +02:00
dan-42 db0b9732d4 DOC: add sort mentioning about support in hunter 2017-07-31 23:20:37 +02:00
Niels Lohmann 850d856aae
🔨 cleanup after #663 2017-07-30 20:30:05 +02:00
Niels Lohmann 504012a3db
📝 cleanup after #650 
As <iostream> is not included in json.hpp any more, all code examples need to include <iostream> now.
 2017-07-09 11:51:38 +02:00
Niels Lohmann 1b2fabe802
👷 adding two recent Clang versions 
Maybe the simple approach is working now - at least it is in https://github.com/taocpp/PEGTL/blob/master/.travis.yml
 2017-07-09 11:10:18 +02:00
Niels Lohmann 6f12749ef6
📝 added version string for Xcode 9 2017-07-08 12:55:05 +02:00
Niels Lohmann 32065c8045
📝 fix for #639 
Removed deprecated documentation of the comparison operator.
 2017-07-07 21:16:33 +02:00
Niels Lohmann b9a8425cc8
📝 cleanup after #629 and #630 2017-06-21 18:55:25 +02:00
Niels Lohmann c2044205ef
📝 updated used compilers 2017-06-20 16:12:14 +02:00
Niels Lohmann b79a1a2678
📝 update after #626 2017-06-18 00:00:31 +02:00
Niels Lohmann e1ca484bc1
📝 added note about Conan #566 2017-06-17 11:20:09 +02:00
Niels Lohmann 5fa5c17bc6
✏️ cleanup after #595 2017-06-10 18:29:16 +02:00
Niels Lohmann 92ef19696a
✏️ cleanup after #598 2017-06-06 20:48:11 +02:00
Niels Lohmann 0c3ffe12cd
⏪ reverting first/second experiment #350 2017-05-15 21:07:58 +02:00
Jay Sistar 87744fd594 Missed one. 2017-05-09 02:04:02 +00:00
Jay Sistar 0719287e44 Reducing chatter about Meson. 2017-05-09 02:01:55 +00:00
Jay Sistar 31fe2f5825 Adding support for Meson. 2017-05-08 13:35:00 +00:00
Niels Lohmann dbcb032f22
Merge branch 'develop' into feature/manual_lexer 2017-05-05 16:48:47 +02:00
Niels Lohmann 19d2dec8b6
📝 added badge from isitmaintained.com 2017-05-03 22:49:21 +02:00
Niels Lohmann c42273d2a0
📝 fixed documentation #565 
The documentation mismatched the actual code.
 2017-04-23 21:46:30 +02:00
Niels Lohmann 734297ff45
🔨 cleanup 2017-04-23 20:32:05 +02:00
Niels Lohmann 5bea6f383a
✏️ fixed a typo 2017-04-11 18:57:53 +02:00
Niels Lohmann d07596a0ea
📝 mentioned #540 and fixed #538 2017-03-30 17:39:02 +02:00
Niels Lohmann 19cd206d99
📝 documented Xcode 8.3 2017-03-28 21:39:16 +02:00
Niels Lohmann cc36c65a89
🚑 made exceptions nothrow-copy-constructible #531 
To have nothrow-copy-constructible exceptions, we inherit from
std::runtime_error which can cope with arbitrary-length error messages.
Intermediate strings are built with static functions and then passed to
the actual constructor.
 2017-03-25 16:22:52 +01:00
Niels Lohmann 20bcf1015b
📝 cleanup after #536 2017-03-25 14:19:05 +01:00
Niels Lohmann 3d597dda5d
📝 update after #534 2017-03-24 19:51:11 +01:00
Berkus Decker b14629b0a6 Fix typo 2017-03-23 14:50:41 +02:00
Niels Lohmann 54db53c230
📝 update after #527 and #525 2017-03-22 08:10:31 +01:00
Alexander “weej” Jones 836f1c4189 🎨 Namespace uint8_t from the C++ stdlib 2017-03-16 18:24:41 +00:00
Niels Lohmann c7afb34e57
🎨 cleanup after #496 
Ran “make pretty” and added a note to the README file.
 2017-03-11 16:01:26 +01:00
Niels Lohmann a1354184ce
📝 fixed typo #481 2017-03-03 12:56:54 +01:00
Niels Lohmann 6b3912d936
📝 added note to 3.0.0 wiki page #474 
I created a wiki page
https://github.com/nlohmann/json/wiki/Road-toward-3.0.0 to describe the
transition toward version 3.0.0. On this page, all API-breaking changes
shall be documented.
 2017-03-01 17:26:32 +01:00
Niels Lohmann f84ac523aa
📝 added a note to ordered maps 
The library does not preserve the insertion order of object keys. There
are frequent requests to change the library in this aspect. The README
and the contribution guidelines now contain links to containers that
can be used to replace std::map to preserve the insertion order.
 2017-03-01 10:15:07 +01:00
Niels Lohmann 9ff0cc0f02
📝 updated documentation 2017-02-25 16:43:15 +01:00
Niels Lohmann 27c65b860b
🔖 version 2.1.1 2017-02-25 16:34:38 +01:00
Niels Lohmann 0234e53e23
📝 added section on used third-party tools 2017-02-22 20:48:52 +01:00
Niels Lohmann 345a106d73
💄 cleanup 2017-02-22 16:56:56 +01:00
Niels Lohmann 7a4a16a7db
💄 updated header list 2017-02-20 16:20:45 +01:00
Niels Lohmann 057b1e606b
🔀 merged #415 (fix for #414) 2017-02-16 08:50:20 +01:00
Niels Lohmann 82fb613763
📝 update after #302 2017-02-14 07:28:30 +01:00
Niels Lohmann ed8516dc39
👷 added Codacy badge 2017-02-09 17:38:02 +01:00
Niels Lohmann c485d46cea
📝 screenshoots look ugly 2017-02-08 20:00:46 +01:00
Niels Lohmann 6fd77cea4a
📝 added screenshots 2017-02-08 19:22:19 +01:00
Niels Lohmann 0ffa18aab8
📝 listing projects using the library 2017-02-08 19:16:38 +01:00
Niels Lohmann 163f8397fd ✏️ fixed a typo #446 2017-02-05 17:11:26 +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 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
Jared Grubb f2873e6d3a README: adjust boost::optional example 
The "from_json" example for boost::optional is not complete and should also handle the 'none' case.
 2017-01-29 02:46:58 +00:00
Niels Lohmann eb08e8b09b 📝 updated documentation 2017-01-28 18:20:12 +01:00
Niels Lohmann 2f6260751c 📝 fixed #434 2017-01-27 18:50:52 +01:00
Niels Lohmann 1305e03557 📝 fixed documentation 2017-01-26 19:39:34 +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 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
Théo DELRIEU fbac056c38 add readme 2017-01-21 16:14:22 +01:00
Niels Lohmann 69be3fa842 📝 small documentation update 2017-01-19 18:19:20 +01:00
Jonathan Lee 046f6da82f Fix documentation error 
Move comparison before "j.clear()" function call, such that the intended return value "true" is actually correct.
 2017-01-18 11:43:14 -08:00
Niels Lohmann 74cbd30cd0 📄 it's 2017 2017-01-16 20:04:47 +01:00
Niels Lohmann 4765070318 📝 added documentation wrt. UTF-8 strings #406 2017-01-04 18:07:46 +01:00
Niels Lohmann 7e2c4b3ead 📝 updated online link 2017-01-02 16:37:29 +01:00
Niels Lohmann 6a20790056 📝 updated test count 2017-01-02 09:36:30 +01:00
Niels Lohmann db33629990 💄 cleanup after #410 2017-01-01 21:34:58 +01:00
Andreas Smas 57b32d9773 Add Doozer build badge 2016-12-20 21:38:01 +01:00
Niels Lohmann a507b9b46a 🔖 updated documentation 2016-12-16 21:25:20 +01:00
Niels Lohmann 706be50596 📝 updated number of tests 2016-12-16 20:54:43 +01:00
Niels Lohmann f24e4f680e 🎨 cleanup after PR #395 2016-12-14 22:30:09 +01:00
Niels Lohmann 2f94c30bad ✅ added a regression test for #380 / #390 2016-12-13 21:46:07 +01:00
Niels Lohmann f6c21a1f20 📝 added note to example files 2016-12-12 08:25:08 +01:00
Niels Lohmann a25d570040 📝 added TOC to README #383 2016-12-11 19:42:36 +01:00
Niels Lohmann a9d7d315a5 📝 cleanup after #391 2016-12-11 16:06:52 +01:00
Niels Lohmann 60b7299fe1 📝 updated README 2016-12-02 18:02:38 +01:00
Niels Lohmann bd252b2a09 Merge branch 'develop' into feature/issue365 2016-11-28 23:24:52 +01:00
Niels Lohmann d563c21afe 📝 update documentation of Travis builders 2016-11-28 23:23:45 +01:00
Niels Lohmann a8522f391a Merge branch 'develop' into feature/issue365 2016-11-26 12:45:50 +01:00
Niels Lohmann 2773038cf9 ⚡ added improvements (#365) 2016-11-26 12:43:23 +01:00
Niels Lohmann 472d0045ba 📝 updating README after fixing #299 2016-11-24 21:56:21 +01:00
Niels 869f4c68d4 📝 updated thanks section 2016-11-22 07:25:40 +01:00
Niels abce5c25bb 📝 cleaned comments and updated README 2016-11-21 23:38:17 +01:00
Niels 56671a88c6 🍎 removed Xcode 8.0 due to repeated problems 2016-11-16 08:01:48 +01:00
Niels 700977d73e version bump 2016-11-02 20:52:15 +01:00
Niels 7adccde714 improved coverage and updated README 2016-10-30 17:10:11 +01:00
Niels Lohmann a29fcae409 fixed Cmake link 2016-10-26 09:20:40 +02:00
Niels e310850353 cleanup after #336 2016-10-16 23:46:24 +02:00
Denis Andrejew cb2d41e3a0 fix minor grammar/style issue in README.md 2016-10-16 02:46:43 +02:00
Niels 606098f45d release 2.0.6 2016-10-15 16:47:45 +02:00
Niels 67b9f1936d cleanup after closing #324 2016-10-12 22:05:45 +02:00
Niels 54bf5f20e9 adjusted README 2016-10-08 14:33:10 +02:00
Niels a0ef5a194c addressed #319, #321, and #318 2016-10-06 23:27:43 +02:00
Niels Lohmann 8173c370f6 Merge pull request #321 from vasild/develop 
Fix usage examples' comments for std::multiset
 2016-10-06 22:33:58 +02:00
Niels b6550b35c3 fix after #313 2016-10-04 18:20:36 +02:00
Vasil Dimov b5128b1610
Fix usage examples' comments for std::multiset 2016-10-04 18:53:44 +03:00
Niels 3d104f1d43 version bump 2016-09-14 23:06:39 +02:00
Niels 6bbcdc1ec5 fixes #310 2016-09-14 22:48:12 +02:00
Niels 768d66560e version bump 2016-09-11 23:36:59 +02:00
Niels 15925469c6 Travis updated their Xcode 2016-09-11 22:50:40 +02:00
Niels 2daab5a4c2 fixed #306 2016-09-11 22:30:08 +02:00
Niels df9fd6237e release 2.0.3 2016-08-31 21:27:23 +02:00
Niels 740b66f225 cleanup 2016-08-31 20:23:21 +02:00
Niels f76f9efe58 Merge branch 'develop' into feature/iterator_range_parsing 2016-08-30 18:20:13 +02:00
Niels Lohmann 87dea32e81 using AppVeyor badge for develop branch 2016-08-24 21:31:11 +02:00
Niels Lohmann bd3bd37e96 removed coverity badge (build is broken, see #299) 2016-08-24 21:29:28 +02:00
Niels b4571360df more on #290 2016-08-21 12:35:40 +02:00
Niels 0cf7ebaa57 mentioning the CII 2016-08-18 18:43:27 +02:00
Niels ca80a71c28 added notes from the CII Best Practices badge 2016-08-15 21:45:49 +02:00
Niels 03de590372 improved documentation for #289 2016-08-11 20:52:48 +02:00
Niels 46174879ef clean up 2016-08-10 22:41:09 +02:00
Niels 5541e6f6f9 split unit tests 2016-08-04 07:24:46 +02:00
Niels a05df038cd prepared release 2016-07-31 13:37:04 +02:00
Niels b145e0c404 more cleanup 2016-07-29 23:47:16 +02:00
Niels 369671f028 added more Unicode tests 2016-07-25 16:05:58 +02:00
Niels 98d48ef0c2 fixed indentation 2016-07-04 00:04:22 +02:00
Niels 6e1347e68c fixes #270 2016-07-01 16:58:50 +02:00
Niels a73bda8147 fixed performance regression #272 2016-06-28 21:24:18 +02:00
Niels 360f0f3791 updated README and ChangeLog 2016-06-24 17:39:03 +02:00
Niels c74b9ff4f7 another fix for the MSVC version 2016-06-24 17:15:54 +02:00
Mário Feroldi 6aad67af23 fixed a tiny typo 2016-06-24 05:47:00 -03:00
Niels 0767290c26 off-by-one error in the documentation 2016-06-24 08:06:41 +02:00
Niels ca2bbdb15b clarified MSV version 2016-06-24 07:39:08 +02:00
Niels 39a9cfcc12 updated README 2016-06-23 18:08:20 +02:00
Niels 3497fab3b5 cleanup 2016-06-23 05:55:48 +02:00
Niels 7cff6c8771 Merge branch 'develop' into feature/issue269 
# Conflicts:
#	README.md
 2016-06-23 00:04:55 +02:00
Niels 6f76c9237b overworked ChangeLog and README 2016-06-22 22:20:55 +02:00
Niels ecf84dddb1 test case for #269 2016-06-22 20:40:15 +02:00
Niels 15a314abea updated README 2016-06-19 22:38:54 +02:00
Niels bb8c7b1f45 mentioning Homebrew's --HEAD parameter 2016-06-15 21:28:27 +02:00
Niels 1eced269e3 update after PR #266 2016-06-14 15:27:21 +02:00
Niels c744d59f2d adjusted README file to reality in Travis 2016-06-14 08:14:25 +02:00
Niels 04e1e7b586 cleanup 2016-05-29 14:56:08 +02:00
Niels 7bdfde4493 added a note about different NDKs (see #219) 2016-05-28 16:06:41 +02:00
Niels 71a7746ccb removed a line 2016-05-25 21:55:03 +02:00
Niels a3f432b3dd added hint to Homebrew 2016-05-18 22:23:35 +02:00
Niels 837617122a fixed #246 2016-05-18 22:17:08 +02:00
Niels fb06356856 thanks 2016-05-11 20:58:11 +02:00
Chris Kitching af76508fe7
Introduce structure to the test/ directory 
This introduces a clear separation between test data and test
binaries. Test data is moved into test/data, and the test binaries
move into test/src. A new CMake script specific to building the
tests is introduced in /test to slightly clean up the toplevel
one.

As well as tidying things up, this makes the next step trivial...
 2016-05-11 01:30:08 +01:00
Niels 85a30813c8 removed unnecessary code (numbers must not begin with "+") 2016-05-07 20:22:58 +02:00
Niels c04275966f improved test coverage 2016-05-07 18:33:43 +02:00
Niels ea84a85b13 simplified flatten/unflatten examples 2016-04-30 10:39:03 +02:00
Niels a21f8b0c77 added AppVeyor information 2016-04-30 01:21:35 +02:00
Niels 9170740f45 added documentation on Travis compilers 2016-04-30 01:01:41 +02:00
Niels 86debab3b1 Merge branch 'develop' into feature/json-patch 2016-04-26 20:43:02 +02:00
Niels 9af8f7d094 update after #238 2016-04-26 20:38:01 +02:00
Niels 5e0bf75d60 cleanup, test, and diff 2016-04-25 23:17:04 +02:00
Niels 6268287940 improved documentation and test coverage 2016-04-17 22:08:21 +02:00
Niels 76a5a776eb cleanup after #234 2016-04-16 12:19:10 +02:00