wt/json
1
0 Fork 0
mirror of https://github.com/nlohmann/json.git synced 2026-11-15 19:13:35 +00:00
Code Issues Packages Projects Releases Wiki Activity
1,192 Commits 15 Branches 57 Tags
bd252b2a094e79660d0dc8acb9753ffb58d4ab9c
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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 286025497f 👷 removed retired images (https://blog.travis-ci.com/2016-11-17-retiring-some-osx-images/) 2016-11-28 22:16:33 +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 a791af30b4 Merge branch 'feature/filenotfound' into develop 2016-11-25 17:39:38 +01:00
Niels Lohmann 1ed510c232 Merge branch 'develop' into feature/filenotfound 2016-11-25 17:39:24 +01:00
Niels Lohmann f194db9aa6 ✅ added assertion for warning from #368 2016-11-24 22:07:35 +01:00
Niels Lohmann c39c36e6ad 💄 fixed indentation 2016-11-24 22:05:29 +01:00
Niels Lohmann 472d0045ba 📝 updating README after fixing #299 2016-11-24 21:56:21 +01:00
Niels Lohmann 1407bbf94c 💄 fixed indentation 2016-11-24 21:54:05 +01:00
Niels Lohmann 8014637ad1 ✅ added a test for EOF error (#367) 2016-11-24 21:53:41 +01:00
Niels Lohmann dfc49e7afe 🐛 fixed a bug if parser was called with a stream at EOF (#367) 2016-11-24 21:45:10 +01:00
Niels Lohmann 4bd3b1b0ef Merge branch 'develop' into feature/issue365 2016-11-24 18:25:00 +01:00
Niels Lohmann e3450cac72 📈 removing more variance of the benchmarks 2016-11-24 18:24:26 +01:00
Niels Lohmann c3a610d32a 🔧 ignoring Clion files 2016-11-24 17:45:01 +01:00
Niels Lohmann 25548f85c9 👷 trying Coverity with Clang 3.6 (#299) 2016-11-24 17:25:05 +01:00
Niels Lohmann 4bb41d065b 🐛 parsing erroneous files yields an exception (#366) 2016-11-23 16:57:01 +01:00
Niels 5f4becb0f5 Merge branch 'develop' into feature/issue365 2016-11-23 08:48:54 +01:00
Niels ed611119d9 📈 reducing benchmark variance (#365) 2016-11-23 08:47:40 +01:00
Niels 6cc2d58d69 🐛 hopefully fixing the crashes on Linux (#365) 2016-11-22 20:13:47 +01:00
Niels f620d74919 ⚡ added performance fixes (#365) 2016-11-22 07:26:11 +01:00
Niels 869f4c68d4 📝 updated thanks section 2016-11-22 07:25:40 +01:00
Niels c34b41acd6 🐛 fixes crash in dump from static object (#359) 
Merge branch 'feature/issue359' into develop
 2016-11-22 06:57:58 +01:00
Niels abce5c25bb 📝 cleaned comments and updated README 2016-11-21 23:38:17 +01:00
Niels 43dbe02d5b 🐛 fixing #359 2016-11-21 21:53:10 +01:00
Niels 0d72767b3e ⬆️ updated to Catch v1.5.8 2016-11-16 19:15:54 +01:00
Niels 56667af823 🎨 stating the name of the library in the license 2016-11-16 19:08:25 +01:00
Niels 425b9834a8 🐛 removed the wrong compiler 2016-11-16 08:25:08 +01:00
Niels 56671a88c6 🍎 removed Xcode 8.0 due to repeated problems 2016-11-16 08:01:48 +01:00
Niels 5316f0fff2 🍎 added Xcode 8.1 build for travis 2016-11-16 06:42:26 +01:00
Niels 9ca00e4880 readded missing header 2016-11-03 07:27:32 +01:00
Niels e385417047 documented and cleaned up headers (#314) 2016-11-02 21:27:19 +01:00
Niels 6d2b5e3771 Merge branch 'release/2.0.7' into develop 2016-11-02 20:52:42 +01:00
Niels 700977d73e version bump 2016-11-02 20:52:15 +01:00
Niels 79015b9d0a Merge branch 'feature/jsontestsuite' into develop 2016-11-02 17:03:17 +01:00
Niels 3716a2fbe8 Merge branch 'develop' into feature/jsontestsuite 2016-11-02 17:03:12 +01:00
Niels 737d43724f Merge branch 'feature/issue329' into develop 2016-11-02 16:59:23 +01:00
Niels 59c8343851 cleanup 2016-11-02 15:44:46 +01:00
Niels 94c16b2c31 fixed coverage 2016-11-01 17:01:04 +01:00
Niels 8f70525374 more test coverage 2016-10-30 17:46:00 +01:00
Niels 7adccde714 improved coverage and updated README 2016-10-30 17:10:11 +01:00
Niels 8d1e65f297 evaluated i-tests (#344) 2016-10-30 16:07:17 +01:00
Niels 7b4e6cf705 added implementation-specific tests (#344) 2016-10-30 12:08:29 +01:00
Niels a8136c578a fixed BOM handling #344 2016-10-29 21:08:30 +02:00
Niels b820bb3b1f fixed a lot of unicode errors (#344) 
BOMs currently yield an error.
 2016-10-29 19:35:17 +02:00
Niels b03bbe724d added n test cases (#344) 2016-10-29 14:02:33 +02:00
Niels 7da182472d Merge branch 'develop' into feature/jsontestsuite 2016-10-29 13:37:17 +02:00
Niels 42ea4fb751 fixed a bug for short input files (#344) 
For input files with less than 5 bytes, the parser had a bug so that
refilling the input buffer led to erasing it.
 2016-10-29 13:32:36 +02:00
Niels 2fdba9de19 added "y" cases 2016-10-26 23:45:11 +02:00
Niels a2808322c6 add test files from https://github.com/nst/JSONTestSuite 2016-10-26 18:57:56 +02:00
Niels Lohmann a29fcae409 fixed Cmake link 2016-10-26 09:20:40 +02:00
Niels 3ebe28970a small fixes 2016-10-23 17:25:07 +02:00
Niels 79d9fdc016 user-defined string literals exploit string length (#340) 2016-10-22 18:57:58 +02:00
Niels e310850353 cleanup after #336 2016-10-16 23:46:24 +02:00
Niels Lohmann 8057782bb8 Merge pull request #336 from seeekr/patch-1 
fix minor grammar/style issue in README.md
 2016-10-16 23:40:17 +02:00
Niels 542a48a16a Merge branch 'release/2.0.6' into develop 2016-10-15 16:48:08 +02:00
Niels 606098f45d release 2.0.6 2016-10-15 16:47:45 +02:00
Niels d91067220f added missing overflow check for #329 2016-10-13 21:00:48 +02:00
Niels 67b9f1936d cleanup after closing #324 2016-10-12 22:05:45 +02:00
Niels Lohmann bb9d87ad55 Merge pull request #324 from vpetrigo/has_mapped_improve 
make has_mapped_type struct friendly
 2016-10-12 21:59:56 +02:00
Niels e7a60d8961 Merge branch 'feature/issue323' into develop 2016-10-12 21:21:59 +02:00
Niels 470197bd0b improve test coverage 2016-10-10 21:58:31 +02:00
Niels d3e7f9da67 code cleanup for #323 2016-10-10 20:38:50 +02:00
Niels 97280bbcfc added missing header 2016-10-09 16:32:01 +02:00
Niels 54bf5f20e9 adjusted README 2016-10-08 14:33:10 +02:00
Niels 2fa8ea0f74 started fixing #323 2016-10-08 14:27:28 +02:00
Niels a0ef5a194c addressed #319, #321, and #318 2016-10-06 23:27:43 +02:00
Niels Lohmann 04b11d78ff Merge pull request #318 from ChristophJud/include_dir_relocation 
Include dir relocation
 2016-10-06 22:35:36 +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
Niels Lohmann 963efb1f09 Merge pull request #313 from 5tefan/develop 
trivial documentation fix
 2016-10-02 11:29:49 +02:00
Niels d6005e59a5 added fuzzing results 2016-10-02 11:23:47 +02:00
Niels e4366688f7 v2.0.5 2016-09-14 23:42:12 +02:00
Niels 5dfd2c9bdf Merge branch 'release/2.0.5' into develop 2016-09-14 23:07:14 +02:00
Niels 5879eb0be3 Merge branch 'release/2.0.5' 2016-09-14 23:06:53 +02: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 7b6cba23f3 results for #307 2016-09-12 21:23:12 +02:00
Niels 24c588cd25 Merge branch 'release/2.0.4' into develop 2016-09-11 23:37:30 +02:00
Niels f209be1142 Merge branch 'release/2.0.4' 2016-09-11 23:37:11 +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 f922426ec3 fixed #304 2016-09-11 22:40:51 +02:00
Niels 2daab5a4c2 fixed #306 2016-09-11 22:30:08 +02:00
Niels 8ea0ee502d clang 3.9.0 is not working yet 2016-09-03 13:08:17 +02:00
Niels fa0299f03a moved cmake into clang 2016-09-03 12:30:10 +02:00
Niels 36745ed296 install from tarball 2016-09-03 10:34:52 +02:00
Niels f0455b401d forgot sh call 2016-09-03 09:44:10 +02:00
Niels e0d809312b the cmake in apt is too old 2016-09-03 09:17:30 +02:00
Niels bfd6678800 clang 3.9.0 needs a newer cmake 2016-09-03 08:47:07 +02:00
Niels 9639f0dfb3 Clang 3.9.0 has been released 2016-09-03 00:37:45 +02:00
Niels 625370a1ad Merge branch 'develop' 2016-09-02 16:05:38 +02:00
Niels 357baeff5a release 2.0.3 2016-09-01 08:07:52 +02:00
Niels 42be2edd4c fixed test coverage 2016-09-01 00:29:42 +02:00
Niels c8d01fa7b9 Merge branch 'release/2.0.3' into develop 2016-08-31 21:27:50 +02:00
Niels 2c82f25272 Merge branch 'release/2.0.3' 2016-08-31 21:27:32 +02:00
Niels df9fd6237e release 2.0.3 2016-08-31 21:27:23 +02:00
Niels 776880bc49 Merge branch 'feature/iterator_range_parsing' into develop 2016-08-31 20:23:24 +02:00
Niels 740b66f225 cleanup 2016-08-31 20:23:21 +02:00