Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Down integrate from Google internal. | Jisi Liu | 2016-04-28 | 4 | -9/+71 |
| | |||||
* | 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 | 5 | -202/+294 |
|/ | |||||
* | Restructuring protobuf to multiple modules | nmittler | 2016-01-13 | 2 | -142/+47 |
| | | | | | | | | | 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 | 1 | -2/+2 |
| | |||||
* | Fix Java travis tests. | Feng Xiao | 2015-12-21 | 1 | -3/+3 |
| | |||||
* | Make conformance tests build for C++ and Java. | Feng Xiao | 2015-12-16 | 1 | -0/+8 |
| | | | | Change-Id: Ibb3fe6f919cc7ca0df91da5e1697ba33d259e433 | ||||
* | Remove internal options from proto files. | Feng Xiao | 2015-12-14 | 1 | -4/+4 |
| | | | | Change-Id: I3daf32cb93dfe0fca38f8b48615ccfc307f748e9 | ||||
* | Down-integrate from internal code base. | Feng Xiao | 2015-12-11 | 7 | -193/+649 |
| | |||||
* | Update version number. | Feng Xiao | 2015-08-26 | 1 | -3/+3 |
| | | | | | 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 | 10 | -0/+4736 |