Commit graph

Select branches

Hide pull requests

master

Mono Color

• eb7376bb13
  Merge pull request #2225 from nlohmann/issue2175 Niels Lohmann 2020-06-29 14:41:09 +0200
• 470f7c0c68
  📝 add documentation Niels Lohmann 2020-06-29 13:43:06 +0200
• 1b4ea8f89b
  Merge pull request #2224 from nlohmann/issue2221 Niels Lohmann 2020-06-28 15:08:18 +0200
• d7a2956b24
  🔀 merge from develop Niels Lohmann 2020-06-27 13:16:20 +0200
• ac3922c7aa
  Merge branch 'develop' of https://github.com/nlohmann/json into clang_windows Niels Lohmann 2020-06-27 13:14:48 +0200
• fa9f4040df
  🔥 remove unused typedefs #2221 Niels Lohmann 2020-06-27 13:07:02 +0200
• 5ba0f65c34
  🔧 remove feature request template Niels Lohmann 2020-06-27 12:55:41 +0200
• aefa0b3e86
  🔧 use Github discussions for questions Niels Lohmann 2020-06-27 12:54:42 +0200
• 3948b5b091
  Merge pull request #2212 from nlohmann/comments Niels Lohmann 2020-06-27 12:44:51 +0200
• 1af4f5f360
  Merge pull request #2222 from alexreinking/patch-1 Niels Lohmann 2020-06-27 12:43:52 +0200
• c5ee222982
  Merge pull request #2211 from nlohmann/fix_warnings Niels Lohmann 2020-06-27 12:34:18 +0200
• ec43371e07
  Enable CMake policy CMP0077 Alex Reinking 2020-06-26 11:47:36 -0700
• 635b9a0ae4
  Merge pull request #2193 from dota17/issue#2059 Niels Lohmann 2020-06-24 11:46:48 +0200
• cf18ba2394 Test initialization with dup keys gatopeich 2020-06-23 17:50:51 +0100
• 08963d6826 Revert types.md gatopeich 2020-06-23 15:48:02 +0100
• d08fca2bb9 Use const Key in ordered map (forgotten in previous commit!) gatopeich 2020-06-23 15:44:46 +0100
• 5e7bdf1cab Roll-back to hard-coded object_t::value_type gatopeich 2020-06-23 15:39:00 +0100
• fb8c11f25c Re-implement ordered_map::erase, so that it can handle pair<const Key,...> gatopeich 2020-06-23 15:01:20 +0100
• acd748e16f Use std::map default allocator as a placeholder to extract the actual ObjectType::value_type Still fails on older compilers (GCC <= 5.5) gatopeich 2020-06-23 12:03:21 +0100
• 49623a75ee Revert "Using ordered_json instead of fifo_map in test-regression" gatopeich 2020-06-23 11:30:52 +0100
• 8575fdf9ad
  Merge pull request #2181 from dota17/issue#1275 Niels Lohmann 2020-06-23 09:23:03 +0200
• 4bfe4add20
  Merge pull request #2203 from t-b/use-unsigned-indizies-for-array-index-in-json-pointer Niels Lohmann 2020-06-23 09:16:01 +0200
• 0ecf297457 drop std::enable_if part chenguoping 2020-06-23 09:14:55 +0800
• a9809f3381
  🏁 revert change that breaks with MSVC Niels Lohmann 2020-06-22 23:02:28 +0200
• 8b3d2399a4
  🚨 remove warnings Niels Lohmann 2020-06-22 22:32:21 +0200
• 5fe3d3929a Using ordered_json instead of fifo_map in test-regression This is more comprehensive and the "my_workaround_fifo_map" wrapper does not allow to infer value type as required in this branch. gatopeich 2020-06-22 19:10:35 +0100
• 064a9c9212 Fix regression test gatopeich 2020-06-22 18:59:19 +0100
• ddf0a45abb Use AllocatorType<ObjectType::value_type>, instead of hard-coding it for std::map's value_type gatopeich 2020-06-22 18:35:46 +0100
• aeef50709e to allow for ADL in int_to_string() function chenguoping 2020-06-22 20:17:56 +0800
• ecbb2756fd json_pointer::array_index: Use unsigned values for the array index when parsing Thomas Braun 2020-06-20 15:36:28 +0200
• 65e8ee985a
  🔨 clean up Niels Lohmann 2020-06-22 08:59:03 +0200
