Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Bump version number to 3.1.0-alpha-1. | Bo Yang | 2016-10-10 |
| | |||
* | Integrate internal changes | Bo Yang | 2016-10-10 |
| | |||
* | Fix gson dependency. | Bo Yang | 2016-09-21 |
| | | | | gson 2.3 has internal bug that it doesn't work with some versions of maven. | ||
* | Merge remote-tracking branch 'origin/3.0.x' into merge | Jisi Liu | 2016-09-14 |
|\ | |||
* | | Allow the JsonFormat.Parser to ignore unknown fields | Dave Protasowski | 2016-09-08 |
| | | | | | | | | The default behaviour of throwing an exception remains | ||
| * | Bump version number to 3.0.2 | Jisi Liu | 2016-09-02 |
|/ | |||
* | Bump version number for GA | Jisi Liu | 2016-07-25 |
| | |||
* | Update version number to 3.0.0-beta-4 | Feng Xiao | 2016-07-13 |
| | |||
* | Integrate from internal code base. | Feng Xiao | 2016-07-13 |
| | |||
* | added minified JSON formatting functionality with test | chezRong | 2016-07-01 |
| | |||
* | Integrated internal changes from Google | Adam Cozzette | 2016-06-29 |
| | | | | This includes all internal changes from around May 20 to now. | ||
* | Update version numbers for other languages | Jisi Liu | 2016-05-10 |
| | |||
* | Down integrate from Google internal. | Jisi Liu | 2016-04-28 |
| | |||
* | Merge branch 'master' of github.com:google/protobuf | Jisi Liu | 2016-03-30 |
|\ | |||
* | | Integrate google internal changes. | Jisi Liu | 2016-03-30 |
| | | |||
| * | Allow custom URLs for Any in JsonFormat | Pradeep Gollakota | 2016-03-18 |
|/ | | | | | | - Using custom URL for types in Any will no longer throw an InvalidProtocolBufferException in JsonFormat - Fixes #1128 | ||
* | Restructuring protobuf to multiple modules | nmittler | 2016-01-13 |
| | | | | | | | | | protobuf/java will become a parent pom that will contain two modules: core - contains all of the code for the protobuf-java artifact util - contains all of the code for the protobuf-java-util artifact Also cleaned up various Maven warnings. | ||
* | Update version number and fix javadoc errors. | Feng Xiao | 2016-01-06 |
| | |||
* | Fix Java travis tests. | Feng Xiao | 2015-12-21 |
| | |||
* | Make conformance tests build for C++ and Java. | Feng Xiao | 2015-12-16 |
| | | | | Change-Id: Ibb3fe6f919cc7ca0df91da5e1697ba33d259e433 | ||
* | Remove internal options from proto files. | Feng Xiao | 2015-12-14 |
| | | | | Change-Id: I3daf32cb93dfe0fca38f8b48615ccfc307f748e9 | ||
* | Down-integrate from internal code base. | Feng Xiao | 2015-12-11 |
| | |||
* | Update version number. | Feng Xiao | 2015-08-26 |
| | | | | | Protoc, C++ runtime and Java runtime are updated to v3.0.0-beta-1, other languages are updated to v3.0.0-alpha-4. | ||
* | Merge Java util package to github. | Feng Xiao | 2015-08-25 |