| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Down-integrate from google3. | Josh Haberman | 2018-09-04 | 2 | -30/+24 |
| | | |||||
| * | Merge master branch. | Feng Xiao | 2018-08-08 | 3 | -6/+64 |
| |\ | |||||
| | * | Fix typo in FieldMaskTree.java warning | Aleksej Kazmin | 2018-08-07 | 1 | -1/+1 |
| | | | |||||
| | * | Ignore unknown enum received in json when ignoreUnknownFields flag is set ↵ | vijay-bhatt | 2018-07-30 | 2 | -6/+63 |
| | | | | | | | | | | | (#4825) * Ignore unknown enum received in json when ignoreUnknownFields flag is set. | ||||
| * | | Down-integrate from google3. | Feng Xiao | 2018-08-08 | 6 | -54/+132 |
| |/ | |||||
| * | fix typo in FieldMaskTree.java comment | kenji yoshida | 2018-01-22 | 1 | -1/+1 |
| | | |||||
| * | Integrated internal changes from Google | Adam Cozzette | 2017-12-01 | 3 | -13/+70 |
| | | |||||
| * | Merge from google internal | Jisi Liu | 2017-10-18 | 2 | -2/+12 |
| | | |||||
| * | Integrated internal changes from Google | Adam Cozzette | 2017-09-14 | 1 | -1/+2 |
| | | |||||
| * | Remove dependency on guava 20 | Jisi Liu | 2017-07-25 | 2 | -14/+10 |
| | | |||||
| * | Merge from Google internal for 3.4 release | Jisi Liu | 2017-07-18 | 5 | -6/+35 |
| | | |||||
| * | Merge remote-tracking branch 'remotes/google/3.3.x' into merge-3.3-to-master | Adam Cozzette | 2017-04-27 | 3 | -89/+226 |
| |\ | |||||
| | * | Fix Java build. | Feng Xiao | 2017-03-29 | 2 | -3/+4 |
| | | | |||||
| | * | Down-integrate from google3. | Feng Xiao | 2017-03-29 | 3 | -89/+225 |
| | | | |||||
| * | | Allow unknown values for Map put*Value methods just like every other enum ↵ | Anuraag Agrawal | 2017-04-07 | 1 | -3/+1 |
| | | | | | | | | | mutation method. | ||||
| * | | Merge pull request #2937 from anuraaga/dev_rag2 | Adam Cozzette | 2017-04-06 | 1 | -5/+15 |
| |\ \ | | | | | | | Fix duplicate fields test and Any test. The repeated version is passing because nu… | ||||
| | * | | Fix test for unexpected type url when parsing Any. Currently, the test fails ↵ | Anuraag Agrawal | 2017-04-05 | 1 | -1/+1 |
| | | | | | | | | | | | | | since TestAllTypes doesn't have field '@type', which is the same test as testUnknownFields. | ||||
| | * | | Fix duplicate fields test. The repeated version is passing because null ↵ | Anuraag Agrawal | 2017-04-04 | 1 | -4/+14 |
| | |/ | | | | | | | | | | | values in a repeated field are rejected and not testing what it wanted to. Also adds a oneof version that verifies the case of oneof fields of different names (currently only same name check seems to be tested). Also fix spelling of a test. | ||||
| * / | Fix error message for int64 parse error. | Anuraag Agrawal | 2017-04-03 | 1 | -1/+1 |
| |/ | |||||
| * | Remove duplicated copyright statement | prehistoric-penguin | 2017-03-16 | 1 | -30/+0 |
| | | |||||
| * | Merge pull request #2818 from xfxyjwf/i1470 | Feng Xiao | 2017-03-10 | 2 | -3/+52 |
| |\ | | | | | Don't expose gson exceptions in JsonFormat. | ||||
| | * | Don't expose gson exceptions in JsonFormat. | Feng Xiao | 2017-03-09 | 2 | -3/+52 |
| | | | |||||
| * | | Make JsonFormat locale independent. | Feng Xiao | 2017-03-08 | 2 | -4/+11 |
| |/ | |||||
| * | 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 |
| | | | |||||
| * | | Integrated internal changes from Google | Adam Cozzette | 2016-11-17 | 6 | -25/+80 |
| |/ | |||||
| * | Integrate internal changes | Bo Yang | 2016-10-10 | 6 | -159/+363 |
| | | |||||
| * | Allow the JsonFormat.Parser to ignore unknown fields | Dave Protasowski | 2016-09-08 | 2 | -6/+38 |
| | | | | | The default behaviour of throwing an exception remains | ||||
| * | 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. | ||||
| * | 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 | 1 | -0/+0 |
| | | | | | | | | | | 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 |
| | | |||||
| * | 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 |
| | | |||||
| * | Merge Java util package to github. | Feng Xiao | 2015-08-25 | 9 | -0/+4534 |
 |
index : protobuf | |
| Protocol Buffers - Google's data interchange format |
| aboutsummaryrefslogtreecommitdiff |