aboutsummaryrefslogtreecommitdiffhomepage
path: root/java/util
Commit message (Expand)AuthorAge
* Down-integrate from google3.Gravatar Feng Xiao2017-03-29
* Remove duplicated copyright statementGravatar prehistoric-penguin2017-03-16
* Merge pull request #2818 from xfxyjwf/i1470Gravatar Feng Xiao2017-03-10
|\
| * Don't expose gson exceptions in JsonFormat.Gravatar Feng Xiao2017-03-09
* | Make JsonFormat locale independent.Gravatar Feng Xiao2017-03-08
|/
* Merge 3.2.x branch into master (#2648)Gravatar Paul Yang2017-01-31
* Merge pull request #2394 from cwelton/formattingGravatar Feng Xiao2016-12-08
|\
| * oneOf fix for JsonFormat includingDefaultValueFieldsGravatar Caleb Welton2016-12-05
* | Merge branch 'master' into down-integrate-with-msvc-fixGravatar Adam Cozzette2016-11-17
|\|
* | Integrated internal changes from GoogleGravatar Adam Cozzette2016-11-17
| * Use latest maven-compiler-plugin (2.6.0)Gravatar Christopher Tubbs2016-11-04
|/
* Update version number.Gravatar Bo Yang2016-10-10
* Bump version number to 3.1.0-alpha-1.Gravatar Bo Yang2016-10-10
* Integrate internal changesGravatar Bo Yang2016-10-10
* Fix gson dependency.Gravatar Bo Yang2016-09-21
* Merge remote-tracking branch 'origin/3.0.x' into mergeGravatar Jisi Liu2016-09-14
|\
* | Allow the JsonFormat.Parser to ignore unknown fieldsGravatar Dave Protasowski2016-09-08
| * Bump version number to 3.0.2Gravatar Jisi Liu2016-09-02
|/
* Bump version number for GAGravatar Jisi Liu2016-07-25
* Update version number to 3.0.0-beta-4Gravatar Feng Xiao2016-07-13
* 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
* Update version numbers for other languagesGravatar Jisi Liu2016-05-10
* Down integrate from Google internal.Gravatar Jisi Liu2016-04-28
* 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
|/
* Restructuring protobuf to multiple modulesGravatar nmittler2016-01-13
* Update version number and fix javadoc errors.Gravatar Feng Xiao2016-01-06
* Fix Java travis tests.Gravatar Feng Xiao2015-12-21
* Make conformance tests build for C++ and Java.Gravatar Feng Xiao2015-12-16
* Remove internal options from proto files.Gravatar Feng Xiao2015-12-14
* Down-integrate from internal code base.Gravatar Feng Xiao2015-12-11
* Update version number.Gravatar Feng Xiao2015-08-26
* Merge Java util package to github.Gravatar Feng Xiao2015-08-25