| 
								
								
									 Niels Lohmann | 8cee0e38d9 | 🚑 fixed #1319 | 2018-10-30 17:29:05 +01:00 |  | 
				
					
						| 
								
								
									 Niels Lohmann | 856fc31d0a | 💄 fixed indentation | 2018-10-29 19:44:19 +01:00 |  | 
				
					
						| 
								
								
									 Niels Lohmann | 39419cd5c4 | 🚨 fixed another linter warning | 2018-10-29 18:51:30 +01:00 |  | 
				
					
						| 
								
								
									 Niels Lohmann | 86b5ce953a | 📝 added examples for BSON functions | 2018-10-28 15:09:26 +01:00 |  | 
				
					
						| 
								
								
									 Niels Lohmann | d2e4f0b0d9 | ✏️ fixed some typos | 2018-10-28 14:20:20 +01:00 |  | 
				
					
						| 
								
								
									 Niels Lohmann | f0c1459554 | 🐛 fixed a bug parsing BSON strings #1320 | 2018-10-28 09:16:40 +01:00 |  | 
				
					
						| 
								
								
									 Niels Lohmann | 24946f67f1 | 🚨 fixed some more linter warnings | 2018-10-28 09:15:41 +01:00 |  | 
				
					
						| 
								
								
									 Niels Lohmann | 7d0dc10169 | 🚨 fixed a linter warning | 2018-10-27 18:34:35 +02:00 |  | 
				
					
						| 
								
								
									 Niels Lohmann | 45a761bd60 | Merge branch 'develop' of https://github.com/nlohmann/json into develop | 2018-10-27 18:31:06 +02:00 |  | 
				
					
						| 
								
								
									 Niels Lohmann | 4e765596f7 | 🔨 small improvements | 2018-10-27 18:31:03 +02:00 |  | 
				
					
						| 
								
								
									 Niels Lohmann | 1308ea055d | Merge pull request #1315 from nlohmann/feature/convert_char Properly convert constants to CharType | 2018-10-27 16:56:00 +02:00 |  | 
				
					
						| 
								
								
									 Niels Lohmann | 0e7be06bef | Merge pull request #1323 from nlohmann/feature/enum_json_mapping Add macro to define enum/JSON mapping | 2018-10-27 16:55:39 +02:00 |  | 
				
					
						| 
								
								
									 Niels Lohmann | 85aaf91b85 | Merge branch 'develop' into feature/enum_json_mapping | 2018-10-27 16:52:59 +02:00 |  | 
				
					
						| 
								
								
									 Niels Lohmann | 5a6bdf5934 | Merge branch 'develop' into feature/convert_char | 2018-10-27 16:48:48 +02:00 |  | 
				
					
						| 
								
								
									 Niels Lohmann | 037e93f5c0 | Merge pull request #1320 from nlohmann/julian-becker-feature/bson Add BSON support | 2018-10-27 16:37:54 +02:00 |  | 
				
					
						| 
								
								
									 Niels Lohmann | 9f48bb6937 | ⚡ replaced vector by array #1323 | 2018-10-27 09:58:23 +02:00 |  | 
				
					
						| 
								
								
									 Niels Lohmann | 6384fe28db | 🚨 fixed another linter warning | 2018-10-26 23:12:41 +02:00 |  | 
				
					
						| 
								
								
									 Niels Lohmann | ad639ad5e6 | ✨ added NLOHMANN_JSON_SERIALIZE_ENUM marco #1208 | 2018-10-26 14:48:20 +02:00 |  | 
				
					
						| 
								
								
									 Niels Lohmann | 544150d5a5 | 🚨 fixed another linter warning | 2018-10-26 11:10:49 +02:00 |  | 
				
					
						| 
								
								
									 Niels Lohmann | c2e175763c | 👌 added another conversion function #1315 | 2018-10-25 22:47:08 +02:00 |  | 
				
					
						| 
								
								
									 Niels Lohmann | d97fa30795 | 👌 fixed comment #1320 | 2018-10-25 22:29:27 +02:00 |  | 
				
					
						| 
								
								
									 Niels Lohmann | 7ce720b700 | 🚨 fixed coverage | 2018-10-25 18:21:50 +02:00 |  | 
				
					
						| 
								
								
									 Niels Lohmann | 19647e083c | 🚨 fixed compiler warnings | 2018-10-25 14:27:55 +02:00 |  | 
				
					
						| 
								
								
									 Niels Lohmann | 62126278a6 | 🔨 added fix for arrays | 2018-10-25 13:01:18 +02:00 |  | 
				
					
						| 
								
								
									 Niels Lohmann | 1968e5c793 | 🎨 clean up binary formats | 2018-10-24 23:39:30 +02:00 |  | 
				
					
						| 
								
								
									 Niels Lohmann | 4d1eaace8c | 🔨 fixed fuzz code to avoid false positives in case of discarded values | 2018-10-24 18:55:08 +02:00 |  | 
				
					
						| 
								
								
									 Niels Lohmann | e2c5913a50 | 🚧 some changes to the BSON code - added fuzz testers
