aboutsummaryrefslogtreecommitdiff
path: root/java/util/src/main
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #2818 from xfxyjwf/i1470Feng Xiao2017-03-101-3/+18
|\ | | | | Don't expose gson exceptions in JsonFormat.
| * Don't expose gson exceptions in JsonFormat.Feng Xiao2017-03-091-3/+18
| |
* | Make JsonFormat locale independent.Feng Xiao2017-03-081-4/+5
|/
* Merge pull request #2394 from cwelton/formattingFeng Xiao2016-12-081-6/+13
|\ | | | | oneOf fix for JsonFormat includingDefaultValueFields
| * oneOf fix for JsonFormat includingDefaultValueFieldsCaleb Welton2016-12-051-6/+13
| |
* | Integrated internal changes from GoogleAdam Cozzette2016-11-174-24/+38
|/
* Integrate internal changesBo Yang2016-10-103-149/+255
|
* Allow the JsonFormat.Parser to ignore unknown fieldsDave Protasowski2016-09-081-6/+22
| | | | The default behaviour of throwing an exception remains
* 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-296-697/+1130
| | | | This includes all internal changes from around May 20 to now.
* Down integrate from Google internal.Jisi Liu2016-04-282-9/+42
|
* 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
| | | | | | | | | | | | - Using custom URL for types in Any will no longer throw an InvalidProtocolBufferException in JsonFormat - Fixes #1128
* | Integrate google internal changes.Jisi Liu2016-03-302-35/+66
|/
* Update version number and fix javadoc errors.Feng Xiao2016-01-061-2/+2
|
* Down-integrate from internal code base.Feng Xiao2015-12-113-80/+237
|
* Merge Java util package to github.Feng Xiao2015-08-254-0/+2597