Commit graph

Select branches

Hide pull requests

master

Mono Color

• 3004a73951 Fix -Wno-sometimes-uninitialized by initializing "result" in parse_sax Tsz-Ho Yu 2018-08-18 01:12:19 +0100
• e33b31e6aa
  🐛 fixed callback-related issue (https://github.com/nlohmann/json/issues/971#issuecomment-413678360) Niels Lohmann 2018-08-17 23:09:45 +0200
• b5c54b41fd
  📝 overworked documentation Niels Lohmann 2018-08-16 21:53:47 +0200
• 07494e06d7
  🚨 fixed some compiler warnings Niels Lohmann 2018-08-16 18:20:30 +0200
• d5b21b051c
  Merge pull request #1153 from theodelrieu/refactor/no_virtual_sax Niels Lohmann 2018-08-16 17:47:55 +0200
• 0cc3db4f15
  add static_asserts on SAX interface Théo DELRIEU 2018-07-24 14:47:41 +0200
• 38f8a51a8f
  use abstract sax class in parser tests Théo DELRIEU 2018-08-16 10:52:33 +0200
• 9bbb133094
  remove no_limit constant and default values Théo DELRIEU 2018-07-24 13:09:08 +0200
• 442886d040
  use templates in the sax interface instead of virtuals Théo DELRIEU 2018-07-02 10:14:37 +0200
• f6febbe359
  split meta.hpp, add detected_t (used to define concepts) Théo DELRIEU 2018-07-24 13:22:44 +0200
• 3ac2d81a95
  🔨 fixed a MinGW error #1193 Niels Lohmann 2018-08-14 22:13:56 +0200
• be2065dce9
  🚨 fixing a MinGW warning #1192 Niels Lohmann 2018-08-14 22:11:47 +0200
• fed70f6bff
  🎨 reindented code Niels Lohmann 2018-08-14 22:11:08 +0200
• 0e748f2f8c
  Merge pull request #1187 from devsisters/json-internal-catch Niels Lohmann 2018-08-14 21:56:29 +0200
• 861ee400cc
  Merge pull request #1176 from grembo/develop Niels Lohmann 2018-08-14 21:48:49 +0200
• 3ce4325350
  📝 updated documentation of used compilers Niels Lohmann 2018-08-01 22:31:51 +0200
• ba4a19d4af
  👷 added more CI workers Niels Lohmann 2018-08-01 20:59:58 +0200
• 043eff5ba8
  👷 added more CI workers Niels Lohmann 2018-07-31 21:18:33 +0200
• 05b27e83b7 Exclude bytewise comparison in certain tests. These tests never worked - they weren't run before d5aaeb4. Michael Gmelin 2018-07-29 11:57:56 +0200
• d5aaeb4cce Make section names unique in loops, as catch doesn't support duplicate sections, see also https://github.com/catchorg/Catch2/issues/816#issuecomment-278268122 Michael Gmelin 2018-07-29 01:29:50 +0200
• 3760a38b7e
  🏁 implicit conversion is not allowed with MSVC Niels Lohmann 2018-07-21 11:47:05 +0200
• 5b14411669
  🏁 trying to fix C2440 error Niels Lohmann 2018-07-21 10:59:00 +0200
• 347e77bdc1
  🚑 fix for #1169 Niels Lohmann 2018-07-21 10:31:55 +0200
• 04372a8c56
  🏁 fix for #1168 Niels Lohmann 2018-07-19 17:31:50 +0200
• d0e60de433 Add new JSON_INTERNAL_CATCH macro function Hyeon Kim 2018-07-19 15:43:41 +0900
• 7bfc406ded
  📝 added note about CocoaPods #1148 Niels Lohmann 2018-07-05 21:18:46 +0200
• d456a2d777
  Merge pull request #1151 from sonulohani/bigObjFix Niels Lohmann 2018-06-29 09:03:43 +0200
• b8ad3388ec Fixed compiler error in VS 2015 for debug mode https://github.com/nlohmann/json/issues/1114 Sonu Lohani 2018-06-29 09:34:41 +0530
• 39dd775e38
  🔨 cleanup after #1134 Niels Lohmann 2018-06-28 21:32:32 +0200
• 86a96b059d
  Merge pull request #1134 from Daniel599/feature/items_iterator Niels Lohmann 2018-06-28 21:21:17 +0200
• 396a914f9e
  🔨 added macro to disable compiler check #1128 Niels Lohmann 2018-06-26 22:47:40 +0200
• bab5826504
  Merge pull request #1144 from jrakow/cppreference-link-fix Niels Lohmann 2018-06-26 07:58:45 +0200
• 515cfc2d89
  Merge pull request #1142 from jrakow/develop Niels Lohmann 2018-06-24 23:33:30 +0200
• 963d06a13c 📝 fix links to cppreference named requirements Julius Rakow 2018-06-24 22:30:37 +0200
• 9f00db48d9 📝 link to cppreference via HTTPS Julius Rakow 2018-06-24 22:29:33 +0200
• ec2ebd5ec9 meson: add multiple headers target Julius Rakow 2018-06-24 16:53:02 +0200
• 0bb36bb140 meson: fix include directory Julius Rakow 2018-06-23 20:45:00 +0200
• 62457729e8
  📝 mentioned MinGW in README Niels Lohmann 2018-06-24 18:03:59 +0200
• 09c0df4a21
  👷 choosing correct image Niels Lohmann 2018-06-24 17:40:16 +0200
• 1bbc4a0859
  👷 using Ninja to speed up build Niels Lohmann 2018-06-24 17:10:13 +0200
• d8fe13fc83
  🔨 fixed escaping for MinGW Niels Lohmann 2018-06-24 16:57:53 +0200
• e59b930927
  👷 trying a more recent compiler Niels Lohmann 2018-06-24 16:40:47 +0200
• 937d68e2e5
  👷 forgot old PATH Niels Lohmann 2018-06-24 16:37:02 +0200
• 989ad9b759
  👷 using help from https://stackoverflow.com/a/48509334/266378 Niels Lohmann 2018-06-24 16:35:16 +0200
• 067e288289
  👷 set build type Niels Lohmann 2018-06-24 16:29:03 +0200
• 7bbc06b487
  👷 forgot quotes Niels Lohmann 2018-06-24 16:18:44 +0200
• 441e5d87e6
  👷 experimenting with AppVeyor and MinGW Niels Lohmann 2018-06-24 16:17:06 +0200
• 7fa4ddf93e
  💄 fixed indentation Niels Lohmann 2018-06-23 17:27:40 +0200
• bf348ca8a4
  Merge pull request #1028 from gracicot/develop Niels Lohmann 2018-06-23 17:10:04 +0200
• ed6a0686df
  🔨 small refactoring to improve branch coverage Niels Lohmann 2018-06-23 17:05:04 +0200
• c8bfdfd961
  👷 tryping different platforms for AppVeyor Niels Lohmann 2018-06-23 11:12:32 +0200
• c02de445bf
  🚨 fixed more compiler warnings Niels Lohmann 2018-06-23 11:00:42 +0200
• 66dd1a846d
  🚨 fixed more compiler warnings Niels Lohmann 2018-06-23 10:47:55 +0200
• 850922269d
  🚨 removed compiler warnings Niels Lohmann 2018-06-23 10:28:04 +0200
• 0460b90977
  📝 fix for #1052 #1139 Niels Lohmann 2018-06-22 22:35:48 +0200
• 85f35a1d59
  📝 documentation fix Niels Lohmann 2018-06-22 22:34:42 +0200
• e7c1638d11
  💄 cleanup Niels Lohmann 2018-06-18 22:03:46 +0200
• 1c81e9f5ae
  Merge pull request #1130 from agrianius/develop Niels Lohmann 2018-06-18 22:01:53 +0200
• d505ed7b31
  Merge pull request #1138 from theodelrieu/feature/unordered_map_conversion Niels Lohmann 2018-06-18 21:59:46 +0200
• 2c920a1032
  run make amalgamate Théo DELRIEU 2018-06-18 10:53:51 +0200
• 2b37d7ed86
  from_json: add overload for std::unordered_map Théo DELRIEU 2018-06-18 10:53:30 +0200
• 299469cfd5
  from_json: add missing template arguments for std::map Théo DELRIEU 2018-06-18 10:52:11 +0200
• 1566ad4053 fixed compile error for #1045; to_json for iternation_proxy_internal was needed Danielc 2018-06-16 12:01:49 +0300
• f574d7e084 simplify templates for operators, add more checks Vitaliy 2018-06-13 19:47:29 +0300
• cd28d872e7 forward declarations to make new compilers happy Vitaliy 2018-06-11 20:50:39 +0300
• 3d3055909c define global operator< for const char* and alt_string Vitaliy 2018-06-11 19:09:57 +0300
• 4feb8211ca test (non)equality for alt_string implementation Vitaliy 2018-06-11 18:03:46 +0300
• 14e6278c2f Merge branch 'develop' of github.com:gracicot/json into develop Guillaume Racicot 2018-06-04 11:18:25 -0400
• 7acd90b651 Fixed check for compatible string type Guillaume Racicot 2018-06-04 11:18:19 -0400
• 5676a2a076
  Aligned template declaration Guillaume Racicot 2018-06-03 23:51:07 -0400
• e0e7fa39e7 Re-added external_constructor with string compatible types Guillaume Racicot 2018-06-03 23:49:13 -0400
• 4778c02ab5 Set MSVC version from 1514 and older Guillaume Racicot 2018-06-01 14:42:25 -0400
• 714c592680 Disabled implicit conversion to string_view on MSVC 15.13 and older Guillaume Racicot 2018-06-01 14:22:57 -0400
• e830bc502f
  Merge pull request #1117 from TinyTinni/develop Niels Lohmann 2018-06-01 08:05:45 +0200
• ecadcdb593 added char cast Matthias Möller 2018-05-31 16:36:16 +0200
• 48656a49f5 typo Matthias Möller 2018-05-31 15:32:21 +0200
• 64acb42aa7 remove stringstream dependency Matthias Möller 2018-05-31 13:27:11 +0200
• 8efbf8d7bb
  📝 documentation to avoid future issues like #1108 Niels Lohmann 2018-05-28 18:14:44 +0200
• e5a67fc3f8
  Merge branch 'develop' of https://github.com/nlohmann/json into develop Niels Lohmann 2018-05-28 17:57:46 +0200
• a49644ab74
  🚑 adjusted Fuzzer to new parser Niels Lohmann 2018-05-28 17:57:22 +0200
• 0efaf891e5
  Merge pull request #1089 from theodelrieu/feature/map_conversion Niels Lohmann 2018-05-28 14:53:23 +0200
• c5e63fd684
  Provide a from_json overload for std::map Théo DELRIEU 2018-05-14 11:51:37 +0200
• db03d09312
  Merge branch 'feature/key_ref' into develop (fixes #1098) Niels Lohmann 2018-05-27 22:26:00 +0200
• cf9299d222
  Merge branch 'feature/sax2' into develop #971 Niels Lohmann 2018-05-27 18:12:59 +0200
• 3cdc4d784b
  📝 added documentation Niels Lohmann 2018-05-27 18:07:53 +0200
• adf09726b0
  Merge branch 'develop' into feature/sax2 Niels Lohmann 2018-05-27 14:26:13 +0200
• 481ace65c4
  🔨 only calculate array index string when needed #1098 Niels Lohmann 2018-05-27 12:04:22 +0200
• 1c6b332dcd
  👌 mitigating cppcheck bug #1101 Niels Lohmann 2018-05-26 14:10:13 +0200
• 90eb0a91e0
  ⚡ keys are now returned as const reference #1098 Niels Lohmann 2018-05-26 13:26:40 +0200
• 1f84cc2c88
  ✅ adjusted test cases Niels Lohmann 2018-05-17 16:50:37 +0200
• 717301d1bc
  Merge branch 'testsuite' into feature/sax2 Niels Lohmann 2018-05-17 16:36:43 +0200
• 4639bb2c8f
  ✅ added more tests from recent nst's JSONTestSuite Niels Lohmann 2018-05-17 10:10:01 +0200
• e94862a649
  🚑 fixed error in callback logic Niels Lohmann 2018-05-06 19:00:49 +0200
• ae213721b1
  🔨 removed unget function for wstring parsers Niels Lohmann 2018-05-06 14:05:29 +0200
• 5ff2abb90d
  Merge branch 'develop' into feature/sax2 Niels Lohmann 2018-05-06 13:29:23 +0200
• 567fe9b7a0
  Merge pull request #1078 from martin-mfg/patch-1 Niels Lohmann 2018-05-04 17:04:35 +0200
• 377e956655
  fix typo in readme martin-mfg 2018-05-03 22:42:52 +0200
• 5da596385b Update issue templates Niels Lohmann 2018-05-03 18:35:56 +0200
• 7bbe7bb98f
  🔥 removed old issue template Niels Lohmann 2018-05-03 18:35:21 +0200
• 14f01e1981 🔧 update issue templates Niels Lohmann 2018-05-03 18:32:53 +0200