Niels Lohmann
|
b9f3149451
|
🚑 fix for #452
|
2017-02-15 21:30:28 +01:00 |
|
Mihai STAN
|
6bf93b3d06
|
Merge remote-tracking branch 'upstream/develop' into develop
|
2017-02-15 15:00:25 +02:00 |
|
Niels Lohmann
|
82fb613763
|
📝 update after #302
|
2017-02-14 07:28:30 +01:00 |
|
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
|
c95ff863bf
|
⬆️ updated Catch to v1.7.2
|
2017-02-13 18:55:11 +01:00 |
|
Niels Lohmann
|
265c5b5207
|
🔨 more work on the number parser
|
2017-02-13 18:51:23 +01:00 |
|
Niels Lohmann
|
b84705d557
|
✅ improved test coverage
|
2017-02-12 20:14:43 +01:00 |
|
Niels Lohmann
|
c8191c8172
|
🔨 further cleanup
|
2017-02-12 18:50:17 +01:00 |
|
Niels Lohmann
|
c2d55109c1
|
🔨 make lexer distinguishes number types
|
2017-02-11 16:54:25 +01:00 |
|
Niels Lohmann
|
9f5dccbab5
|
💄 cleanup
|
2017-02-11 15:55:53 +01:00 |
|
Niels Lohmann
|
926af6d50b
|
🔀 merge branch 'develop' into TurpentineDistillery-feature/locale_independent_str_to_num
|
2017-02-11 15:17:47 +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
|
662a9b8f3c
|
✏️ fixed more typos
|
2017-02-08 18:19:41 +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 |
|
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
|
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 |
|
Mihai STAN
|
6198439f59
|
fix #414 - comparing to 0 literal
Overload comparison operators for all types that could be converted
to nullptr.
|
2017-01-24 22:33:37 +02: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 |
|