Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
| | |||||
* | Move `UTF_8` to `Internal` | Tamir Duberstein | 2015-04-02 | 14 | -34/+33 |
| | |||||
* | Skip 3-byte test in CI | Tamir Duberstein | 2015-04-02 | 1 | -2/+5 |
| | |||||
* | DRY: Use `Charset` statics to eliminate exceptions | Tamir Duberstein | 2015-04-02 | 16 | -76/+51 |
| | |||||
* | perf: String#getBytes(Charset) vs getBytes(String) | Viktor Szathmáry | 2015-04-02 | 7 | -28/+117 |
| | |||||
* | Whitespace | Tamir Duberstein | 2015-04-02 | 12 | -86/+86 |
| | |||||
* | rename python README, and fix markdown in java and python respectively | jesse | 2015-03-16 | 1 | -1/+7 |
| | |||||
* | Rename README.txt to README.md | Jesse Frankley | 2015-03-16 | 1 | -0/+0 |
| | |||||
* | Merge pull request #225 from google/post-alpha2-integrate | Jisi Liu | 2015-03-03 | 27 | -210/+1011 |
|\ | | | | | Post alpha2 integrate from google internal for C++ and Java | ||||
| * | Down integrate from Google internal branch for C++ and Java. | Jisi Liu | 2015-02-28 | 27 | -210/+1011 |
| | | | | | | | | | | | | | | | | - Maps for C++ lite - C++ Arena optimizations. - Java Lite runtime code size optimization. Change-Id: I7537a4357c1cb385d23f9e8aa7ffdfeefe079f13 | ||||
* | | Merge "Add a release profile for Java mvn project, which includes source ↵ | Jisi Liu | 2015-03-04 | 1 | -0/+58 |
|\ \ | | | | | | | | | | file, javadoc packaging and signing." | ||||
| * | | Add a release profile for Java mvn project, which includes source file, | Jisi Liu | 2015-03-03 | 1 | -0/+58 |
| | | | | | | | | | | | | | | | | | | javadoc packaging and signing. Change-Id: I70632f01274b70e6f48dae5f4be15f123eb19a46 | ||||
* | | | Bump the version number to 3.0.0-alpha-3-pre | Jisi Liu | 2015-03-02 | 1 | -2/+2 |
| |/ |/| | | | | | Change-Id: I33479e529b060e4fed532a827a386d3baecc835e | ||||
* | | Merge pull request #216 from cnauroth/Parser-JavaDoc | Jisi Liu | 2015-02-26 | 1 | -2/+2 |
|\ \ | |/ |/| | Correct JavaDoc return value documentation for Parser#parseDelimitedFrom... | ||||
| * | Correct JavaDoc return value documentation for Parser#parseDelimitedFrom. | cnauroth | 2015-02-23 | 1 | -2/+2 |
| | | |||||
* | | Propogate onChange() event when getFooBuilder() is on an oneof message | Jisi Liu | 2015-02-23 | 1 | -1/+13 |
| | | | | | | | | | | | | field. Change-Id: Idb5b53da5accd24038a895aba49b684eeee95814 | ||||
* | | Fix Java maps reflection to call onChange to populate changes to parent | Jisi Liu | 2015-02-23 | 2 | -89/+132 |
| | | | | | | | | | | | | builders. Change-Id: Ibf6ae3c0fe6bc31f74b8018c81a5af461b1c24ea | ||||
* | | Update version number to 3.0.0-alpha-2 | Jisi Liu | 2015-02-21 | 1 | -2/+2 |
|/ | | | | Change-Id: Icecb25db34ae5e6d5142a2d75ca7216ba018abb2 | ||||
* | Update version number to v3.0.0-pre | Feng Xiao | 2014-12-10 | 1 | -2/+2 |
| | |||||
* | Down-integrate from internal code base. | Feng Xiao | 2014-12-09 | 2 | -1/+8 |
| | |||||
* | Remove usage of features not supported in Java 1.6. | Feng Xiao | 2014-12-03 | 1 | -3/+2 |
| | |||||
* | Update version number to v3.0.0-alpha-1 | Feng Xiao | 2014-12-03 | 1 | -2/+2 |
| | |||||
* | Explicitly list all Java lite runtime tests (and exclude those depending | Feng Xiao | 2014-12-02 | 1 | -2/+4 |
| | | | | TestUtil which transitively depend on the full runtime). | ||||
* | Merge pull request #102 from fizbin/bytestring_serializable | Feng Xiao | 2014-11-27 | 7 | -1/+90 |
|\ | | | | | Make ByteStrings serializable with java serialization. | ||||
| * | Add tests for other ByteString subclasses | Daniel Martin | 2014-11-27 | 2 | -0/+37 |
| | | |||||
| * | Make ByteStrings serializable with java serialization. | Daniel Martin | 2014-11-25 | 5 | -1/+53 |
| | | |||||
* | | Make Java TextFormat.printToUnicodeString() escape newlines. | Feng Xiao | 2014-11-25 | 2 | -6/+15 |
| | | | | | | | | Fix issue #77 | ||||
* | | Fix javadoc warnings. | Feng Xiao | 2014-11-25 | 2 | -14/+14 |
|/ | |||||
* | Down-integrate from internal code base. | Feng Xiao | 2014-11-20 | 3 | -22/+26 |
| | |||||
* | Down-integrate from internal code base (C++ maps support). | Feng Xiao | 2014-11-14 | 6 | -17/+49 |
| | |||||
* | Merge branch 'typofixes-vlajos-20141108' of ↵ | Feng Xiao | 2014-11-11 | 4 | -7/+7 |
|\ | | | | | | | | | | | | | https://github.com/vlajos/protobuf into typo Conflicts: src/google/protobuf/compiler/java/java_file.cc | ||||
| * | typo fixes - https://github.com/vlajos/misspell_fixer | Veres Lajos | 2014-11-08 | 4 | -7/+7 |
| | | |||||
* | | Down-integrate from internal code base. | Feng Xiao | 2014-11-10 | 56 | -291/+5365 |
|/ | |||||
* | Update version number to 2.6.2-pre. | Feng Xiao | 2014-10-21 | 1 | -2/+2 |
| | |||||
* | Update version number to 2.6.1.v2.6.1 | Feng Xiao | 2014-10-20 | 1 | -2/+2 |
| | |||||
* | Update version number to 2.6.1rc1 | Feng Xiao | 2014-10-08 | 1 | -2/+2 |
| | |||||
* | Merge pull request #38 from xfxyjwf/fix17 | Feng Xiao | 2014-10-03 | 2 | -3/+38 |
|\ | | | | | Fix a bug that causes DynamicMessage.setField() to not work for repeated enum fields. | ||||
| * | Update verification methods' names. | Feng Xiao | 2014-10-02 | 1 | -6/+8 |
| | | |||||
| * | Fix a bug that causes DynamicMessage.setField() to not work for repeated | Feng Xiao | 2014-10-01 | 2 | -2/+35 |
| | | | | | | | | enum fields. | ||||
* | | Fix descriptor validation logic for packed enum fields. | Feng Xiao | 2014-10-01 | 2 | -7/+34 |
|/ | |||||
* | Replace links to code.google.com/protobuf with ↵ | Feng Xiao | 2014-10-01 | 102 | -105/+105 |
| | | | | developers.google.com/protocol-buffers | ||||
* | Bump version for maven-bundle-plugin | Jisi Liu | 2014-09-04 | 1 | -1/+1 |
| | |||||
* | merge tags/2.6.0 into trunk | jieluo@google.com | 2014-08-25 | 1 | -1/+1 |
| |