Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #2818 from xfxyjwf/i1470 | Feng Xiao | 2017-03-10 | 1 | -3/+18 |
|\ | | | | | Don't expose gson exceptions in JsonFormat. | ||||
| * | Don't expose gson exceptions in JsonFormat. | Feng Xiao | 2017-03-09 | 1 | -3/+18 |
| | | |||||
* | | Make JsonFormat locale independent. | Feng Xiao | 2017-03-08 | 1 | -4/+5 |
|/ | |||||
* | Merge pull request #2394 from cwelton/formatting | Feng Xiao | 2016-12-08 | 1 | -6/+13 |
|\ | | | | | oneOf fix for JsonFormat includingDefaultValueFields | ||||
| * | oneOf fix for JsonFormat includingDefaultValueFields | Caleb Welton | 2016-12-05 | 1 | -6/+13 |
| | | |||||
* | | Integrated internal changes from Google | Adam Cozzette | 2016-11-17 | 4 | -24/+38 |
|/ | |||||
* | Integrate internal changes | Bo Yang | 2016-10-10 | 3 | -149/+255 |
| | |||||
* | Allow the JsonFormat.Parser to ignore unknown fields | Dave Protasowski | 2016-09-08 | 1 | -6/+22 |
| | | | | The default behaviour of throwing an exception remains | ||||
* | Integrate from internal code base. | Feng Xiao | 2016-07-13 | 1 | -15/+25 |
| | |||||
* | added minified JSON formatting functionality with test | chezRong | 2016-07-01 | 1 | -26/+101 |
| | |||||
* | Integrated internal changes from Google | Adam Cozzette | 2016-06-29 | 6 | -697/+1130 |
| | | | | This includes all internal changes from around May 20 to now. | ||||
* | Down integrate from Google internal. | Jisi Liu | 2016-04-28 | 2 | -9/+42 |
| | |||||
* | Merge branch 'master' of github.com:google/protobuf | Jisi Liu | 2016-03-30 | 1 | -4/+3 |
|\ | |||||
| * | Allow custom URLs for Any in JsonFormat | Pradeep Gollakota | 2016-03-18 | 1 | -4/+3 |
| | | | | | | | | | | | | - Using custom URL for types in Any will no longer throw an InvalidProtocolBufferException in JsonFormat - Fixes #1128 | ||||
* | | Integrate google internal changes. | Jisi Liu | 2016-03-30 | 2 | -35/+66 |
|/ | |||||
* | Update version number and fix javadoc errors. | Feng Xiao | 2016-01-06 | 1 | -2/+2 |
| | |||||
* | Down-integrate from internal code base. | Feng Xiao | 2015-12-11 | 3 | -80/+237 |
| | |||||
* | Merge Java util package to github. | Feng Xiao | 2015-08-25 | 4 | -0/+2597 |