Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #2394 from cwelton/formatting | Feng Xiao | 2016-12-08 | 2 | -6/+30 |
|\ | | | | | oneOf fix for JsonFormat includingDefaultValueFields | ||||
| * | oneOf fix for JsonFormat includingDefaultValueFields | Caleb Welton | 2016-12-05 | 2 | -6/+30 |
| | | |||||
* | | Merge branch 'master' into down-integrate-with-msvc-fix | Adam Cozzette | 2016-11-17 | 1 | -5/+17 |
|\| | |||||
| * | Use latest maven-compiler-plugin (2.6.0) | Christopher Tubbs | 2016-11-04 | 1 | -5/+17 |
| | | | | | | | | | | | | * Uses build-helper-maven-plugin to add generated sources to the classpath * Fixes an issue building with newer versions of the maven-compiler-plugin (See https://issues.apache.org/jira/browse/MCOMPILER-240) | ||||
* | | Integrated internal changes from Google | Adam Cozzette | 2016-11-17 | 6 | -25/+80 |
|/ | |||||
* | Update version number. | Bo Yang | 2016-10-10 | 1 | -1/+1 |
| | |||||
* | Bump version number to 3.1.0-alpha-1. | Bo Yang | 2016-10-10 | 1 | -1/+1 |
| | |||||
* | Integrate internal changes | Bo Yang | 2016-10-10 | 6 | -159/+363 |
| | |||||
* | Fix gson dependency. | Bo Yang | 2016-09-21 | 1 | -1/+1 |
| | | | | 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 | 1 | -1/+1 |
|\ | |||||
| * | Bump version number to 3.0.2 | Jisi Liu | 2016-09-02 | 1 | -1/+1 |
| | | |||||
* | | Allow the JsonFormat.Parser to ignore unknown fields | Dave Protasowski | 2016-09-08 | 2 | -6/+38 |
|/ | | | | The default behaviour of throwing an exception remains | ||||
* | Bump version number for GA | Jisi Liu | 2016-07-25 | 1 | -1/+1 |
| | |||||
* | Update version number to 3.0.0-beta-4 | Feng Xiao | 2016-07-13 | 1 | -1/+1 |
| | |||||
* | Integrate from internal code base. | Feng Xiao | 2016-07-13 | 2 | -17/+45 |
| | |||||
* | added minified JSON formatting functionality with test | chezRong | 2016-07-01 | 2 | -26/+159 |
| | |||||
* | Integrated internal changes from Google | Adam Cozzette | 2016-06-29 | 10 | -1149/+1602 |
| | | | | This includes all internal changes from around May 20 to now. | ||||
* | Update version numbers for other languages | Jisi Liu | 2016-05-10 | 1 | -1/+1 |
| | |||||
* | 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 |