aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Output *_pb2_grpc.py when use_grpc_plugin=TrueMateusz Matejczyk2018-03-111-3/+6
* Merge pull request #4347 from xfxyjwf/pluginpbFeng Xiao2018-03-094-3/+3
|\
| * Revert "Move `compiler/plugin.pb.cc` to libprotobuf with the other WKT sources."Feng Xiao2018-03-014-3/+3
* | Merge pull request #4375 from jo2y/protoc-defaultFeng Xiao2018-03-092-5/+5
|\ \
| * | Replace //:protoc and similar default macro arguments withJames O'Kane2018-03-082-5/+5
|/ /
* | Sync upb change (#4373)Paul Yang2018-03-082-195/+2783
* | Convert descriptortype to type for upb_msgval_sizeof (#4357)Paul Yang2018-03-061-1/+1
* | For encoding upb needs descriptor type instead of type. (#4354)Paul Yang2018-03-062-13/+13
* | Merge pull request #4355 from acozzette/typoAdam Cozzette2018-03-051-1/+1
|\ \ | |/ |/|
| * PHP: fixed typo in message.cAdam Cozzette2018-03-051-1/+1
|/
* Merge pull request #4183 from pcc/win-libcxxFeng Xiao2018-02-262-2/+3
|\
| * Add support for libc++ on Windows.Peter Collingbourne2018-01-172-2/+3
* | Merge pull request #4333 from jmillikin/update-file-lists-needs-bashFeng Xiao2018-02-261-1/+1
|\ \
| * | `update_file_lists.sh` depends on Bash features, thus needs Bash sebang.John Millikin2018-02-241-1/+1
* | | Merge pull request #4334 from jmillikin/blacklist-internal-proto-srcsFeng Xiao2018-02-264-3/+4
|\ \ \
| * | | Blacklist all WELL_KNOWN_PROTOS from Bazel C++ code generation.John Millikin2018-02-241-0/+1
| * | | Move `compiler/plugin.pb.cc` to libprotobuf with the other WKT sources.John Millikin2018-02-244-3/+3
| |/ /
* | | Merge pull request #4195 from alexey-malov/IgnoreUnknownEnumsInJsonFeng Xiao2018-02-265-6/+72
|\ \ \
| * | | The JsonParseOptions::ignore_unknown_fields option behavior treatsAlexey Malov2018-02-125-6/+72
| | |/ | |/|
* | | Merge pull request #4291 from google/3.5.xJisi Liu2018-02-2612-61/+189
|\ \ \ | |_|/ |/| |
| * | Merge pull request #4236 from pherl/3.5.xJisi Liu2018-01-261-1/+1
| |\ \
| | * | Bumping number to fix ruby 2.1 on macJisi Liu2018-01-261-1/+1
| * | | Fix more memory leak for php c extension (#4211)Paul Yang2018-01-257-27/+117
| |/ /
| * | Merge pull request #4185 from pherl/ruby2.5Jisi Liu2018-01-171-2/+2
| |\ \
| | * | Update rake file to build of 2.1.6.Jisi Liu2018-01-171-2/+2
| * | | Merge pull request #4182 from pherl/ruby2.5Jisi Liu2018-01-172-3/+3
| |\| |
| | * | Support ruby2.5Jisi Liu2018-01-172-3/+3
| * | | Well known types are not initialized properly. (#4139)Paul Yang2018-01-053-30/+68
| * | | Merge pull request #4146 from pherl/fix_protocJisi Liu2018-01-051-1/+1
| |\ \ \
| | * | | Bump protoc-artifact version for a patch rebuildJisi Liu2018-01-051-1/+1
| | |/ /
* | | | Merge pull request #4324 from abdul-sami/masterFeng Xiao2018-02-221-0/+5
|\ \ \ \
| * | | | Merge pull request #1 from abdul-sami/abdul-sami-patch-1Abdul Sami2018-02-211-0/+5
|/| | | |
| * | | | Added instruction for existing ZLIB configurationAbdul Sami2018-02-211-0/+5
|/ / / /
* | | | Merge pull request #4323 from dtapuska/masterFeng Xiao2018-02-201-2/+2
|\ \ \ \
| * | | | Rename a shadowed variable.Dave Tapuska2018-02-201-2/+2
* | | | | Merge pull request #3186 from gkelly/remove-unused-variableFeng Xiao2018-02-201-2/+0
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Remove unused output_file variable from js_embedGarret Kelly2017-06-051-2/+0
* | | | | Only check filenames when end with .py in _CalledFromGeneratedFile() (#4262)Jie Luo2018-02-091-4/+9
* | | | | Merge pull request #4302 from BSBandme/down_integ_benchmarkYilun Chong2018-02-0917-30/+89
|\ \ \ \ \
| * | | | | Sync internal benchmark changesYilun Chong2018-02-0917-30/+89
* | | | | | Remove stray indent on normal imports.Thomas Van Lenten2018-02-081-2/+2
* | | | | | Merge pull request #4288 from nico/nofallFeng Xiao2018-02-082-16/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Remove use of GOOGLE_FALLTHROUGH_INTENDED from protobuf.Nico Weber2018-02-072-16/+1
* | | | | | Fix up the docs to mention the WKTs generated files also.Thomas Van Lenten2018-02-071-4/+6
|/ / / / /
* | | | | Merge pull request #4259 from Mizux/masterFeng Xiao2018-02-025-5/+12
|\ \ \ \ \
| * | | | | Use NEW behaviour for project VERSION variables.Corentin Le Molgat2018-02-011-0/+4
| * | | | | Even with MSVC enable zlib support as default behaviour.Corentin Le Molgat2018-02-011-5/+1
| * | | | | Add CMake ALIAS targetsCorentin Le Molgat2018-02-014-0/+4
| * | | | | Add VERSION property to CMake library targetsCorentin Le Molgat2018-02-013-0/+3
* | | | | | Merge pull request #4257 from davido/support_java9Feng Xiao2018-02-011-1/+15
|\ \ \ \ \ \