aboutsummaryrefslogtreecommitdiff
path: root/src/google/protobuf/util/json_util_test.cc
Commit message (Expand)AuthorAgeFilesLines
* Down-integrate from google3.Feng Xiao2017-03-291-14/+6
* Merge pull request #2867 from mojoBrendan/masterFeng Xiao2017-03-171-0/+37
|\
| * Add option to preserve original proto field namesBrendan McCarthy2017-03-171-0/+37
* | DefaultValueObjectWriter should populate oneof message fieldJie Luo2017-03-101-0/+16
|/
* Remove the use of C++11 features.Feng Xiao2017-02-271-6/+6
* Add an option to always print enums as ints in Json APISanchay Harneja2017-02-181-0/+23
* JsonUtilTest: Add ParsePrimitiveMapIn subtestKonstantin Podsvirov2017-02-111-1/+14
* Integrated internal changes from GoogleAdam Cozzette2016-11-171-4/+4
* detect invaild JSON encoding in bytes fieldmike070262016-09-011-23/+23
* detect invaild JSON encoding in bytes fieldmike070262016-09-011-0/+28
* Integrate from internal code base.Feng Xiao2016-07-131-13/+47
* Add JsonParseOptions to ignore unknown fieldsLizan Zhou2016-06-281-12/+23
* Integrate google internal changes.Jisi Liu2016-03-301-24/+44
* Use static castHamdi Sahloul2015-10-091-1/+1
* VS2010 compatibility of address initalizationHamdi Sahloul2015-10-091-1/+1
* Merge remote-tracking branch 'origin/master' into beta-1Feng Xiao2015-08-261-0/+11
|\
| * Fix map fields parsing.Feng Xiao2015-08-111-0/+11
* | Down-integrate from google3.Feng Xiao2015-08-221-21/+22
|/
* Down-integrate from internal code base.Feng Xiao2015-06-151-0/+277