Commit graph

Select branches

Hide pull requests

master

Mono Color

• 1ab580d6e9
  📝 more documentation for the new exceptions Niels Lohmann 2017-03-08 23:12:13 +01:00
• fe71e7df1f
  📝 overworked documentation Niels Lohmann 2017-03-08 21:03:19 +01:00
• 9374eaa013
  🔨 added user-defined exception 501 Niels Lohmann 2017-03-08 19:16:53 +01:00
• c8a6ce79ea
  🚑 fixing fuzzers to work with new exceptions Niels Lohmann 2017-03-08 18:37:03 +01:00
• fc9b528ec9
  🔨 changed an exception Niels Lohmann 2017-03-08 18:07:21 +01:00
• 8fcd01631f
  ✅ improved test coverage Niels Lohmann 2017-03-08 16:39:17 +01:00
• 625cf7e3f7
  🔨 added user-defined exception 112 Niels Lohmann 2017-03-07 20:05:34 +01:00
• 757d2c6c7a
  🔨 replaced at() calls in msgpack/cbor Niels Lohmann 2017-03-06 23:45:08 +01:00
• 5407333224
  🔨 added user-defined exception 111 Niels Lohmann 2017-03-06 22:37:46 +01:00
• 21ec0e7806
  🔨 added user-defined exception 110 Niels Lohmann 2017-03-06 21:00:13 +01:00
• a186106bde
  🔨 user-defined exception 302 Niels Lohmann 2017-03-06 19:34:44 +01:00
• 38c2e20ce8
  added user-defined exceptions 404-405 Niels Lohmann 2017-03-05 23:25:22 +01:00
• 30331fa21f
  🔨 added user-defined exception 403 Niels Lohmann 2017-03-05 23:16:17 +01:00
• 60da36aee2
  🔨 added user-defined exceptions 401-402 Niels Lohmann 2017-03-05 22:56:39 +01:00
• 491c9780a7
  🔨 added user-defined exception 311 Niels Lohmann 2017-03-05 22:39:21 +01:00
• 6751d650be
  🔨 added user-defined exception 311 Niels Lohmann 2017-03-05 22:31:08 +01:00
• 9e560ca40c
  🔨 added user-defined exceptions 313-315 Niels Lohmann 2017-03-05 19:58:26 +01:00
• 144cf6a4c7
  🔨 added user-defined exceptions 310 Niels Lohmann 2017-03-05 19:48:11 +01:00
• 5cca44c161
  🔨 added user-defined exceptions 309 Niels Lohmann 2017-03-05 19:42:05 +01:00
• 70b2c3f45e
  🔨 added user-defined exceptions 308 Niels Lohmann 2017-03-05 19:35:24 +01:00
• 2a9393af00
  🔨 added user-defined exceptions 307 Niels Lohmann 2017-03-05 19:26:44 +01:00
• bb740c43fb
  🔨 added user-defined exceptions 306 Niels Lohmann 2017-03-05 19:15:56 +01:00
• aa842b4a27
  🔨 added user-defined exceptions 305 Niels Lohmann 2017-03-05 19:08:12 +01:00
• f473f74fb0
  🔨 added user-defined exceptions 303-304 Niels Lohmann 2017-03-05 18:56:35 +01:00
• 068c7acda9
  🔨 added user-defined exceptions 301 Niels Lohmann 2017-03-05 18:40:09 +01:00
• 0c40c8e3be
  🔨 added user-defined exceptions 2xx Niels Lohmann 2017-03-03 14:34:57 +01:00
• a4274d7766
  🔨 added user-defined exceptions 205-206 Niels Lohmann 2017-03-03 14:00:42 +01:00
• 875b2da95d
  🔨 added user-defined exceptions 203-204 Niels Lohmann 2017-03-03 13:38:14 +01:00
• 9381f6c4da
  🔨 added user-defined exceptions 201-202 Niels Lohmann 2017-03-03 13:19:45 +01:00
• e291c6c3d2
  Merge branch 'develop' into feature/exceptions_3.0.0 Niels Lohmann 2017-03-03 12:59:37 +01:00
• a1354184ce
  📝 fixed typo #481 Niels Lohmann 2017-03-03 12:56:54 +01:00
• 0c6b1f8a24
  Merge branch 'develop' into feature/exceptions_3.0.0 Niels Lohmann 2017-03-03 12:54:45 +01:00
• 776758d7a2
  🔨 added user-defined exception 109 Niels Lohmann 2017-03-03 12:54:37 +01:00
• b86d2148ef
  🔨 added user-defined exceptions 106-108 Niels Lohmann 2017-03-03 11:56:58 +01:00
• 06c788e4fd
  📝 added missing word Niels Lohmann 2017-03-03 10:01:16 +01:00
• 01d3a006b1
  ⬆️ updated Catch to v1.8.1 Niels Lohmann 2017-03-02 18:13:19 +01:00
• 06815d274e
  🔨 added user-defined exceptions 104 and 105 Niels Lohmann 2017-03-02 17:55:13 +01:00
• c085e3bac2
  🔨 started with user-defined exceptions #301 #244 Niels Lohmann 2017-03-01 21:28:44 +01:00
• 7b8fd864e2
  🔥 removed deprecated constructor #480 Niels Lohmann 2017-03-01 17:49:03 +01:00
• 6b3912d936
  📝 added note to 3.0.0 wiki page #474 Niels Lohmann 2017-03-01 17:26:32 +01:00
• f84ac523aa
  📝 added a note to ordered maps Niels Lohmann 2017-03-01 10:15:07 +01:00
• 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 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' 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