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
1105 commits 11 branches 56 tags 222 MiB
Commit graph

1105 commits

This branch
This branch
All branches
Author SHA1 Message Date
Niels 5dfd2c9bdf Merge branch 'release/2.0.5' into develop 2016-09-14 23:07:14 +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 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 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 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
Niels 58cbf4b3ef added another test case 2016-08-31 18:23:46 +02:00
Niels ae7aaed4ac Merge branch 'develop' into feature/iterator_range_parsing 2016-08-31 18:07:18 +02:00
Niels 442058f8ed interface cleanup 2016-08-31 17:07:35 +02:00
Niels afba1d3fcb forgot to run re2c 2016-08-30 23:51:14 +02:00
Niels 941714c99c template changes did not work with MSVC 2016-08-30 23:49:06 +02:00
Niels a485aa8d27 cleanup and improvement of branch coverage 2016-08-30 23:44:15 +02:00
Niels 6e6e1c9b1f implemented idea from #290 2016-08-30 18:26:07 +02:00
Niels f76f9efe58 Merge branch 'develop' into feature/iterator_range_parsing 2016-08-30 18:20:13 +02:00
Niels Lohmann 463ffb21bc Merge pull request #300 from t-b/fix_warning_in_test_case 
unit-constructor1.cpp: Fix floating point truncation warning
 2016-08-29 22:52:18 +02:00
Niels 29c5f32d42 fixed performance degradation (#272) 2016-08-29 22:36:33 +02:00
Thomas Braun e0ff1a837c unit-constructor1.cpp: Fix floating point truncation warning 2016-08-25 00:24:33 +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 04c6c886eb another experiment 2016-08-24 21:02:33 +02:00
Niels Lohmann 8b833c452a experiment: changed order of parse functions 2016-08-24 07:12:56 +02:00
Niels 1d66ab9f7a fixed lexer issue which required null byte at the end of contiguous storage containers #290 2016-08-23 22:38:05 +02:00
Niels a79d634ccb integrated proposals for #290 2016-08-22 21:40:07 +02:00
Niels 6d1254baba Merge branch 'develop' into feature/iterator_range_parsing 2016-08-22 20:54:55 +02:00
Niels b688119aa4 reverted .travis file 2016-08-22 20:54:32 +02:00
Niels 29a4ef6c5c no execution for special cases 2016-08-22 20:50:12 +02:00
Niels 71af209ea9 fix for YAML file 2016-08-22 20:44:36 +02:00
Niels 79fd4dfbd8 do not build for special cases 2016-08-22 20:40:25 +02:00
Niels cda84ba323 Merge branch 'develop' into feature/iterator_range_parsing 2016-08-21 23:15:27 +02:00
Niels 034244a291 Merge branch 'feature/coverage' into develop 2016-08-21 22:48:02 +02:00
Niels 1e896eb91e improved code coverage 2016-08-21 22:38:56 +02:00
Niels 94331a355d removed LCOV_EXCL_LINE 2016-08-21 21:50:13 +02:00
Niels aa7f5ad8b1 minor changes 2016-08-21 21:48:15 +02:00
Niels 585a39a235 improved branch coverage 2016-08-21 14:39:54 +02:00