Commit message (Collapse) | Author | Age | ||
---|---|---|---|---|
... | ||||
* | added minified JSON formatting functionality with test | 2016-07-01 | ||
| | ||||
* | Integrated internal changes from Google | 2016-06-29 | ||
| | | | | This includes all internal changes from around May 20 to now. | |||
* | Describe platform requirements for the compatibility tests. | 2016-05-20 | ||
| | ||||
* | Add compatiblity tests against v2.5.0 | 2016-05-17 | ||
| | ||||
* | Merge pull request #1542 from google/beta-3 | 2016-05-16 | ||
|\ | | | | | Merge Beta 3 release branch into master | |||
* | | Add compatibility notice for Java. | 2016-05-11 | ||
| | | ||||
| * | Update version numbers for other languages | 2016-05-10 | ||
| | | ||||
| * | Update version numbers for beta3 | 2016-05-10 | ||
|/ | ||||
* | Remove accidentally restored deleted files. | 2016-05-06 | ||
| | ||||
* | Merge branch 'master' of github.com:google/protobuf | 2016-04-28 | ||
|\ | ||||
* | | Down integrate from Google internal. | 2016-04-28 | ||
| | | ||||
| * | Added serialVersionUID to ExtendableMessage. | 2016-04-22 | ||
|/ | ||||
* | Merge branch 'master' of github.com:google/protobuf | 2016-03-30 | ||
|\ | ||||
* | | Integrate google internal changes. | 2016-03-30 | ||
| | | ||||
| * | Allow custom URLs for Any in JsonFormat | 2016-03-18 | ||
|/ | | | | | | - Using custom URL for types in Any will no longer throw an InvalidProtocolBufferException in JsonFormat - Fixes #1128 | |||
* | Remove redundant `the` in comments. | 2016-02-03 | ||
| | ||||
* | Restore the license for Internal.java | 2016-01-29 | ||
| | ||||
* | Uncomment the test, which was commented out during integration | 2016-01-29 | ||
| | ||||
* | Integrate from google internal. | 2016-01-29 | ||
| | | | | | 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. | 2016-01-28 | ||
| | | | | | | | | | 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) | 2016-01-15 | ||
| | ||||
* | throw IOException instead of InvalidProtocolBufferException when appropriate | 2016-01-15 | ||
| | ||||
* | Restructuring protobuf to multiple modules | 2016-01-13 | ||
| | | | | | | | | | 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. | 2016-01-06 | ||
| | ||||
* | Fix Java travis tests. | 2015-12-21 | ||
| | ||||
* | Make conformance tests build for C++ and Java. | 2015-12-16 | ||
| | | | | Change-Id: Ibb3fe6f919cc7ca0df91da5e1697ba33d259e433 | |||
* | Remove internal options from proto files. | 2015-12-14 | ||
| | | | | Change-Id: I3daf32cb93dfe0fca38f8b48615ccfc307f748e9 | |||
* | Down-integrate from internal code base. | 2015-12-11 | ||
| | ||||
* | Fix typo in LazyField javadoc | 2015-11-24 | ||
| | | | "equals".equals("euqals") == false | |||
* | include plugin.proto and generated code in protobuf-java | 2015-11-05 | ||
| | ||||
* | Revert unwanted changes. | 2015-10-06 | ||
| | ||||
* | Down-integrate from google internal. | 2015-10-05 | ||
| | ||||
* | Fix javadoc errors. | 2015-08-27 | ||
| | ||||
* | Update version number. | 2015-08-26 | ||
| | | | | | 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. | 2015-08-25 | ||
| | ||||
* | Merge Java util package to github. | 2015-08-25 | ||
| | ||||
* | Cherry-pick Java utf8 change. | 2015-08-24 | ||
| | ||||
* | Down-integrate from internal code base. | 2015-08-23 | ||
| | ||||
* | Down-integrate from google3. | 2015-08-22 | ||
| | ||||
* | Down-integrate from internal branch. | 2015-08-21 | ||
| | | | | Change-Id: Ieb7a2c2fbf35bc2a8fa65b915a5ecb68c83863e4 | |||
* | Add distributionManagement explicitly to prevent maven from using | 2015-05-29 | ||
| | | | | | 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 | 2015-05-29 | ||
| | ||||
* | Update version number to 3.0.0-alpha-3 | 2015-05-23 | ||
| | ||||
* | Merge pull request #413 from TeBoring/master | 2015-05-21 | ||
|\ | | | | | down-integrate internal changes | |||
| * | down-integrate internal changes | 2015-05-21 | ||
| | | ||||
* | | Include well-known types in Java runtime. | 2015-05-21 | ||
|/ | | | | Change-Id: I816fe2fac7fccbcd96dd8510c7c9b5e7996aeadc | |||
* | Clean up imports | 2015-04-02 | ||
| | ||||
* | Move `UTF_8` to `Internal` | 2015-04-02 | ||
| | ||||
* | Skip 3-byte test in CI | 2015-04-02 | ||
| | ||||
* | DRY: Use `Charset` statics to eliminate exceptions | 2015-04-02 | ||
| |