• 15337b2cc3 Ignore allocator hardcoded to match std::map gatopeich 2020-06-22 00:03:48 +0100
• 27aaf6f845 Clean-up ordered_map declarations gatopeich 2020-06-21 22:28:03 +0100
• 29ad2178c6
  Merge pull request #2176 from gracicot/cpp20-support-no-std-fct-templ-specialization Niels Lohmann 2020-06-21 20:39:58 +0200
• e22ce45065
  🚸 improve diagnostics Niels Lohmann 2020-06-21 13:28:00 +0200
• 139a0258cc
  Merge branch 'develop' of https://github.com/nlohmann/json into comments Niels Lohmann 2020-06-21 12:40:21 +0200
• 8dade80499
  Merge pull request #2202 from nlohmann/issue2189 Niels Lohmann 2020-06-21 08:41:48 +0200
• f0e73163f2 json_pointer.hpp: Mention more exception in documentation Thomas Braun 2020-06-20 15:25:54 +0200
• 0fe9f23254
  ✨ add macros from #2175 Niels Lohmann 2020-06-20 14:11:37 +0200
• 6ee9e5f402
  ⚗️ remove const from value type Niels Lohmann 2020-06-20 13:23:44 +0200
• 24992003d9
  📝 add notes from #2189 Niels Lohmann 2020-06-20 09:55:11 +0200
• e4675887a6
  Merge branch 'develop' of https://github.com/nlohmann/json into issue2189 Niels Lohmann 2020-06-20 09:47:12 +0200
• 74c6e4295f
  Merge pull request #2201 from nlohmann/issue2196 Niels Lohmann 2020-06-20 09:31:02 +0200
• 4fd0d02b6f
  🚧 toward an ordered_json type Niels Lohmann 2020-06-19 15:27:05 +0200
• b64002bbca
  ♻️ extract common code to function Niels Lohmann 2020-06-19 13:24:08 +0200
• 0585ecc56b
  ✅ add tests for comment skipping Niels Lohmann 2020-06-19 13:10:35 +0200
• cd115cbc33
  ✅ update test suite Niels Lohmann 2020-06-18 12:50:32 +0200
• 74520d8bb0
  🚧 extend API Niels Lohmann 2020-06-17 22:03:14 +0200
• 88a37010d6
  🐛 serialize 32-bit floating-point numbers as float 32 in MessagePack (0xCA) #2196 Niels Lohmann 2020-06-17 21:14:23 +0200
• e9bfcf7255
  ⚡ improve comment parsing Niels Lohmann 2020-06-17 14:59:47 +0200
• 4a6c68c7eb drop new blank line chenguoping 2020-06-17 20:44:31 +0800
• da8fa3535a drop testcase chenguoping 2020-06-17 20:41:31 +0800
• e86b3fae98
  🔧 add label to tests that require a git checkout Niels Lohmann 2020-06-17 12:35:59 +0200
• f466919ec2 change test cases chenguoping 2020-06-17 15:07:25 +0800
• 8aaa4013a3 remove overload function, change default_value to rvalue chenguoping 2020-06-17 15:05:28 +0800
• 4d96f4cf6a
  🔧 overwork CMake files Niels Lohmann 2020-06-16 20:23:01 +0200
• f4c4bab600
  ✨ add option JSON_TestDataDirectory to set path with test data #2189 Niels Lohmann 2020-06-16 12:55:36 +0200
• b53c6e2f81
  ✨ ignore comments Niels Lohmann 2020-06-16 12:28:59 +0200
• 691fb0c57a fix issue#2059 chenguoping 2020-06-16 15:35:26 +0800
• e7452d8778
  Merge branch 'release/3.8.0' into develop Niels Lohmann 2020-06-14 17:44:18 +0200
• fbec662afa
  Merge branch 'release/3.8.0' Niels Lohmann 2020-06-14 17:44:01 +0200
• 5f862710fe
  🔖 set version to 3.8.0 Niels Lohmann 2020-06-14 17:16:45 +0200
• 1ecb7884d1
  👥 update contributor list Niels Lohmann 2020-06-14 15:22:08 +0200
• c05bd90467
  Merge pull request #2182 from tanuj208/develop Niels Lohmann 2020-06-12 09:37:44 +0200
• c3c5c03ea3 added fuzzing with different values to default argument in to_ubjson method Tanuj Garg 2020-06-10 20:50:25 +0530
• a3df26b771 add some test cases chenguoping 2020-06-10 19:27:57 +0800
• 71830be06d fix issue#1275 chenguoping 2020-06-10 19:27:28 +0800
• 27f5a6e827
  🙈 ignore __pycache__ directory Niels Lohmann 2020-06-09 16:59:03 +0200
