Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								9f3857ef6f 
								
							 
						 
						
							
							
								
								🔖  set version to 3.2.0  
							
							
							
						 
						
							2018-08-18 18:46:15 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								a7b02bdce0 
								
							 
						 
						
							
							
								
								🔖  preparing 3.2.0 release  
							
							
							
						 
						
							2018-08-18 17:48:49 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								c6a482b16c 
								
							 
						 
						
							
							
								
								📝  added example for sax_parse  
							
							
							
						 
						
							2018-08-18 15:42:18 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								e33b31e6aa 
								
							 
						 
						
							
							
								
								🐛  fixed callback-related issue ( https://github.com/nlohmann/json/issues/971#issuecomment-413678360 )  
							
							
							
						 
						
							2018-08-17 23:09:45 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								b5c54b41fd 
								
							 
						 
						
							
							
								
								📝  overworked documentation  
							
							
							
						 
						
							2018-08-16 21:53:47 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								46ec2fddf8 
								
							 
						 
						
							
							
								
								📝  updated THANKS list  
							
							
							
						 
						
							2018-04-10 18:13:37 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								830c93fd09 
								
							 
						 
						
							
							
								
								📝  fixed example for operator>  #1029  
							
							
							
						 
						
							2018-03-29 17:07:55 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								8a6c8cb0f7 
								
							 
						 
						
							
							
								
								🔖  set version to 3.1.2  
							
							
							
						 
						
							2018-03-14 21:32:03 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								afef474c0d 
								
							 
						 
						
							
							
								
								🔖  set version to 3.1.2  
							
							
							
						 
						
							2018-03-14 21:09:27 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								1f3d2a3be7 
								
							 
						 
						
							
							
								
								📝  overworked README  
							
							
							
						 
						
							2018-02-26 17:37:24 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								8424d10e45 
								
							 
						 
						
							
							
								
								🔖  set version to 3.1.1  
							
							
							
						 
						
							2018-02-13 15:59:32 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								938c861a09 
								
							 
						 
						
							
							
								
								🔖  set version to 3.1.1  
							
							
							
						 
						
							2018-02-12 22:59:36 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								61f0bfb15c 
								
							 
						 
						
							
							
								
								🔨  enforce using Python 2 for the wandbox script  
							
							
							
						 
						
							2018-02-11 14:46:15 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								0a64982e86 
								
							 
						 
						
							
							
								
								📝  cleanup after  #954  
							
							
							
						 
						
							2018-02-09 23:32:28 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								0258484626 
								
							 
						 
						
							
							
								
								🔖  set version to 3.1.0  
							
							... 
							
							
							
							- updated documentation wrt. new repository layout
- temporarily switched off Homebrew --HEAD building (can only be switched on after release)
- set copyright date to 2018 
							
						 
						
							2018-02-01 22:20:26 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								552d153842 
								
							 
						 
						
							
							
								
								📝  added more statistics on binary formats  
							
							
							
						 
						
							2018-01-31 21:54:38 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								51c774f208 
								
							 
						 
						
							
							
								
								📝  added documentation for binary formats  
							
							
							
						 
						
							2018-01-31 17:23:11 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								ce273af9b6 
								
							 
						 
						
							
							
								
								📝  added documentation for binary formats  
							
							
							
						 
						
							2018-01-30 23:20:36 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								52e9449563 
								
							 
						 
						
							
							
								
								📝  added more functions to overview  
							
							
							
						 
						
							2018-01-28 20:44:45 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								1be3935e9d 
								
							 
						 
						
							
							
								
								📝  cleanup after  #936  
							
							
							
						 
						
							2018-01-27 17:43:44 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								3c68a796df 
								
							 
						 
						
							
							
								
								🔥  deprecated iterator_wrapper  #874  
							
							... 
							
							
							
							Also fixed some warnings from GCC. 
							
						 
						
							2018-01-23 16:33:08 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								7eabb6ba36 
								
							 
						 
						
							
							
								
								📝  updated documentation for UBJSON functions  
							
							
							
						 
						
							2018-01-22 23:23:17 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								3d776b0582 
								
							 
						 
						
							
							
								
								📝  updated README  
							
							
							
						 
						
							2018-01-21 14:13:42 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								0e8f01a963 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into feature/rfc7396  
							
							
							
						 
						
							2018-01-14 10:28:09 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								78f8f837e6 
								
							 
						 
						
							
							
								
								added items() function  #874  
							
							
							
						 
						
							2018-01-05 18:34:10 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								96b40b27a5 
								
							 
						 
						
							
							
								
								📝  fixed Doxygen warnings  
							
							... 
							
							
							
							Apparently, using "\n" inside an alias is an error now, but "^^" basically means the same. 
							
						 
						
							2018-01-05 18:33:42 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								92484f0caf 
								
							 
						 
						
							
							
								
								🔖  set version to 3.0.1  
							
							
							
						 
						
							2017-12-29 18:31:13 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								3c76ff353d 
								
							 
						 
						
							
							
								
								📝  updated docs after PRs  
							
							
							
						 
						
							2017-12-29 16:52:09 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								3113a52a7d 
								
							 
						 
						
							
							
								
								📝  added exception 403 to documentation of at ( #888 )  
							
							... 
							
							
							
							The at function throws json::out_of_range.403 when a nonexistent object key is provided (just like the usual at function). This was not documented and users could assume json::out_of_range.404 would be thrown instead.
- Updated documentation.
- Added example code. 
							
						 
						
							2017-12-23 18:38:18 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								88ddb12afc 
								
							 
						 
						
							
							
								
								📝  fix for  #883  
							
							... 
							
							
							
							- Adjusted table to user-defined exceptions. This was forgotten in the 3.0.0 update.
- Added update function to the table. 
							
						 
						
							2017-12-18 19:46:53 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								106f9f5436 
								
							 
						 
						
							
							
								
								⬆️  updated git-update-ghpages script  
							
							
							
						 
						
							2017-12-17 10:20:30 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								9e3c4ad11f 
								
							 
						 
						
							
							
								
								🔖  set version to 3.0.0  
							
							
							
						 
						
							2017-12-17 08:31:18 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								314e4e7699 
								
							 
						 
						
							
							
								
								📝  improved documentation for dump and iterator_wrapper  
							
							
							
						 
						
							2017-12-16 23:58:10 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								f3bd755cab 
								
							 
						 
						
							
							
								
								➖  removing <iomanip> header  
							
							
							
						 
						
							2017-12-16 12:37:25 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								261caec2de 
								
							 
						 
						
							
							
								
								👥  added contributor image  
							
							
							
						 
						
							2017-12-14 22:29:39 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								c6e7eae394 
								
							 
						 
						
							
							
								
								✨  implemented JSON Merge Patch (RFC 7396)  
							
							... 
							
							
							
							SQLite's json1 extension (https://www.sqlite.org/json1.html ) supports JSON Merge Patch (https://tools.ietf.org/html/rfc7396 ). As the implementation is trivial and we already support JSON Patch, I think this could be a nice extension to the library. 
							
						 
						
							2017-12-13 23:36:22 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								61cc07ff38 
								
							 
						 
						
							
							
								
								📝  some documentation  
							
							
							
						 
						
							2017-10-27 16:07:04 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Nate Vargas 
								
							 
						 
						
							
							
							
							
								
							
							
								727ee7d03e 
								
							 
						 
						
							
							
								
								Set GENERATE_TAGFILE in Doxyfile  
							
							... 
							
							
							
							Allows documentation to be linked from other projects to https://nlohmann.github.io/json  using Doxygen with the tag:
TAGFILES = $(SOME_PATH)/nlohmann_json.tag=https://nlohmann.github.io/json  
							
						 
						
							2017-10-14 19:06:38 -05:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								1a66527dca 
								
							 
						 
						
							
							
								
								📝  fixed documentation  #745  
							
							
							
						 
						
							2017-09-30 10:18:18 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								c607b5c2ac 
								
							 
						 
						
							
							
								
								📝  improved documentation  
							
							
							
						 
						
							2017-09-06 17:14:06 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								91e0032853 
								
							 
						 
						
							
							
								
								📝  improved documentation  
							
							
							
						 
						
							2017-08-29 23:46:26 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								72afe53fa0 
								
							 
						 
						
							
							
								
								📝  updated documentation for update() function  #661  
							
							
							
						 
						
							2017-08-15 21:42:50 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								c819a2d732 
								
							 
						 
						
							
							
								
								🔨  refactored some scanner internals  
							
							
							
						 
						
							2017-07-28 19:18:50 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								504012a3db 
								
							 
						 
						
							
							
								
								📝  cleanup after  #650  
							
							... 
							
							
							
							As <iostream> is not included in json.hpp any more, all code examples need to include <iostream> now. 
							
						 
						
							2017-07-09 11:51:38 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								f697fec522 
								
							 
						 
						
							
							
								
								📝  fixed documentation  
							
							... 
							
							
							
							There was an issue in the documentation example before. Unfortunately, I did not recreate the example outputs. 
							
						 
						
							2017-07-08 22:16:45 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Chocobo1 
								
							 
						 
						
							
							
							
							
								
							
							
								0395f3fdfb 
								
							 
						 
						
							
							
								
								fix typo  
							
							
							
						 
						
							2017-06-21 21:41:34 +08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								0c3ffe12cd 
								
							 
						 
						
							
							
								
								⏪  reverting first/second experiment  #350  
							
							
							
						 
						
							2017-05-15 21:07:58 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								962da00171 
								
							 
						 
						
							
							
								
								✨  implemented an indentation character  #520  
							
							... 
							
							
							
							An optional parameter for dump() allows to set the character to use for
indentation (default: space). In case a JSON value is serialized to an
output stream, its fill character is used (and can be set with
std::setfill). 
							
						 
						
							2017-05-07 19:27:40 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								ecf895f2d1 
								
							 
						 
						
							
							
								
								📝  mentioned value function on main doc page  #570  
							
							
							
						 
						
							2017-05-05 16:42:22 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								c42273d2a0 
								
							 
						 
						
							
							
								
								📝  fixed documentation  #565  
							
							... 
							
							
							
							The documentation mismatched the actual code. 
							
						 
						
							2017-04-23 21:46:30 +02:00