Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #3822 from mehrdada/update-benchmark-submodule | Jisi Liu | 2017-11-06 | 1 | -0/+0 |
|\ | |||||
| * | Update google/benchmark submodule to v1.2 | Mehrdad Afshari | 2017-10-30 | 1 | -0/+0 |
* | | Fix php well known type conformance tests (#3828) | Paul Yang | 2017-11-03 | 12 | -164/+520 |
* | | Merge pull request #3839 from thomasvl/message_equality | Thomas Van Lenten | 2017-11-03 | 1 | -3/+4 |
|\ \ | |||||
| * | | When comparing message, require them to have the same descriptor. | Thomas Van Lenten | 2017-11-03 | 1 | -3/+4 |
|/ / | |||||
* / | Fix merging with message-valued oneof | Jon Skeet | 2017-10-31 | 13 | -12/+417 |
|/ | |||||
* | Merge pull request #3817 from xuwei-k/joda-url | Feng Xiao | 2017-10-30 | 4 | -4/+4 |
|\ | |||||
| * | update joda-time javadoc url | xuwei-k | 2017-10-30 | 4 | -4/+4 |
|/ | |||||
* | Add parser settings WithXyz methods | Jon Skeet | 2017-10-28 | 1 | -0/+17 |
* | Add JsonParser setting to ignore unknown field values | Jon Skeet | 2017-10-28 | 4 | -7/+95 |
* | Merge pull request #3722 from timou/cmake-windows-clean | Jisi Liu | 2017-10-27 | 1 | -1/+20 |
|\ | |||||
| * | Sort MSVC warning suppressions | Tim Ebringer | 2017-10-21 | 1 | -1/+17 |
| * | Suppress VS2017 compiler/linker warnings | Tim Ebringer | 2017-10-06 | 1 | -1/+4 |
* | | Reserve unknown in Ruby (#3763) | Paul Yang | 2017-10-26 | 12 | -832/+2034 |
* | | Add missing files | Jisi Liu | 2017-10-26 | 1 | -0/+38 |
* | | Merge pull request #3804 from pherl/merge | Jisi Liu | 2017-10-26 | 3 | -2/+7 |
|\ \ | |||||
| * \ | Merge remote-tracking branch 'origin/3.4.x' into master | Jisi Liu | 2017-10-25 | 3 | -2/+7 |
| |\ \ | |||||
| | * \ | Merge pull request #3758 from spinorx/3.4.x | Jisi Liu | 2017-10-20 | 1 | -43/+2 |
| | |\ \ | |||||
| | | * | | Fix iOS cc_library build for protobuf. | Param Reddy | 2017-10-15 | 1 | -43/+2 |
| | * | | | Merge pull request #3578 from pherl/filedeprecation | Jisi Liu | 2017-10-18 | 4 | -2/+45 |
| | |\ \ \ | |||||
| | | * | | | Add TODO | Jisi Liu | 2017-08-31 | 1 | -0/+3 |
| | | * | | | Fix dist check | Jisi Liu | 2017-08-31 | 1 | -0/+1 |
| | | * | | | Add @Deprecated annotation support for proto file. | Jisi Liu | 2017-08-31 | 3 | -2/+41 |
| | * | | | | Merge pull request #3641 from drivehappy/3.4.x_clang_cleanup_3 | Jisi Liu | 2017-10-18 | 1 | -1/+1 |
| | |\ \ \ \ | | | |_|/ / | | |/| | | | |||||
| | | * | | | Clang warning cleanup for unused parameter. | drivehappy | 2017-09-14 | 1 | -1/+1 |
* | | | | | | Merge pull request #3791 from signalwerk/patch-1 | Adam Cozzette | 2017-10-26 | 1 | -1/+1 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| * | | | | | To be clear that we set a new variable | Stefan Huber | 2017-10-24 | 1 | -1/+1 |
* | | | | | | Merge pull request #3787 from sergiocampama/coverage | Thomas Van Lenten | 2017-10-24 | 5 | -85/+182 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| * | | | | | Improves coverage of GPBCodedInputStream | Sergio Campama | 2017-10-24 | 5 | -85/+182 |
|/ / / / / | |||||
* | | | | | Merge pull request #3757 from spinorx/master | Jisi Liu | 2017-10-20 | 1 | -43/+2 |
|\ \ \ \ \ | |||||
| * | | | | | Fix iOS cc_library build for protobuf. | Param Reddy | 2017-10-15 | 1 | -43/+2 |
* | | | | | | Merge pull request #3743 from Schtolc/master | Jisi Liu | 2017-10-19 | 1 | -3/+3 |
|\ \ \ \ \ \ | |||||
| * | | | | | | CodedInputStream::SetTotalBytesLimit description fix | Pavel | 2017-10-12 | 1 | -3/+3 |
* | | | | | | | Merge pull request #3754 from toanju/gcc-fallthrough | Jisi Liu | 2017-10-19 | 1 | -0/+2 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | fix implicit fallthrough in gcc 7 | Tobias Jungel | 2017-10-15 | 1 | -0/+2 |
| | |/ / / / / | |/| | | | | | |||||
* | | | | | | | Merge pull request #3770 from pherl/3.5-integrate | Jisi Liu | 2017-10-19 | 114 | -3115/+3684 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Fix Java 1.6 compile | Jisi Liu | 2017-10-18 | 1 | -2/+2 |
| * | | | | | | | Fix JS conformance tests | Jisi Liu | 2017-10-18 | 1 | -6/+0 |
| * | | | | | | | Fix bazel build | Jisi Liu | 2017-10-18 | 2 | -4/+3 |
| * | | | | | | | Update descriptor protos | Jisi Liu | 2017-10-18 | 4 | -4/+20 |
| * | | | | | | | Merge branch 'master' of github.com:google/protobuf | Jisi Liu | 2017-10-18 | 1 | -13/+21 |
| |\ \ \ \ \ \ \ | |||||
| * | | | | | | | | Merge from google internal | Jisi Liu | 2017-10-18 | 107 | -3101/+3661 |
* | | | | | | | | | Merge pull request #3751 from uykusuz/master | Jisi Liu | 2017-10-18 | 1 | -0/+4 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | fixes issue #3750 | Boris Broenner | 2017-10-14 | 1 | -0/+4 |
| | |_|/ / / / / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge pull request #3764 from zearen/patch-1 | Jisi Liu | 2017-10-18 | 1 | -0/+1 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Update third_party.md | Zearen Wover | 2017-10-09 | 1 | -0/+1 |
| | |_|_|_|_|_|_|/ | |/| | | | | | | | |||||
* | | | | | | | | | Merge pull request #3698 from hesmar/hesmar/fixProtocIncludeDirs | Jisi Liu | 2017-10-18 | 1 | -15/+15 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | protobuf_generate: create include path only for proto files | Markus Heß | 2017-09-29 | 1 | -15/+15 |
* | | | | | | | | | | Merge pull request #3706 from johanbrandhorst/patch-1 | Jisi Liu | 2017-10-18 | 1 | -0/+2 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Add GopherJS protobuf and gRPC links | Johan Brandhorst | 2017-10-02 | 1 | -0/+2 |
| |/ / / / / / / / / |