aboutsummaryrefslogtreecommitdiff
path: root/src/google/protobuf/util/json_util.cc
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into fixbug_enum2json2stone47742018-03-221-4/+4
|\
| * Integrated internal changes from GoogleAdam Cozzette2018-03-131-4/+4
* | Fix bug: whether always_print_enums_as_ints is true or false, it always print...stone47742018-03-191-0/+2
|/
* formatting issuesUbuntu2017-12-201-1/+2
* resolve issue 4032 and added a unit testUbuntu2017-12-191-1/+2
* Fix undefined memory management found by Clang's sanitizers.John Millikin2017-10-161-3/+5
* Down-integrate from google3.Feng Xiao2017-03-291-3/+3
* Add option to preserve original proto field namesBrendan McCarthy2017-03-171-1/+4
* Add use_snake_case_for_field_names option to JsonPrintOptionsBrendan McCarthy2017-03-171-0/+1
* Merge pull request #2355 from xfxyjwf/fixjsonFeng Xiao2017-02-241-13/+16
|\
| * Speed up JSON parsing.Feng Xiao2016-11-101-13/+16
* | Add an option to always print enums as ints in Json APISanchay Harneja2017-02-181-0/+1
|/
* Integrate from internal code base.Feng Xiao2016-07-131-0/+60
* Add JsonParseOptions to ignore unknown fieldsLizan Zhou2016-06-281-6/+12
* Integrate google internal changes.Jisi Liu2016-03-301-2/+38
* Down-integrate from google internal.Jisi Liu2015-10-051-4/+2
* Down-integrate from internal code base.Feng Xiao2015-06-151-0/+142