Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fixed up proto3_lite_unittest.cc | Adam Cozzette | 2018-03-14 | 1 | -11/+11 |
* | Merge branch 'master' into down-integrate | Adam Cozzette | 2018-03-13 | 33 | -697/+3583 |
|\ | |||||
| * | Merge pull request #4378 from acozzette/node-buffer | Adam Cozzette | 2018-03-13 | 1 | -0/+4 |
| |\ | |||||
| | * | Revert "Removed mention of Buffer in byteSourceToUint8Array" | Adam Cozzette | 2018-03-09 | 1 | -0/+4 |
| * | | Merge pull request #4167 from mike9005/patch-1 | Joshua Haberman | 2018-03-13 | 1 | -2/+2 |
| |\ \ | |||||
| | * | | Fix scope resolution for MessageExts in Ruby | Michael Collis | 2018-01-12 | 1 | -2/+2 |
| * | | | Merge pull request #4380 from mateuszmatejczyk/patch-1 | Jisi Liu | 2018-03-12 | 1 | -3/+6 |
| |\ \ \ | |||||
| | * | | | Output *_pb2_grpc.py when use_grpc_plugin=True | Mateusz Matejczyk | 2018-03-11 | 1 | -3/+6 |
| | | |/ | | |/| | |||||
| * | | | Merge pull request #1333 from cgull/pkg-config-issue | Jisi Liu | 2018-03-12 | 3 | -400/+487 |
| |\ \ \ | | |/ / | |/| | | |||||
| | * | | Replace ancient m4/acx_pthread.m4 with m4/ax_pthread.m4 | john hood | 2016-03-18 | 3 | -400/+487 |
| * | | | Merge pull request #4347 from xfxyjwf/pluginpb | Feng Xiao | 2018-03-09 | 4 | -3/+3 |
| |\ \ \ | |||||
| | * | | | Revert "Move `compiler/plugin.pb.cc` to libprotobuf with the other WKT sources." | Feng Xiao | 2018-03-01 | 4 | -3/+3 |
| * | | | | Merge pull request #4375 from jo2y/protoc-default | Feng Xiao | 2018-03-09 | 2 | -5/+5 |
| |\ \ \ \ | |||||
| | * | | | | Replace //:protoc and similar default macro arguments with | James O'Kane | 2018-03-08 | 2 | -5/+5 |
| |/ / / / | |||||
| * | | | | Sync upb change (#4373) | Paul Yang | 2018-03-08 | 2 | -195/+2783 |
| * | | | | Convert descriptortype to type for upb_msgval_sizeof (#4357) | Paul Yang | 2018-03-06 | 1 | -1/+1 |
| * | | | | For encoding upb needs descriptor type instead of type. (#4354) | Paul Yang | 2018-03-06 | 2 | -13/+13 |
| * | | | | Merge pull request #4355 from acozzette/typo | Adam Cozzette | 2018-03-05 | 1 | -1/+1 |
| |\ \ \ \ | | |/ / / | |/| | | | |||||
| | * | | | PHP: fixed typo in message.c | Adam Cozzette | 2018-03-05 | 1 | -1/+1 |
| |/ / / | |||||
| * | | | Merge pull request #4183 from pcc/win-libcxx | Feng Xiao | 2018-02-26 | 2 | -2/+3 |
| |\ \ \ | |||||
| | * | | | Add support for libc++ on Windows. | Peter Collingbourne | 2018-01-17 | 2 | -2/+3 |
| * | | | | Merge pull request #4333 from jmillikin/update-file-lists-needs-bash | Feng Xiao | 2018-02-26 | 1 | -1/+1 |
| |\ \ \ \ | |||||
| | * | | | | `update_file_lists.sh` depends on Bash features, thus needs Bash sebang. | John Millikin | 2018-02-24 | 1 | -1/+1 |
| * | | | | | Merge pull request #4334 from jmillikin/blacklist-internal-proto-srcs | Feng Xiao | 2018-02-26 | 4 | -3/+4 |
| |\ \ \ \ \ | |||||
| | * | | | | | Blacklist all WELL_KNOWN_PROTOS from Bazel C++ code generation. | John Millikin | 2018-02-24 | 1 | -0/+1 |
| | * | | | | | Move `compiler/plugin.pb.cc` to libprotobuf with the other WKT sources. | John Millikin | 2018-02-24 | 4 | -3/+3 |
| | |/ / / / | |||||
| * | | | | | Merge pull request #4195 from alexey-malov/IgnoreUnknownEnumsInJson | Feng Xiao | 2018-02-26 | 5 | -6/+72 |
| |\ \ \ \ \ | |||||
| | * | | | | | The JsonParseOptions::ignore_unknown_fields option behavior treats | Alexey Malov | 2018-02-12 | 5 | -6/+72 |
| | | |/ / / | | |/| | | | |||||
| * | | | | | Merge pull request #4291 from google/3.5.x | Jisi Liu | 2018-02-26 | 12 | -61/+189 |
| |\ \ \ \ \ | | |_|/ / / | |/| | | | | |||||
| | * | | | | Merge pull request #4236 from pherl/3.5.x | Jisi Liu | 2018-01-26 | 1 | -1/+1 |
| | |\ \ \ \ | |||||
| | | * | | | | Bumping number to fix ruby 2.1 on mac | Jisi Liu | 2018-01-26 | 1 | -1/+1 |
| | * | | | | | Fix more memory leak for php c extension (#4211) | Paul Yang | 2018-01-25 | 7 | -27/+117 |
| | |/ / / / | |||||
| | * | | | | Merge pull request #4185 from pherl/ruby2.5 | Jisi Liu | 2018-01-17 | 1 | -2/+2 |
| | |\ \ \ \ | |||||
| | | * | | | | Update rake file to build of 2.1.6. | Jisi Liu | 2018-01-17 | 1 | -2/+2 |
| | * | | | | | Merge pull request #4182 from pherl/ruby2.5 | Jisi Liu | 2018-01-17 | 2 | -3/+3 |
| | |\| | | | | |||||
| | | * | | | | Support ruby2.5 | Jisi Liu | 2018-01-17 | 2 | -3/+3 |
| | * | | | | | Well known types are not initialized properly. (#4139) | Paul Yang | 2018-01-05 | 3 | -30/+68 |
| | * | | | | | Merge pull request #4146 from pherl/fix_protoc | Jisi Liu | 2018-01-05 | 1 | -1/+1 |
| | |\ \ \ \ \ | |||||
| | | * | | | | | Bump protoc-artifact version for a patch rebuild | Jisi Liu | 2018-01-05 | 1 | -1/+1 |
| | | |/ / / / | |||||
| * | | | | | | Merge pull request #4324 from abdul-sami/master | Feng Xiao | 2018-02-22 | 1 | -0/+5 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | Merge pull request #1 from abdul-sami/abdul-sami-patch-1 | Abdul Sami | 2018-02-21 | 1 | -0/+5 |
| |/| | | | | | | |||||
| | * | | | | | | Added instruction for existing ZLIB configuration | Abdul Sami | 2018-02-21 | 1 | -0/+5 |
| |/ / / / / / | |||||
| * | | | | | | Merge pull request #4323 from dtapuska/master | Feng Xiao | 2018-02-20 | 1 | -2/+2 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | Rename a shadowed variable. | Dave Tapuska | 2018-02-20 | 1 | -2/+2 |
| * | | | | | | | Merge pull request #3186 from gkelly/remove-unused-variable | Feng Xiao | 2018-02-20 | 1 | -2/+0 |
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | |||||
| | * | | | | | | Remove unused output_file variable from js_embed | Garret Kelly | 2017-06-05 | 1 | -2/+0 |
| * | | | | | | | Only check filenames when end with .py in _CalledFromGeneratedFile() (#4262) | Jie Luo | 2018-02-09 | 1 | -4/+9 |
* | | | | | | | | Integrated internal changes from Google | Adam Cozzette | 2018-03-13 | 282 | -14041/+15223 |
|/ / / / / / / | |||||
* | | | | | | | Merge pull request #4302 from BSBandme/down_integ_benchmark | Yilun Chong | 2018-02-09 | 17 | -30/+89 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Sync internal benchmark changes | Yilun Chong | 2018-02-09 | 17 | -30/+89 |