aboutsummaryrefslogtreecommitdiffhomepage
path: root/java/util/src/main/java/com/google/protobuf/util/JsonFormat.java
Commit message (Expand)AuthorAge
* Integrated internal changes from GoogleGravatar Adam Cozzette2017-12-01
* Integrated internal changes from GoogleGravatar Adam Cozzette2017-09-14
* Merge from Google internal for 3.4 releaseGravatar Jisi Liu2017-07-18
* Merge remote-tracking branch 'remotes/google/3.3.x' into merge-3.3-to-masterGravatar Adam Cozzette2017-04-27
|\
* | Fix error message for int64 parse error.Gravatar Anuraag Agrawal2017-04-03
| * Fix Java build.Gravatar Feng Xiao2017-03-29
| * Down-integrate from google3.Gravatar Feng Xiao2017-03-29
|/
* Don't expose gson exceptions in JsonFormat.Gravatar Feng Xiao2017-03-09
* Merge pull request #2394 from cwelton/formattingGravatar Feng Xiao2016-12-08
|\
| * oneOf fix for JsonFormat includingDefaultValueFieldsGravatar Caleb Welton2016-12-05
* | Integrated internal changes from GoogleGravatar Adam Cozzette2016-11-17
|/
* Integrate internal changesGravatar Bo Yang2016-10-10
* Allow the JsonFormat.Parser to ignore unknown fieldsGravatar Dave Protasowski2016-09-08
* Integrate from internal code base.Gravatar Feng Xiao2016-07-13
* added minified JSON formatting functionality with testGravatar chezRong2016-07-01
* Integrated internal changes from GoogleGravatar Adam Cozzette2016-06-29
* Merge branch 'master' of github.com:google/protobufGravatar Jisi Liu2016-03-30
|\
* | Integrate google internal changes.Gravatar Jisi Liu2016-03-30
| * Allow custom URLs for Any in JsonFormatGravatar Pradeep Gollakota2016-03-18
|/
* Down-integrate from internal code base.Gravatar Feng Xiao2015-12-11
* Merge Java util package to github.Gravatar Feng Xiao2015-08-25