| 
								
								
									 chenguoping | f466919ec2 | change test cases | 2020-06-17 15:07:25 +08:00 |  | 
				
					
						| 
								
								
									 chenguoping | 8aaa4013a3 | remove overload function, change default_value to rvalue | 2020-06-17 15:05:28 +08:00 |  | 
				
					
						| 
								
								
									 Niels Lohmann | 4d96f4cf6a | 🔧 overwork CMake files | 2020-06-16 20:23:01 +02:00 |  | 
				
					
						| 
								
								
									 Niels Lohmann | f4c4bab600 | ✨ add option JSON_TestDataDirectory to set path with test data #2189 | 2020-06-16 12:55:36 +02:00 |  | 
				
					
						| 
								
								
									 Niels Lohmann | b53c6e2f81 | ✨ ignore comments | 2020-06-16 12:28:59 +02:00 |  | 
				
					
						| 
								
								
									 chenguoping | 691fb0c57a | fix issue#2059 | 2020-06-16 15:35:26 +08:00 |  | 
				
					
						| 
								
								
									 Niels Lohmann | e7452d8778 | Merge branch 'release/3.8.0' into develop | 2020-06-14 17:44:18 +02:00 |  | 
				
					
						| 
								
								
									 Niels Lohmann | 5f862710fe | 🔖 set version to 3.8.0 | 2020-06-14 17:16:45 +02:00 |  | 
				
					
						| 
								
								
									 Niels Lohmann | 1ecb7884d1 | 👥 update contributor list | 2020-06-14 15:22:08 +02:00 |  | 
				
					
						| 
								
								
									 Niels Lohmann | c05bd90467 | Merge pull request #2182 from tanuj208/develop Improve parse_ubjson_fuzzer | 2020-06-12 09:37:44 +02:00 |  | 
				
					
						| 
								
								
									 Tanuj Garg | c3c5c03ea3 | added fuzzing with different values to default argument in to_ubjson method | 2020-06-10 20:50:25 +05:30 |  | 
				
					
						| 
								
								
									 chenguoping | a3df26b771 | add some test cases | 2020-06-10 19:27:57 +08:00 |  | 
				
					
						| 
								
								
									 chenguoping | 71830be06d | fix issue#1275 | 2020-06-10 19:27:28 +08:00 |  | 
				
					
						| 
								
								
									 Niels Lohmann | 27f5a6e827 | 🙈 ignore __pycache__ directory | 2020-06-09 16:59:03 +02:00 |  | 
				
					
						| 
								
								
									 Niels Lohmann | 262d9cc67d | 🚨 fix a maybe-uninitialized warning | 2020-06-09 16:57:06 +02:00 |  | 
				
					
						| 
								
								
									 Niels Lohmann | 14881cf901 | Merge pull request #2178 from nlohmann/input_adapter_tests Add input adapter tests | 2020-06-09 08:46:32 +02:00 |  | 
				
					
						| 
								
								
									 Niels Lohmann | ae04426c85 | 🏁 fix for MSVC (see https://github.com/nlohmann/json/pull/2178#issuecomment-640622532) | 2020-06-08 20:07:15 +02:00 |  | 
				
					
						| 
								
								
									 Niels Lohmann | 2cf16625ac | ✅ add test for character types | 2020-06-07 22:49:39 +02:00 |  | 
				
					
						| 
								
								
									 Niels Lohmann | d4bc0c39af | ✅ add test for character types | 2020-06-07 22:47:54 +02:00 |  | 
				
					
						| 
								
								
									 Niels Lohmann | 6d73126ea9 | 🚨 fix warnings | 2020-06-07 22:47:25 +02:00 |  | 
				
					
						| 
								
								
									 Niels Lohmann | 28048d8207 | Merge branches 'develop' and 'mkdocs' of https://github.com/nlohmann/json into develop  Conflicts:
	doc/examples/swap__binary_t.link | 2020-06-07 21:02:08 +02:00 |  | 
				
					
						| 
								
								
									 Niels Lohmann | eca5490b94 | 📝 add example link for swap function | 2020-06-07 21:01:13 +02:00 |  | 
				
					
						| 
								
								
									 Niels Lohmann | 8c1d26e186 | 📝 add documentation and example for accept function | 2020-06-07 20:59:43 +02:00 |  | 
				
					
						| 
								
								
									 Niels Lohmann | 543dcee3a7 | Merge pull request #2174 from nlohmann/fix_warnings Fix warnings | 2020-06-07 20:35:05 +02:00 |  | 
				
					
						| 
								
								
									 Niels Lohmann | 907803189b | 🏁 fix MSVC 2015 compilation | 2020-06-07 12:51:33 +02:00 |  | 
				
					
						| 
								
								
									 Niels Lohmann | e6a7e7a16a | 🚑 hotfix for #2177 | 2020-06-07 12:41:36 +02:00 |  | 
				
					
						| 
								
								
									 Guillaume Racicot | 82fbbeeac5 | Adapted unit tests to use ADL calls for swap like the new swappable concept | 2020-06-06 12:28:52 -04:00 |  | 
				
					
						| 
								
								
									 Guillaume Racicot | 225c8f150a | Disable std::swap specialization in C++20 and added a friend swap function | 2020-06-06 11:36:39 -04:00 |  | 
				
					
						| 
								
								
									 Niels Lohmann | bf2e714e96 | 🚨 fix warnings | 2020-06-06 14:30:17 +02:00 |  | 
				
					
						| 
								
								
									 Niels Lohmann | 7444c7fa25 | Merge pull request #2145 from FrancoisChabot/1813-user-input Fix Issue#1813: user defined input adapters | 2020-06-05 14:30:39 +02:00 |  | 
				
					
						| 
								
								
									 Niels Lohmann | dd7e25927f | 🚨 fix warning | 2020-06-05 08:27:15 +02:00 |  | 
				
					
						| 
								
								
									 Niels Lohmann | 5fe6b83c26 | Merge pull request #2158 from dota17/output_adapter Fix PR#1006 | 2020-06-05 08:25:19 +02:00 |  | 
				
					
						| 
								
								
									 chenguoping | ad2b4ff23b | recover original blank line | 2020-06-05 14:23:00 +08:00 |  | 
				
					
						| 
								
								
									 chenguoping | 0f67c5849f | undo: remove comment | 2020-06-05 10:09:15 +08:00 |  | 
				
					
						| 
								
								
									 Niels Lohmann | 2df5f107a9 | 📝 add page on parsing and exceptions | 2020-06-04 14:01:57 +02:00 |  | 
				
					
						| 
								
								
									 Niels Lohmann | 32bda1a7af | Merge branches 'develop' and 'mkdocs' of https://github.com/nlohmann/json into mkdocs | 2020-06-04 13:07:20 +02:00 |  | 
				
					
						| 
								
								
									 Niels Lohmann | 24e8562664 | 👷 remove Clang 8 | 2020-06-04 12:48:03 +02:00 |  | 
				
					
						| 
								
								
									 Niels Lohmann | a53e3a5443 | 👷 try Clang 8 | 2020-06-04 12:34:56 +02:00 |  | 
				
					
						| 
								
								
									 Niels Lohmann | dc323314d5 | 👷 try Clang 10 | 2020-06-04 12:29:53 +02:00 |  | 
				
					
						| 
								
								
									 Niels Lohmann | 402c34c526 | 👷 try Clang 10 | 2020-06-04 12:27:37 +02:00 |  | 
				
					
						| 
								
								
									 Niels Lohmann | 65c4b07451 | 🎨 replace alternative operators (and, not, or) | 2020-06-03 21:22:07 +02:00 |  | 
				
					
						| 
								
								
									 Niels Lohmann | 0498202a03 | 🎨 replace alternative operators (and, not, or) | 2020-06-03 14:20:36 +02:00 |  | 
				
					
						| 
								
								
									 Niels Lohmann | 4f04ea1bef | Merge branches 'clang_windows' and 'develop' of https://github.com/nlohmann/json into clang_windows | 2020-06-03 14:01:18 +02:00 |  | 
				
					
						| 
								
								
									 Niels Lohmann | 9212590764 | 👥 update contributor list | 2020-06-03 13:56:01 +02:00 |  | 
				
					
						| 
								
								
									 Niels Lohmann | 9708b1e9c3 | 🔥 remove Code Inspector | 2020-06-03 13:49:46 +02:00 |  | 
				
					
						| 
								
								
									 Niels Lohmann | 68fd772fdf | 👷 add Code Inspector via GitHub Action | 2020-06-03 13:44:33 +02:00 |  | 
				
					
						| 
								
								
									 Niels Lohmann | 9bc2a7fa25 | 👷 add Code Inspector via GitHub Action | 2020-06-03 13:39:56 +02:00 |  | 
				
					
						| 
								
								
									 Niels Lohmann | c24218afe8 | Merge remote-tracking branch 'origin/develop' into develop | 2020-06-03 13:38:15 +02:00 |  | 
				
					
						| 
								
								
									 Niels Lohmann | 2c4be7d65c | Merge pull request #2152 from TotalCaesar659/patch-1 Update URLs to HTTPS | 2020-06-03 12:31:33 +02:00 |  | 
				
					
						| 
								
								
									 Niels Lohmann | 2ad847f21b | 🔨 fix doxygen link | 2020-06-03 12:30:42 +02:00 |  |