• 262d9cc67d
  🚨 fix a maybe-uninitialized warning Niels Lohmann 2020-06-09 16:57:06 +0200
• 14881cf901
  Merge pull request #2178 from nlohmann/input_adapter_tests Niels Lohmann 2020-06-09 08:46:32 +0200
• ae04426c85
  🏁 fix for MSVC (see https://github.com/nlohmann/json/pull/2178#issuecomment-640622532) Niels Lohmann 2020-06-08 20:07:15 +0200
• 2cf16625ac
  ✅ add test for character types Niels Lohmann 2020-06-07 22:49:39 +0200
• d4bc0c39af
  ✅ add test for character types Niels Lohmann 2020-06-07 22:47:54 +0200
• 6d73126ea9
  🚨 fix warnings Niels Lohmann 2020-06-07 22:47:25 +0200
• 28048d8207
  Merge branches 'develop' and 'mkdocs' of https://github.com/nlohmann/json into develop Niels Lohmann 2020-06-07 21:02:08 +0200
• eca5490b94
  📝 add example link for swap function Niels Lohmann 2020-06-07 21:01:13 +0200
• 8c1d26e186
  📝 add documentation and example for accept function Niels Lohmann 2020-06-07 20:59:43 +0200
• 543dcee3a7
  Merge pull request #2174 from nlohmann/fix_warnings Niels Lohmann 2020-06-07 20:35:05 +0200
• 907803189b
  🏁 fix MSVC 2015 compilation Niels Lohmann 2020-06-07 12:51:33 +0200
• e6a7e7a16a
  🚑 hotfix for #2177 Niels Lohmann 2020-06-07 12:41:36 +0200
• 82fbbeeac5 Adapted unit tests to use ADL calls for swap like the new swappable concept Guillaume Racicot 2020-06-06 12:28:52 -0400
• 225c8f150a Disable std::swap specialization in C++20 and added a friend swap function Guillaume Racicot 2020-06-06 11:36:39 -0400
• bf2e714e96
  🚨 fix warnings Niels Lohmann 2020-06-06 14:30:17 +0200
• 7444c7fa25
  Merge pull request #2145 from FrancoisChabot/1813-user-input Niels Lohmann 2020-06-05 14:30:39 +0200
• dd7e25927f
  🚨 fix warning Niels Lohmann 2020-06-05 08:27:15 +0200
• 5fe6b83c26
  Merge pull request #2158 from dota17/output_adapter Niels Lohmann 2020-06-05 08:25:19 +0200
• ad2b4ff23b recover original blank line chenguoping 2020-06-05 14:23:00 +0800
• 0f67c5849f undo: remove comment chenguoping 2020-06-05 10:09:15 +0800
• 2df5f107a9
  📝 add page on parsing and exceptions Niels Lohmann 2020-06-04 14:01:57 +0200
• 32bda1a7af
  Merge branches 'develop' and 'mkdocs' of https://github.com/nlohmann/json into mkdocs Niels Lohmann 2020-06-04 13:07:20 +0200
• 24e8562664
  👷 remove Clang 8 Niels Lohmann 2020-06-04 12:48:03 +0200
• a53e3a5443
  👷 try Clang 8 Niels Lohmann 2020-06-04 12:34:56 +0200
• dc323314d5
  👷 try Clang 10 Niels Lohmann 2020-06-04 12:29:53 +0200
• 402c34c526
  👷 try Clang 10 Niels Lohmann 2020-06-04 12:27:37 +0200
• 65c4b07451
  🎨 replace alternative operators (and, not, or) Niels Lohmann 2020-06-03 21:22:07 +0200
• 0498202a03
  🎨 replace alternative operators (and, not, or) Niels Lohmann 2020-06-03 14:20:36 +0200
• 4f04ea1bef
  Merge branches 'clang_windows' and 'develop' of https://github.com/nlohmann/json into clang_windows Niels Lohmann 2020-06-03 14:01:18 +0200
• 9212590764
  👥 update contributor list Niels Lohmann 2020-06-03 13:56:01 +0200
• 9708b1e9c3
  🔥 remove Code Inspector Niels Lohmann 2020-06-03 13:49:46 +0200
• 68fd772fdf
  👷 add Code Inspector via GitHub Action Niels Lohmann 2020-06-03 13:44:33 +0200