aboutsummaryrefslogtreecommitdiffhomepage
path: root/java
Commit message (Expand)AuthorAge
* Merge branch 'master' of github.com:google/protobufGravatar Jisi Liu2016-04-28
|\
* | Down integrate from Google internal.Gravatar Jisi Liu2016-04-28
| * Added serialVersionUID to ExtendableMessage.Gravatar Jakub Kukul2016-04-22
|/
* Merge branch 'master' of github.com:google/protobufGravatar Jisi Liu2016-03-30
|\
* | Integrate google internal changes.Gravatar Jisi Liu2016-03-30
| * Allow custom URLs for Any in JsonFormatGravatar Pradeep Gollakota2016-03-18
|/
* Remove redundant `the` in comments.Gravatar Dongjoon Hyun2016-02-03
* Restore the license for Internal.javaGravatar Jisi Liu2016-01-29
* Uncomment the test, which was commented out during integrationGravatar Jisi Liu2016-01-29
* Integrate from google internal.Gravatar Jisi Liu2016-01-29
* Undo the Java module change for integration.Gravatar Jisi Liu2016-01-28
* move test file (was in wrong place after rebasing on java module refactor)Gravatar Joshua Humphries2016-01-15
* throw IOException instead of InvalidProtocolBufferException when appropriateGravatar Joshua Humphries2016-01-15
* Restructuring protobuf to multiple modulesGravatar nmittler2016-01-13
* Update version number and fix javadoc errors.Gravatar Feng Xiao2016-01-06
* Fix Java travis tests.Gravatar Feng Xiao2015-12-21
* Make conformance tests build for C++ and Java.Gravatar Feng Xiao2015-12-16
* Remove internal options from proto files.Gravatar Feng Xiao2015-12-14
* Down-integrate from internal code base.Gravatar Feng Xiao2015-12-11
* Fix typo in LazyField javadocGravatar Dave Hughes2015-11-24
* include plugin.proto and generated code in protobuf-javaGravatar Joshua Humphries2015-11-05
* Revert unwanted changes.Gravatar Jisi Liu2015-10-06
* Down-integrate from google internal.Gravatar Jisi Liu2015-10-05
* Fix javadoc errors.Gravatar Feng Xiao2015-08-27
* Update version number.Gravatar Feng Xiao2015-08-26
* Delete incorrectly placed test file.Gravatar Feng Xiao2015-08-25
* Merge Java util package to github.Gravatar Feng Xiao2015-08-25
* Cherry-pick Java utf8 change.Gravatar Feng Xiao2015-08-24
* Down-integrate from internal code base.Gravatar Feng Xiao2015-08-23
* Down-integrate from google3.Gravatar Feng Xiao2015-08-22
* Down-integrate from internal branch.Gravatar Jisi Liu2015-08-21
* Add distributionManagement explicitly to prevent maven from usingGravatar Bo Yang2015-05-29
* Update version number to 3.0.0-alpha-4Gravatar Bo Yang2015-05-29
* Update version number to 3.0.0-alpha-3Gravatar teboring2015-05-23
* Merge pull request #413 from TeBoring/masterGravatar Paul Yang2015-05-21
|\
| * down-integrate internal changesGravatar Bo Yang2015-05-21
* | Include well-known types in Java runtime.Gravatar Feng Xiao2015-05-21
|/
* Clean up importsGravatar Tamir Duberstein2015-04-02
* Move `UTF_8` to `Internal`Gravatar Tamir Duberstein2015-04-02
* Skip 3-byte test in CIGravatar Tamir Duberstein2015-04-02
* DRY: Use `Charset` statics to eliminate exceptionsGravatar Tamir Duberstein2015-04-02
* perf: String#getBytes(Charset) vs getBytes(String)Gravatar Viktor Szathmáry2015-04-02
* WhitespaceGravatar Tamir Duberstein2015-04-02
* rename python README, and fix markdown in java and python respectivelyGravatar jesse2015-03-16
* Rename README.txt to README.mdGravatar Jesse Frankley2015-03-16
* Merge pull request #225 from google/post-alpha2-integrateGravatar Jisi Liu2015-03-03
|\
* \ Merge "Add a release profile for Java mvn project, which includes source file...Gravatar Jisi Liu2015-03-04
|\ \
| * | Add a release profile for Java mvn project, which includes source file,Gravatar Jisi Liu2015-03-03
* | | Bump the version number to 3.0.0-alpha-3-preGravatar Jisi Liu2015-03-02
| | * Down integrate from Google internal branch for C++ and Java.Gravatar Jisi Liu2015-02-28
| |/ |/|