- added some reference files
- made an exception text more clear | 2018-10-24 15:43:37 +02:00 |  | 
				
					
						| 
								
								
									 Niels Lohmann | bba159121f | Merge branch 'feature/bson' of https://github.com/julian-becker/json into julian-becker-feature/bson | 2018-10-24 15:03:15 +02:00 |  | 
				
					
						| 
								
								
									 Niels Lohmann | f102df3cba | 📝 updated documentation #1314 | 2018-10-24 09:28:57 +02:00 |  | 
				
					
						| 
								
								
									 Niels Lohmann | 7b501de054 | Merge pull request #1314 from nlohmann/feature/codec_errors Allow to set error handler for decoding errors | 2018-10-24 08:40:58 +02:00 |  | 
				
					
						| 
								
								
									 Niels Lohmann | 20038e2703 | 📝 added a note to the discussion #1286 | 2018-10-23 23:00:43 +02:00 |  | 
				
					
						| 
								
								
									 Niels Lohmann | 87ef3f25f2 | ✏️ fixed a typo #1314 | 2018-10-23 22:56:10 +02:00 |  | 
				
					
						| 
								
								
									 Niels Lohmann | b49f76931f | 👌 replaced static_cast to CharType by conversion function #1286 | 2018-10-23 17:49:04 +02:00 |  | 
				
					
						| 
								
								
									 Niels Lohmann | 2343d9caeb | 💚 additional tests from the Unicode spec #1198 Thanks @abolz! | 2018-10-23 17:22:13 +02:00 |  | 
				
					
						| 
								
								
									 Niels Lohmann | 951a7a6455 | 🚧 fixed test cases #1198 | 2018-10-22 18:20:45 +02:00 |  | 
				
					
						| 
								
								
									 Niels Lohmann | c51b1e6fab | 🚧 fixed an issue with ensure_ascii #1198 | 2018-10-22 15:53:36 +02:00 |  | 
				
					
						| 
								
								
									 Niels Lohmann | c7af027cbb | 🚧 respect ensure_ascii parameter #1198 | 2018-10-22 09:18:16 +02:00 |  | 
				
					
						| 
								
								
									 Niels Lohmann | e5dce64115 | 💚 added tests #1198 Test every prefix of Unicode sequences against the different dump functions. | 2018-10-21 23:26:25 +02:00 |  | 
				
					
						| 
								
								
									 Niels Lohmann | c5821d91e5 | 🚧 overworked error handlers #1198 | 2018-10-21 11:49:37 +02:00 |  | 
				
					
						| 
								
								
									 Julian Becker | ad11b6c35e | BSON: Improved exception-related tests and report location of U+0000 in the key-string as part of out_of_range.409-message | 2018-10-18 20:05:46 +02:00 |  | 
				
					
						| 
								
								
									 Niels Lohmann | 9294e25c98 | Merge pull request #1301 from theodelrieu/fix/1299 add new is_constructible_* traits used in from_json | 2018-10-18 19:18:48 +02:00 |  | 
				
					
						| 
								
								
									 Niels Lohmann | b553a8a93c | Merge pull request #1305 from koponomarenko/add-meson-info Add Meson related info to README | 2018-10-18 10:55:25 +02:00 |  | 
				
					
						| 
								
								
									 Julian Becker | 5ba812d518 | BSON: fixed incorrect casting in unit-bson.cpp | 2018-10-18 06:38:34 +02:00 |  | 
				
					
						| 
								
								
									 Julian Becker | 8de10c518b | BSON: Hopefully fixing ambiguity (on some compilers) to call to string::find() | 2018-10-17 21:47:01 +02:00 |  | 
				
					
						| 
								
								
									 Kostiantyn Ponomarenko | f0c55ce0e0 | Add Meson related info to README Add more information about how one can get a Meson wrap file.
Signed-off-by: Kostiantyn Ponomarenko <konstantin.ponomarenko@gmail.com> | 2018-10-17 21:46:45 +03:00 |  | 
				
					
						| 
								
								
									 Julian Becker | 2a63869159 | Merge branch 'develop' of https://github.com/nlohmann/json into feature/bson Conflicts:
	include/nlohmann/detail/input/binary_reader.hpp
	single_include/nlohmann/json.hpp
	src/unit-bson.cpp | 2018-10-17 20:26:00 +02:00 |  | 
				
					
						| 
								
								
									 Niels Lohmann | 4b2a00641c | Merge pull request #1303 from nlohmann/feature/binary_errors Improve diagnostic messages for binary formats | 2018-10-17 17:54:14 +02:00 |  | 
				
					
						| 
								
								
									 Niels Lohmann | dbb0b63187 | ♿ improved error messages for binary formats #1288 This commit is the equivalent of #1282 for CBOR, MessagePack, and UBJSON. | 2018-10-17 12:15:58 +02:00 |  | 
				
					
						| 
								
								
									 Théo DELRIEU | a946dfc19c | add a note to maintainers in type_traits.hpp | 2018-10-17 12:03:10 +02:00 |  | 
				
					
						| 
								
								
									 Julian Becker | 978c3c4116 | BSON: throw json.exception.out_of_range.409in case a key to be serialized to BSON contains a U+0000 | 2018-10-16 20:42:00 +02:00 |  |