aboutsummaryrefslogtreecommitdiff
path: root/java/util/src/main/java/com/google/protobuf/util
Commit message (Expand)AuthorAgeFilesLines
* fix typo in FieldMaskTree.java commentkenji yoshida2018-01-221-1/+1
* Integrated internal changes from GoogleAdam Cozzette2017-12-012-13/+55
* Merge from google internalJisi Liu2017-10-181-1/+5
* Integrated internal changes from GoogleAdam Cozzette2017-09-141-1/+2
* Remove dependency on guava 20Jisi Liu2017-07-252-14/+10
* Merge from Google internal for 3.4 releaseJisi Liu2017-07-184-4/+33
* Merge remote-tracking branch 'remotes/google/3.3.x' into merge-3.3-to-masterAdam Cozzette2017-04-272-78/+100
|\
| * Fix Java build.Feng Xiao2017-03-291-2/+3
| * Down-integrate from google3.Feng Xiao2017-03-292-78/+99
* | Fix error message for int64 parse error.Anuraag Agrawal2017-04-031-1/+1
|/
* Merge pull request #2818 from xfxyjwf/i1470Feng Xiao2017-03-101-3/+18
|\
| * 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 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
* 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
* 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
* | 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