Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Update version number to 3.0.0-beta-4 | Feng Xiao | 2016-07-13 | 4 | -4/+4 |
| | |||||
* | Integrate from internal code base. | Feng Xiao | 2016-07-13 | 6 | -18/+143 |
| | |||||
* | Fix spelling in strings and comments | Otto Kekäläinen | 2016-07-03 | 6 | -29/+29 |
| | |||||
* | added minified JSON formatting functionality with test | chezRong | 2016-07-01 | 2 | -26/+159 |
| | |||||
* | Integrated internal changes from Google | Adam Cozzette | 2016-06-29 | 58 | -3184/+7118 |
| | | | | This includes all internal changes from around May 20 to now. | ||||
* | Describe platform requirements for the compatibility tests. | Feng Xiao | 2016-05-20 | 1 | -0/+4 |
| | |||||
* | Add compatiblity tests against v2.5.0 | Feng Xiao | 2016-05-17 | 78 | -0/+19517 |
| | |||||
* | Merge pull request #1542 from google/beta-3 | Jisi Liu | 2016-05-16 | 4 | -4/+4 |
|\ | | | | | Merge Beta 3 release branch into master | ||||
| * | Update version numbers for other languages | Jisi Liu | 2016-05-10 | 3 | -3/+3 |
| | | |||||
| * | Update version numbers for beta3 | Jisi Liu | 2016-05-10 | 1 | -1/+1 |
| | | |||||
* | | Add compatibility notice for Java. | Feng Xiao | 2016-05-11 | 1 | -30/+55 |
|/ | |||||
* | Remove accidentally restored deleted files. | Jisi Liu | 2016-05-06 | 6 | -1492/+0 |
| | |||||
* | Merge branch 'master' of github.com:google/protobuf | Jisi Liu | 2016-04-28 | 1 | -0/+2 |
|\ | |||||
| * | Added serialVersionUID to ExtendableMessage. | Jakub Kukul | 2016-04-22 | 1 | -0/+2 |
| | | |||||
* | | Down integrate from Google internal. | Jisi Liu | 2016-04-28 | 72 | -2094/+7518 |
|/ | |||||
* | 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 | 67 | -1981/+5575 |
|/ | |||||
* | Remove redundant `the` in comments. | Dongjoon Hyun | 2016-02-03 | 2 | -2/+2 |
| | |||||
* | Restore the license for Internal.java | Jisi Liu | 2016-01-29 | 1 | -1/+29 |
| | |||||
* | Uncomment the test, which was commented out during integration | Jisi Liu | 2016-01-29 | 1 | -185/+184 |
| | |||||
* | Integrate from google internal. | Jisi Liu | 2016-01-29 | 144 | -741/+660 |
| | | | | | Java files are moved to un-do the hack in the prevous commit, which moved the java files to the original position for integration. | ||||
* | Undo the Java module change for integration. | Jisi Liu | 2016-01-28 | 141 | -0/+0 |
| | | | | | | | | | Moving the files to their original location, so that opensource changes can be picked during the internal merge. Those files will be moved into the correct location after merging with internal code. Note: do NOT merge this into master without the other internal down-integration commit. | ||||
* | move test file (was in wrong place after rebasing on java module refactor) | Joshua Humphries | 2016-01-15 | 1 | -0/+0 |
| | |||||
* | throw IOException instead of InvalidProtocolBufferException when appropriate | Joshua Humphries | 2016-01-15 | 4 | -4/+291 |
| | |||||
* | Restructuring protobuf to multiple modules | nmittler | 2016-01-13 | 146 | -432/+516 |
| | | | | | | | | | 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 | 2 | -5/+5 |
| | |||||
* | 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 | 44 | -854/+2388 |
| | |||||
* | Fix typo in LazyField javadoc | Dave Hughes | 2015-11-24 | 1 | -2/+2 |
| | | | "equals".equals("euqals") == false | ||||
* | include plugin.proto and generated code in protobuf-java | Joshua Humphries | 2015-11-05 | 1 | -0/+2 |
| | |||||
* | Revert unwanted changes. | Jisi Liu | 2015-10-06 | 1 | -3/+3 |
| | |||||
* | Down-integrate from google internal. | Jisi Liu | 2015-10-05 | 9 | -362/+527 |
| | |||||
* | Fix javadoc errors. | Feng Xiao | 2015-08-27 | 4 | -24/+25 |
| | |||||
* | Update version number. | Feng Xiao | 2015-08-26 | 2 | -5/+5 |
| | | | | | Protoc, C++ runtime and Java runtime are updated to v3.0.0-beta-1, other languages are updated to v3.0.0-alpha-4. | ||||
* | Delete incorrectly placed test file. | Feng Xiao | 2015-08-25 | 1 | -132/+0 |
| | |||||
* | Merge Java util package to github. | Feng Xiao | 2015-08-25 | 10 | -0/+4736 |
| | |||||
* | Cherry-pick Java utf8 change. | Feng Xiao | 2015-08-24 | 2 | -1/+144 |
| | |||||
* | Down-integrate from internal code base. | Feng Xiao | 2015-08-23 | 3 | -0/+135 |
| | |||||
* | Down-integrate from google3. | Feng Xiao | 2015-08-22 | 32 | -247/+882 |
| | |||||
* | Down-integrate from internal branch. | Jisi Liu | 2015-08-21 | 1 | -0/+1 |
| | | | | Change-Id: Ieb7a2c2fbf35bc2a8fa65b915a5ecb68c83863e4 | ||||
* | Add distributionManagement explicitly to prevent maven from using | Bo Yang | 2015-05-29 | 1 | -0/+10 |
| | | | | | default configuration. In default configuration, maven needs webdav for deployment, which cannot be found in central repository. | ||||
* | Update version number to 3.0.0-alpha-4 | Bo Yang | 2015-05-29 | 1 | -1/+1 |
| | |||||
* | Update version number to 3.0.0-alpha-3 | teboring | 2015-05-23 | 1 | -2/+2 |
| | |||||
* | Merge pull request #413 from TeBoring/master | Paul Yang | 2015-05-21 | 33 | -202/+7141 |
|\ | | | | | down-integrate internal changes | ||||
| * | down-integrate internal changes | Bo Yang | 2015-05-21 | 33 | -202/+7141 |
| | | |||||
* | | Include well-known types in Java runtime. | Feng Xiao | 2015-05-21 | 2 | -0/+94 |
|/ | | | | Change-Id: I816fe2fac7fccbcd96dd8510c7c9b5e7996aeadc | ||||
* | Clean up imports | Tamir Duberstein | 2015-04-02 | 8 | -27/+16 |
| |