haraldwolff/json
1
0
Fork 0
mirror of https://github.com/nlohmann/json.git synced 2024-07-07 12:23:49 +02:00
Code Issues Packages Projects Releases Wiki Activity
1193 commits 11 branches 56 tags 222 MiB
Commit graph

1193 commits

This branch
This branch
All branches
Author SHA1 Message Date
Niels Lohmann e717492019 Merge branch 'feature/issue365' into develop 2016-11-29 07:46:14 +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 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