Commit Graph

  • 41f9b32554 🔀 merge branch 'feature/serialization_class' into develop (#418) Niels Lohmann 2017-02-28 21:04:16 +01:00
  • d69242c6ba 💄 cleanup Niels Lohmann 2017-02-28 19:20:50 +01:00
  • 059f21aada 💄 fixed a warning Niels Lohmann 2017-02-28 17:24:03 +01:00
  • 224f99070b micro-optimization of dump() Niels Lohmann 2017-02-28 16:28:22 +01:00
  • fc48b8ac2b 🐛 fixed a logical error Niels Lohmann 2017-02-28 11:45:38 +01:00
  • af070744ae 🔨 integrating numtostr into serializer class Niels Lohmann 2017-02-27 22:10:57 +01:00
  • 54ef5f7b47 🔨 moved serialization functions to serializer class Niels Lohmann 2017-02-27 21:22:39 +01:00
  • 9c4919ff34 " micro-optimizations for dump()" Niels Lohmann 2017-02-27 16:19:07 +01:00
  • 909b439b03 micro-optimizations for dump() Niels Lohmann 2017-02-27 14:58:10 +01:00
  • 0f04e42dd5 micro-optimizations for dump() Niels Lohmann 2017-02-27 01:22:24 +01:00
  • b1441f3485 micro-optimizations for dump() Niels Lohmann 2017-02-26 20:58:00 +01:00
  • bd0326cbc1 micro-optimizations for dump() Niels Lohmann 2017-02-26 16:55:54 +01:00
  • ae155c4734 💄 cleanup Niels Lohmann 2017-02-26 14:45:41 +01:00
  • bf4d744d1a more tests for meta() call Niels Lohmann 2017-02-26 14:34:58 +01:00
  • d1b30250d6 added missing tests Niels Lohmann 2017-02-26 11:50:52 +01:00
  • f1cd15ce7e avoid copying a string Niels Lohmann 2017-02-26 11:22:18 +01:00
  • 9ff0cc0f02 📝 updated documentation v2.1.1 Niels Lohmann 2017-02-25 16:43:15 +01:00
  • 03f06e1993 Merge branch 'develop' into coverity_scan Niels Lohmann 2017-02-25 16:38:18 +01:00
  • 1b5867bdcf 🔀 merge branch 'release/2.1.1' into develop Niels Lohmann 2017-02-25 16:37:28 +01:00
  • c0d511ea50 🔀 merge branch 'release/2.1.1' 2.1.1 Niels Lohmann 2017-02-25 16:36:46 +01:00
  • 27c65b860b 🔖 version 2.1.1 Niels Lohmann 2017-02-25 16:34:38 +01:00
  • 0234e53e23 📝 added section on used third-party tools Niels Lohmann 2017-02-22 20:48:52 +01:00
  • b49ce351eb 💄 fixed some warnings Niels Lohmann 2017-02-22 20:48:29 +01:00
  • a646c9c599 🔀 merge branch 'cotire' of https://github.com/tusharpm/json into tusharpm-cotire Niels Lohmann 2017-02-22 19:45:10 +01:00
  • 8cec55a271 🚧 fixed more warnings Niels Lohmann 2017-02-22 18:14:29 +01:00
  • 345a106d73 💄 cleanup Niels Lohmann 2017-02-22 16:56:56 +01:00
  • 967f9144d4 🚧 overworked fix for #465 Niels Lohmann 2017-02-21 19:11:34 +01:00
  • 7d14f167b8 🚑 fix for #465 Niels Lohmann 2017-02-20 22:48:27 +01:00
  • b04543ecc5 🎨 fixed newlines Niels Lohmann 2017-02-20 21:56:10 +01:00
  • 1a6d7f5bca 🚧 try to fix some warnings in MSVC Niels Lohmann 2017-02-20 18:32:11 +01:00
  • f7075be93a 🐛 reverted change for #464 Niels Lohmann 2017-02-20 18:15:50 +01:00
  • f2dfa09aec 🐛 fix for #464 Niels Lohmann 2017-02-20 18:05:52 +01:00
  • 83a9c60dbd 🔨 refactored code to avoid using strcpy/strlen/strcat (#463) Niels Lohmann 2017-02-20 17:37:34 +01:00
  • 716485a965 🚧 removed decay (#448) Niels Lohmann 2017-02-20 16:27:16 +01:00
  • 7a4a16a7db 💄 updated header list Niels Lohmann 2017-02-20 16:20:45 +01:00
  • 1f72c38861 🚑 fix for #448 Niels Lohmann 2017-02-19 21:26:53 +01:00
  • 83f1d2c81b added start index for from_cbor and from_msgpack (#462) Niels Lohmann 2017-02-19 21:17:05 +01:00
  • 4151f2d297 added test with thousands_sep Niels Lohmann 2017-02-19 20:08:01 +01:00
  • 5b53f03e7c Merge branch 'develop' into TurpentineDistillery-feature/locale_independent_num_to_str Niels Lohmann 2017-02-19 19:24:55 +01:00
  • 9a9d0ba3df 🚧 fixing warning C4293 (#453) Niels Lohmann 2017-02-19 17:47:20 +01:00
  • 5436407b7e 👷 Add cmake logic to Travis config - get CMake for XCode 8.1 image Tushar Maheshwari 2017-02-12 19:40:40 +05:30
  • 85ce4d7b53 cmake compile time reduce using cotire Tushar Maheshwari 2017-02-12 17:16:54 +05:30
  • d1479e47bb 💄 added assertion message Niels Lohmann 2017-02-18 11:01:03 +01:00
  • 513eb3ab5f 🚧 clean up Niels Lohmann 2017-02-18 11:00:18 +01:00
  • 0200f2dc62 🚧 fixing warning C4267 (#453) Niels Lohmann 2017-02-17 19:14:21 +01:00
  • 6408402ad2 🔀 merge #378 (for #362 and #454) Niels Lohmann 2017-02-16 09:24:45 +01:00
  • 057b1e606b 🔀 merged #415 (fix for #414) Niels Lohmann 2017-02-16 08:50:20 +01:00
  • 2c17c1b1b2 💄 cleanup Niels Lohmann 2017-02-16 08:01:01 +01:00
  • 973402c11e 🚧 replaced throws (#440) and _MAX/_MIN macros (#451) Niels Lohmann 2017-02-15 22:44:18 +01:00
  • b9f3149451 🚑 fix for #452 Niels Lohmann 2017-02-15 21:30:28 +01:00
  • 6bf93b3d06 Merge remote-tracking branch 'upstream/develop' into develop Mihai STAN 2017-02-15 15:00:25 +02:00
  • 82fb613763 📝 update after #302 Niels Lohmann 2017-02-14 07:28:30 +01:00
  • 22b9a301d6 Merge pull request #450 from nlohmann/TurpentineDistillery-feature/locale_independent_str_to_num Niels Lohmann 2017-02-14 07:18:35 +01:00
  • c95ff863bf ⬆️ updated Catch to v1.7.2 Niels Lohmann 2017-02-13 18:55:11 +01:00
  • 265c5b5207 🔨 more work on the number parser Niels Lohmann 2017-02-13 18:51:23 +01:00
  • b84705d557 improved test coverage Niels Lohmann 2017-02-12 20:14:43 +01:00
  • c8191c8172 🔨 further cleanup Niels Lohmann 2017-02-12 18:50:17 +01:00
  • c2d55109c1 🔨 make lexer distinguishes number types Niels Lohmann 2017-02-11 16:54:25 +01:00
  • 9f5dccbab5 💄 cleanup Niels Lohmann 2017-02-11 15:55:53 +01:00
  • 926af6d50b 🔀 merge branch 'develop' into TurpentineDistillery-feature/locale_independent_str_to_num Niels Lohmann 2017-02-11 15:17:47 +01:00
  • ed8516dc39 👷 added Codacy badge Niels Lohmann 2017-02-09 17:38:02 +01:00
  • c485d46cea 📝 screenshoots look ugly Niels Lohmann 2017-02-08 20:00:46 +01:00
  • 6fd77cea4a 📝 added screenshots Niels Lohmann 2017-02-08 19:22:19 +01:00
  • 0ffa18aab8 📝 listing projects using the library Niels Lohmann 2017-02-08 19:16:38 +01:00
  • 662a9b8f3c ✏️ fixed more typos Niels Lohmann 2017-02-08 18:19:41 +01:00
  • 4746a4c536 💄 minor change Niels Lohmann 2017-02-08 17:56:43 +01:00
  • 163f8397fd ✏️ fixed a typo #446 Niels Lohmann 2017-02-05 17:11:26 +01:00
  • 8d88a1da2a 🔀 merged #379 and fixed conflicts Niels Lohmann 2017-02-05 13:13:41 +01:00
  • d284c86dd1 uncommented some tests Niels Lohmann 2017-02-04 21:00:41 +01:00
  • 922fe693e1 ⬆️ updated Catch to v1.7.0 Niels Lohmann 2017-02-04 15:30:28 +01:00
  • 1cfdc2a753 🐛 fixed test compilation Niels Lohmann 2017-02-04 08:25:55 +01:00
  • 77d6f70602 📝 acknowledgments for #442 and #445 Niels Lohmann 2017-02-03 18:28:22 +01:00
  • d6afaa8e16 📝 fixing a documentation issue #442 Niels Lohmann 2017-02-03 18:15:37 +01:00
  • 5976caf032 improved test compilation speed #445 Niels Lohmann 2017-02-03 18:09:55 +01:00
  • 16af771277 added roundtrip test for the Big List of Naughty Strings Niels Lohmann 2017-02-01 17:34:39 +01:00
  • bf8fdac99a 👷 dropped Doozer.io support Niels Lohmann 2017-02-01 16:41:05 +01:00
  • 7bb7033383 Merge branch 'develop' into coverity_scan Niels Lohmann 2017-02-01 16:03:51 +01:00
  • c75865d88c 🐛 fixed -Weffc++ warnings Niels Lohmann 2017-02-01 15:13:21 +01:00
  • b210f2dbf4 💄 minor refactoring Niels Lohmann 2017-01-29 21:40:37 +01:00
  • 0164b10e10 added missing tests found by mutate++ Niels Lohmann 2017-01-29 17:18:56 +01:00
  • affa3bf4e9 Merge pull request #439 from jaredgrubb/patch-2 Niels Lohmann 2017-01-29 08:18:44 +01:00
  • f2873e6d3a README: adjust boost::optional example Jared Grubb 2017-01-29 02:46:58 +00:00
  • c7f366520c Merge branch 'develop' into coverity_scan Niels Lohmann 2017-01-28 18:43:48 +01:00
  • f642934b18 🔀 merge branch 'release/2.1.0' into develop v2.1.0 Niels Lohmann 2017-01-28 18:43:01 +01:00
  • 1e99a0273f 🔀 merge branch 'release/2.1.0' 2.1.0 Niels Lohmann 2017-01-28 18:42:27 +01:00
  • 6746a57524 📝 updated slides Niels Lohmann 2017-01-28 18:41:30 +01:00
  • eb08e8b09b 📝 updated documentation Niels Lohmann 2017-01-28 18:20:12 +01:00
  • 4b5c61075f 📄 changes to let Github detect the license Niels Lohmann 2017-01-28 18:17:57 +01:00
  • 38e4935db0 📝 added example and documentation for the meta function Niels Lohmann 2017-01-28 17:12:29 +01:00
  • cdde1a9436 🔖 set version to 2.1.0 Niels Lohmann 2017-01-28 16:46:03 +01:00
  • d870826811 🔖 set version to 2.1.0 Niels Lohmann 2017-01-28 16:03:35 +01:00
  • 2f6260751c 📝 fixed #434 Niels Lohmann 2017-01-27 18:50:52 +01:00
  • 42fa3f0568 🔀 merge pull request #435 (based on #338, #355, and #423) Niels Lohmann 2017-01-27 06:22:10 +01:00
  • cd9701b123 💄 cleanup Niels Lohmann 2017-01-26 20:51:30 +01:00
  • 1305e03557 📝 fixed documentation Niels Lohmann 2017-01-26 19:39:34 +01:00
  • 77bb7af5d9 📝 added more documentation Niels Lohmann 2017-01-26 07:29:37 +01:00
  • 4d3053cd42 💄 some cleanup Niels Lohmann 2017-01-25 22:21:07 +01:00
  • 94d9b7bc86 📝 overworked documentation (re-added constructor examples) Niels Lohmann 2017-01-25 21:59:54 +01:00
  • ec03c9c53e 📝 overworked docs #435 Niels Lohmann 2017-01-25 19:01:31 +01:00
  • 6198439f59 fix #414 - comparing to 0 literal Mihai STAN 2017-01-03 00:49:33 +02:00