Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | fix typo in FieldMaskTree.java comment | 2018-01-22 | |
| | |||
* | Integrated internal changes from Google | 2017-12-01 | |
| | |||
* | Merge from google internal | 2017-10-18 | |
| | |||
* | Integrated internal changes from Google | 2017-09-14 | |
| | |||
* | Remove dependency on guava 20 | 2017-07-25 | |
| | |||
* | Merge from Google internal for 3.4 release | 2017-07-18 | |
| | |||
* | Merge remote-tracking branch 'remotes/google/3.3.x' into merge-3.3-to-master | 2017-04-27 | |
|\ | |||
* | | Fix error message for int64 parse error. | 2017-04-03 | |
| | | |||
| * | Fix Java build. | 2017-03-29 | |
| | | |||
| * | Down-integrate from google3. | 2017-03-29 | |
|/ | |||
* | Merge pull request #2818 from xfxyjwf/i1470 | 2017-03-10 | |
|\ | | | | | Don't expose gson exceptions in JsonFormat. | ||
| * | Don't expose gson exceptions in JsonFormat. | 2017-03-09 | |
| | | |||
* | | Make JsonFormat locale independent. | 2017-03-08 | |
|/ | |||
* | Merge pull request #2394 from cwelton/formatting | 2016-12-08 | |
|\ | | | | | oneOf fix for JsonFormat includingDefaultValueFields | ||
| * | oneOf fix for JsonFormat includingDefaultValueFields | 2016-12-05 | |
| | | |||
* | | Integrated internal changes from Google | 2016-11-17 | |
|/ | |||
* | Integrate internal changes | 2016-10-10 | |
| | |||
* | Allow the JsonFormat.Parser to ignore unknown fields | 2016-09-08 | |
| | | | | The default behaviour of throwing an exception remains | ||
* | Integrate from internal code base. | 2016-07-13 | |
| | |||
* | added minified JSON formatting functionality with test | 2016-07-01 | |
| | |||
* | Integrated internal changes from Google | 2016-06-29 | |
| | | | | This includes all internal changes from around May 20 to now. | ||
* | Down integrate from Google internal. | 2016-04-28 | |
| | |||
* | Merge branch 'master' of github.com:google/protobuf | 2016-03-30 | |
|\ | |||
* | | Integrate google internal changes. | 2016-03-30 | |
| | | |||
| * | Allow custom URLs for Any in JsonFormat | 2016-03-18 | |
|/ | | | | | | - Using custom URL for types in Any will no longer throw an InvalidProtocolBufferException in JsonFormat - Fixes #1128 | ||
* | Update version number and fix javadoc errors. | 2016-01-06 | |
| | |||
* | Down-integrate from internal code base. | 2015-12-11 | |
| | |||
* | Merge Java util package to github. | 2015-08-25 | |