aboutsummaryrefslogtreecommitdiff
path: root/java/util/src/main/java/com/google/protobuf/util/JsonFormat.java
Commit message (Expand)AuthorAgeFilesLines
* Down-integrate from google3.Josh Haberman2018-09-041-3/+3
* Merge master branch.Feng Xiao2018-08-081-4/+13
|\
| * Ignore unknown enum received in json when ignoreUnknownFields flag is set (#4...vijay-bhatt2018-07-301-4/+13
* | Down-integrate from google3.Feng Xiao2018-08-081-1/+1
|/
* Integrated internal changes from GoogleAdam Cozzette2017-12-011-11/+46
* Integrated internal changes from GoogleAdam Cozzette2017-09-141-1/+2
* Merge from Google internal for 3.4 releaseJisi Liu2017-07-181-1/+5
* Merge remote-tracking branch 'remotes/google/3.3.x' into merge-3.3-to-masterAdam Cozzette2017-04-271-77/+99
|\
| * Fix Java build.Feng Xiao2017-03-291-2/+3
| * Down-integrate from google3.Feng Xiao2017-03-291-77/+98
* | Fix error message for int64 parse error.Anuraag Agrawal2017-04-031-1/+1
|/
* Don't expose gson exceptions in JsonFormat.Feng Xiao2017-03-091-3/+18
* Merge pull request #2394 from cwelton/formattingFeng Xiao2016-12-081-6/+13
|\
| * oneOf fix for JsonFormat includingDefaultValueFieldsCaleb Welton2016-12-051-6/+13
* | Integrated internal changes from GoogleAdam Cozzette2016-11-171-11/+28
|/
* Integrate internal changesBo Yang2016-10-101-5/+10
* Allow the JsonFormat.Parser to ignore unknown fieldsDave Protasowski2016-09-081-6/+22
* Integrate from internal code base.Feng Xiao2016-07-131-15/+25
* added minified JSON formatting functionality with testchezRong2016-07-011-26/+101
* Integrated internal changes from GoogleAdam Cozzette2016-06-291-386/+329
* Merge branch 'master' of github.com:google/protobufJisi Liu2016-03-301-4/+3
|\
| * Allow custom URLs for Any in JsonFormatPradeep Gollakota2016-03-181-4/+3
* | Integrate google internal changes.Jisi Liu2016-03-301-4/+22
|/
* Down-integrate from internal code base.Feng Xiao2015-12-111-68/+158
* Merge Java util package to github.Feng Xiao2015-08-251-0/+1571