aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Expand)AuthorAge
* Fixed up proto3_lite_unittest.ccGravatar Adam Cozzette2018-03-14
* Merge branch 'master' into down-integrateGravatar Adam Cozzette2018-03-13
|\
* | Integrated internal changes from GoogleGravatar Adam Cozzette2018-03-13
| * Merge pull request #4378 from acozzette/node-bufferGravatar Adam Cozzette2018-03-13
| |\
| * \ Merge pull request #4167 from mike9005/patch-1Gravatar Joshua Haberman2018-03-13
| |\ \
| * \ \ Merge pull request #4380 from mateuszmatejczyk/patch-1Gravatar Jisi Liu2018-03-12
| |\ \ \
| * \ \ \ Merge pull request #1333 from cgull/pkg-config-issueGravatar Jisi Liu2018-03-12
| |\ \ \ \
| | | * | | Output *_pb2_grpc.py when use_grpc_plugin=TrueGravatar Mateusz Matejczyk2018-03-11
| | |/ / / | |/| | |
| | | | * Revert "Removed mention of Buffer in byteSourceToUint8Array"Gravatar Adam Cozzette2018-03-09
| | |_|/ | |/| |
| * | | Merge pull request #4347 from xfxyjwf/pluginpbGravatar Feng Xiao2018-03-09
| |\ \ \
| * \ \ \ Merge pull request #4375 from jo2y/protoc-defaultGravatar Feng Xiao2018-03-09
| |\ \ \ \
| | * | | | Replace //:protoc and similar default macro arguments withGravatar James O'Kane2018-03-08
| |/ / / /
| * | | | Sync upb change (#4373)Gravatar Paul Yang2018-03-08
| * | | | Convert descriptortype to type for upb_msgval_sizeof (#4357)Gravatar Paul Yang2018-03-06
| * | | | For encoding upb needs descriptor type instead of type. (#4354)Gravatar Paul Yang2018-03-06
| * | | | Merge pull request #4355 from acozzette/typoGravatar Adam Cozzette2018-03-05
| |\ \ \ \
| | * | | | PHP: fixed typo in message.cGravatar Adam Cozzette2018-03-05
| |/ / / /
| | * / / Revert "Move `compiler/plugin.pb.cc` to libprotobuf with the other WKT sources."Gravatar Feng Xiao2018-03-01
| |/ / /
| * | | Merge pull request #4183 from pcc/win-libcxxGravatar Feng Xiao2018-02-26
| |\ \ \
| * \ \ \ Merge pull request #4333 from jmillikin/update-file-lists-needs-bashGravatar Feng Xiao2018-02-26
| |\ \ \ \
| * \ \ \ \ Merge pull request #4334 from jmillikin/blacklist-internal-proto-srcsGravatar Feng Xiao2018-02-26
| |\ \ \ \ \
| * \ \ \ \ \ Merge pull request #4195 from alexey-malov/IgnoreUnknownEnumsInJsonGravatar Feng Xiao2018-02-26
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge pull request #4291 from google/3.5.xGravatar Jisi Liu2018-02-26
| |\ \ \ \ \ \ \
| | | | * | | | | Blacklist all WELL_KNOWN_PROTOS from Bazel C++ code generation.Gravatar John Millikin2018-02-24
| | | | * | | | | Move `compiler/plugin.pb.cc` to libprotobuf with the other WKT sources.Gravatar John Millikin2018-02-24
| | |_|/ / / / / | |/| | | | | |
| | | | * | | | `update_file_lists.sh` depends on Bash features, thus needs Bash sebang.Gravatar John Millikin2018-02-24
| | |_|/ / / / | |/| | | | |
| * | | | | | Merge pull request #4324 from abdul-sami/masterGravatar Feng Xiao2018-02-22
| |\ \ \ \ \ \
| | * | | | | | Merge pull request #1 from abdul-sami/abdul-sami-patch-1Gravatar Abdul Sami2018-02-21
| |/| | | | | |
| | * | | | | | Added instruction for existing ZLIB configurationGravatar Abdul Sami2018-02-21
| |/ / / / / /
| * | | | | | Merge pull request #4323 from dtapuska/masterGravatar Feng Xiao2018-02-20
| |\ \ \ \ \ \
| | * | | | | | Rename a shadowed variable.Gravatar Dave Tapuska2018-02-20
| * | | | | | | Merge pull request #3186 from gkelly/remove-unused-variableGravatar Feng Xiao2018-02-20
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| | | | * | | | The JsonParseOptions::ignore_unknown_fields option behavior treatsGravatar Alexey Malov2018-02-12
| * | | | | | | Only check filenames when end with .py in _CalledFromGeneratedFile() (#4262)Gravatar Jie Luo2018-02-09
|/ / / / / / /
* | | | | | | Merge pull request #4302 from BSBandme/down_integ_benchmarkGravatar Yilun Chong2018-02-09
|\ \ \ \ \ \ \
| * | | | | | | Sync internal benchmark changesGravatar Yilun Chong2018-02-09
* | | | | | | | Remove stray indent on normal imports.Gravatar Thomas Van Lenten2018-02-08
* | | | | | | | Merge pull request #4288 from nico/nofallGravatar Feng Xiao2018-02-08
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
* | | | | | | | Fix up the docs to mention the WKTs generated files also.Gravatar Thomas Van Lenten2018-02-07
| * | | | | | | Remove use of GOOGLE_FALLTHROUGH_INTENDED from protobuf.Gravatar Nico Weber2018-02-07
|/ / / / / / /
* | | | | | | Merge pull request #4259 from Mizux/masterGravatar Feng Xiao2018-02-02
|\ \ \ \ \ \ \
* \ \ \ \ \ \ \ Merge pull request #4257 from davido/support_java9Gravatar Feng Xiao2018-02-01
|\ \ \ \ \ \ \ \
* \ \ \ \ \ \ \ \ Merge pull request #4265 from BSBandme/upgrade_benchmark_submoduleGravatar Yilun Chong2018-02-01
|\ \ \ \ \ \ \ \ \
| | | * | | | | | | Use NEW behaviour for project VERSION variables.Gravatar Corentin Le Molgat2018-02-01
| | | * | | | | | | Even with MSVC enable zlib support as default behaviour.Gravatar Corentin Le Molgat2018-02-01
| | | * | | | | | | Add CMake ALIAS targetsGravatar Corentin Le Molgat2018-02-01
| | | * | | | | | | Add VERSION property to CMake library targetsGravatar Corentin Le Molgat2018-02-01
| * | | | | | | | | upgrade submoduleGravatar Yilun Chong2018-02-01
* | | | | | | | | | Merge pull request #4266 from brunokim/patch-1Gravatar Jisi Liu2018-02-01
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Fix link markup in third party list.Gravatar Bruno Kim Medeiros Cesar2018-02-01
|/ / / / / / / / /