Commit message (Expand) | Author | Age | |
---|---|---|---|
* | Merge pull request #3839 from thomasvl/message_equality | Thomas Van Lenten | 2017-11-03 |
|\ | |||
| * | When comparing message, require them to have the same descriptor. | Thomas Van Lenten | 2017-11-03 |
|/ | |||
* | Fix merging with message-valued oneof | Jon Skeet | 2017-10-31 |
* | Merge pull request #3817 from xuwei-k/joda-url | Feng Xiao | 2017-10-30 |
|\ | |||
| * | update joda-time javadoc url | xuwei-k | 2017-10-30 |
|/ | |||
* | Add parser settings WithXyz methods | Jon Skeet | 2017-10-28 |
* | Add JsonParser setting to ignore unknown field values | Jon Skeet | 2017-10-28 |
* | Merge pull request #3722 from timou/cmake-windows-clean | Jisi Liu | 2017-10-27 |
|\ | |||
* | | Reserve unknown in Ruby (#3763) | Paul Yang | 2017-10-26 |
* | | Add missing files | Jisi Liu | 2017-10-26 |
* | | Merge pull request #3804 from pherl/merge | Jisi Liu | 2017-10-26 |
|\ \ | |||
* \ \ | Merge pull request #3791 from signalwerk/patch-1 | Adam Cozzette | 2017-10-26 |
|\ \ \ | |||
| | * | | Merge remote-tracking branch 'origin/3.4.x' into master | Jisi Liu | 2017-10-25 |
| |/| | |/| | | | |||
* | | | | Merge pull request #3787 from sergiocampama/coverage | Thomas Van Lenten | 2017-10-24 |
|\ \ \ \ | |||
| * | | | | Improves coverage of GPBCodedInputStream | Sergio Campama | 2017-10-24 |
|/ / / / | |||
| * / / | To be clear that we set a new variable | Stefan Huber | 2017-10-24 |
|/ / / | |||
| | * | Sort MSVC warning suppressions | Tim Ebringer | 2017-10-21 |
| * | | Merge pull request #3758 from spinorx/3.4.x | Jisi Liu | 2017-10-20 |
| |\ \ | |||
* | \ \ | Merge pull request #3757 from spinorx/master | Jisi Liu | 2017-10-20 |
|\ \ \ \ | |||
* \ \ \ \ | Merge pull request #3743 from Schtolc/master | Jisi Liu | 2017-10-19 |
|\ \ \ \ \ | |||
* \ \ \ \ \ | Merge pull request #3754 from toanju/gcc-fallthrough | Jisi Liu | 2017-10-19 |
|\ \ \ \ \ \ | |||
* \ \ \ \ \ \ | Merge pull request #3770 from pherl/3.5-integrate | Jisi Liu | 2017-10-19 |
|\ \ \ \ \ \ \ | |||
| * | | | | | | | Fix Java 1.6 compile | Jisi Liu | 2017-10-18 |
* | | | | | | | | Merge pull request #3751 from uykusuz/master | Jisi Liu | 2017-10-18 |
|\ \ \ \ \ \ \ \ | |||
| | | | | | * \ \ | Merge pull request #3578 from pherl/filedeprecation | Jisi Liu | 2017-10-18 |
| | | | | | |\ \ \ | |||
* | | | | | | \ \ \ | Merge pull request #3764 from zearen/patch-1 | Jisi Liu | 2017-10-18 |
|\ \ \ \ \ \ \ \ \ \ | |||
* \ \ \ \ \ \ \ \ \ \ | Merge pull request #3698 from hesmar/hesmar/fixProtocIncludeDirs | Jisi Liu | 2017-10-18 |
|\ \ \ \ \ \ \ \ \ \ \ | |||
| | | | | | | | * \ \ \ | Merge pull request #3641 from drivehappy/3.4.x_clang_cleanup_3 | Jisi Liu | 2017-10-18 |
| | | | | | | | |\ \ \ \ | |||
* | | | | | | | | \ \ \ \ | Merge pull request #3706 from johanbrandhorst/patch-1 | Jisi Liu | 2017-10-18 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| | | | | * | | | | | | | | | Fix JS conformance tests | Jisi Liu | 2017-10-18 |
| | | | | * | | | | | | | | | Fix bazel build | Jisi Liu | 2017-10-18 |
| | | | | * | | | | | | | | | Update descriptor protos | Jisi Liu | 2017-10-18 |
* | | | | | | | | | | | | | | Merge pull request #3736 from jleni/fix_rbpi | Jisi Liu | 2017-10-18 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| | | | | | * \ \ \ \ \ \ \ \ | Merge branch 'master' of github.com:google/protobuf | Jisi Liu | 2017-10-18 |
| | | | | | |\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | | | | |||
| | | | | | * | | | | | | | | | Merge from google internal | Jisi Liu | 2017-10-18 |
* | | | | | | | | | | | | | | | Merge pull request #3769 from pherl/io_win32 | Jisi Liu | 2017-10-18 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | | | | |||
| * | | | | | | | | | | | | | | Fix unsiged underflow | Jisi Liu | 2017-10-18 |
| * | | | | | | | | | | | | | | Remove C++11 only usages in io_win32 tests. | Jisi Liu | 2017-10-18 |
|/ / / / / / / / / / / / / / | |||
* | | | | | | | | | | | | | | Merge pull request #3760 from jmillikin-stripe/descriptor-memset-ub | Feng Xiao | 2017-10-16 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | | | Fix undefined memory management found by Clang's sanitizers. | John Millikin | 2017-10-16 |
|/ / / / / / / / / / / / / / | |||
| | | | | | | | | | | | * / | Fix iOS cc_library build for protobuf. | Param Reddy | 2017-10-15 |
| | | | | | | | | | |_|/ / | | | | | | | | | |/| | | | |||
| | | | | | | | * / | | | | Fix iOS cc_library build for protobuf. | Param Reddy | 2017-10-15 |
| |_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | |||
| | | | | | * | | | | | | fix implicit fallthrough in gcc 7 | Tobias Jungel | 2017-10-15 |
| |_|_|_|_|/ / / / / / |/| | | | | | | | | | | |||
| | | | | * | | | | | | fixes issue #3750 | Boris Broenner | 2017-10-14 |
| |_|_|_|/ / / / / / |/| | | | | | | | | | |||
* | | | | | | | | | | Merge pull request #3744 from fmarier/json-escaping-namespace | Jisi Liu | 2017-10-13 |
|\ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | Move namespace closing brace inside the header guard block | Francois Marier | 2017-10-12 |
|/ / / / / / / / / / | |||
* | | | | | | | | | | Merge pull request #3739 from pherl/merge3.4 | Jisi Liu | 2017-10-12 |
|\ \ \ \ \ \ \ \ \ \ | |||
| | | | | | * | | | | | CodedInputStream::SetTotalBytesLimit description fix | Pavel | 2017-10-12 |
| |_|_|_|_|/ / / / / |/| | | | | | | | | | |||
| * | | | | | | | | | Fix distcheck | Jisi Liu | 2017-10-11 |
| * | | | | | | | | | Merge remote-tracking branch 'origin/3.4.x' into master | Jisi Liu | 2017-10-11 |
|/| | | | | | | | | | | |_|_|_|/ / / / | |/| | | | | | | |