Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Adds pushLimit: and popLimit: into GPBCodedInputStream (#2297) | Sergio Campamá | 2016-10-27 | 2 | -0/+29 |
| | | | | Adds pushLimit: and popLimit: into GPBCodedInputStream | ||||
* | Trigger update of docker for new changes in #2282. (#2288) | Paul Yang | 2016-10-27 | 2 | -0/+2 |
| | |||||
* | Merge pull request #2290 from ramrunner/OpenBSDsupport | Feng Xiao | 2016-10-26 | 1 | -2/+2 |
|\ | | | | | define no_threadlocal on OpenBSD | ||||
| * | define no_threadlocal on OpenBSD | ramrunner | 2016-10-26 | 1 | -2/+2 |
|/ | |||||
* | Merge pull request #2284 from pherl/plugin_opt | Jisi Liu | 2016-10-26 | 3 | -17/+93 |
|\ | | | | | Support extra parameters for plugins. | ||||
| * | Add comments about converting directives into PluginName | Jisi Liu | 2016-10-26 | 1 | -1/+2 |
| | | |||||
| * | Support extra parameters for plugins. | Jisi Liu | 2016-10-25 | 3 | -16/+91 |
| | | |||||
* | | Fix pure php implementation for 32-bit machine. (#2282) | Paul Yang | 2016-10-25 | 17 | -392/+545 |
|/ | |||||
* | Merge pull request #2274 from nmittler/gae | Feng Xiao | 2016-10-20 | 1 | -5/+45 |
|\ | | | | | Hacking ByteBufferWriter to work with GAE | ||||
| * | Hacking ByteBufferWriter to work with GAE | nmittler | 2016-10-20 | 1 | -5/+45 |
|/ | | | | Fixes #2269 | ||||
* | Merge pull request #2264 from rshin/master | Feng Xiao | 2016-10-19 | 2 | -4/+8 |
|\ | | | | | Place Python extensions correctly in Bazel build. | ||||
| * | Use -DPROTOBUF_PYTHON_ALLOW_OVERSIZE_PROTOS | Richard Shin | 2016-10-19 | 1 | -0/+4 |
| | | |||||
| * | Place Python extensions correctly in Bazel build. | Richard Shin | 2016-10-18 | 1 | -4/+4 |
|/ | |||||
* | Merge pull request #2254 from JasonLunn/patch-1 | Feng Xiao | 2016-10-16 | 1 | -0/+2 |
|\ | | | | | Use git clean before installing via bundler | ||||
| * | Use git clean before installing via bundler | Jason Lunn | 2016-10-14 | 1 | -0/+2 |
|/ | |||||
* | Merge pull request #1959 from abergmeier-dsfishlabs/feature/cpp | Feng Xiao | 2016-10-13 | 1 | -7/+17 |
|\ | | | | | Need to expose generated protobuf C++ headers | ||||
| * | Need to expose generated protobuf C++ headers so they can actually be ↵ | Andreas Bergmeier | 2016-08-15 | 1 | -7/+17 |
| | | | | | | | | accessed from other libraries. | ||||
* | | Merge pull request #2251 from TeBoring/master | Paul Yang | 2016-10-13 | 7 | -32/+84 |
|\ \ | | | | | | | Merge 3.1.x branch into master. | ||||
| * | | Merge 3.1.x into master. | Bo Yang | 2016-10-13 | 7 | -32/+84 |
|/| | | |||||
| * | | Fix the bug that message without namespace is not found in the descriptor ↵ | Paul Yang | 2016-10-11 | 6 | -23/+83 |
| | | | | | | | | | | | | pool. (#2240) | ||||
| * | | Merge pull request #2203 from mrry/msvc_fix | Feng Xiao | 2016-10-11 | 1 | -9/+1 |
| |\ \ | | | | | | | | | Fix MSVC build when HAVE_LONG_LONG is defined. | ||||
| | * | | Fix MSVC build when HAVE_LONG_LONG is defined. | Derek Murray | 2016-09-29 | 1 | -9/+1 |
| | | | | |||||
| * | | | Fix python_cpp test on Mac. Link staticly when building extension, so that ↵ | Paul Yang | 2016-10-07 | 2 | -2/+3 |
| | | | | | | | | | | | | | | | | the extension doesn't require installing protobuf library. (#2232) | ||||
| * | | | Add csharp/build_tools.sh for dist check. | Bo Yang | 2016-10-06 | 1 | -0/+1 |
| | | | | |||||
| * | | | Fix compile error for php on Mac. | Bo Yang | 2016-10-05 | 11 | -39/+55 |
| | | | | |||||
| * | | | Fix segmentation fault when ZTS is defined. | Bo Yang | 2016-10-05 | 5 | -34/+39 |
| | | | | |||||
| * | | | PHP: fix ZTS tsrm_ls errors (#2189) | Stanley Cheung | 2016-10-04 | 6 | -59/+69 |
| | | | | | | | | | | | | | | | | | | | | | | | | * PHP: fix ZTS tsrm_ls errors * Fix a few more macros | ||||
| * | | | Merge pull request #2193 from acozzette/common-js-fix | Adam Cozzette | 2016-10-04 | 4 | -14/+44 |
| |\ \ \ | | | | | | | | | | | Fixed references to foreign nested messages with CommonJS-style imports | ||||
| | * | | | Fixed references to foreign nested messages with CommonJS-style imports | Adam Cozzette | 2016-09-27 | 4 | -14/+44 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A bug was causing generated JSPB code with CommonJS-style imports to refer incorrectly to nested messages from other .proto files. The generated code would have things like "test_pb.InnerMessage" instead of "test_pb.OuterMessage.InnerMessage". This commit fixes the problem by correctly taking into account any message nesting. | ||||
| * | | | | Add test for php zts build. | Bo Yang | 2016-10-04 | 1 | -4/+16 |
| | | | | | |||||
| * | | | | Prepare jenkins for testing php zts build. | Bo Yang | 2016-10-04 | 1 | -0/+6 |
| | | | | | |||||
| * | | | | Merge pull request #2204 from acozzette/enum-names | Adam Cozzette | 2016-10-04 | 2 | -9/+27 |
| |\ \ \ \ | | | | | | | | | | | | | Do strict enum name checking only for proto3 | ||||
| | * | | | | Do strict enum name checking only for proto3 | Adam Cozzette | 2016-10-04 | 2 | -9/+27 |
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There seem to already be .proto files out there that have conflicting enum names, which will not be able to build successfully for some languages (like C#). To prevent this problem from spreading, let's make it an error for proto3 but just issue a warning for proto2. This fixes issue #2179. | ||||
| * | | | | Add travis test on Mac for php. | Bo Yang | 2016-10-03 | 2 | -9/+20 |
| | | | | | |||||
| * | | | | Test php5.5_c test on jenkins | Bo Yang | 2016-10-03 | 3 | -30/+36 |
| | | | | | |||||
| * | | | | Trigger automated tests for php. | Bo Yang | 2016-09-30 | 1 | -0/+6 |
| | | | | | |||||
| * | | | | Set up environment for php automated tests. | Bo Yang | 2016-09-30 | 1 | -6/+46 |
| | | | | | |||||
| * | | | | Add php test script for automated tests. | Bo Yang | 2016-09-30 | 1 | -8/+63 |
| | |/ / | |/| | | |||||
| * | | | Add script to build Google.Protobuf.Tools for csharp. | Bo Yang | 2016-09-28 | 1 | -0/+52 |
| | | | | |||||
| * | | | Merge pull request #2196 from haberman/nodefix | Joshua Haberman | 2016-09-28 | 1 | -0/+12 |
| |\ \ \ | | |/ / | |/| | | Added alias getFieldProto3 as used by older generated code. | ||||
| | * | | Added alias getFieldProto3 as used by older generated code. | Josh Haberman | 2016-09-28 | 1 | -0/+12 |
| |/ / | | | | | | | | | | | | | Un-breaks users who have old generated code and upgrade to the 3.1.0 release. | ||||
| * | | Fixing inconsistent php version number. | Bo Yang | 2016-09-26 | 2 | -2/+2 |
| | | | |||||
| * | | Merge pull request #2181 from google/jtattermusch-patch-2 | Feng Xiao | 2016-09-26 | 1 | -3/+0 |
| |\ \ | | | | | | | | | Update README.md | ||||
| | * | | Update README.md | Jan Tattermusch | 2016-09-26 | 1 | -3/+0 |
| |/ / | |||||
| * | | Fix MSVC stack overflow issue. | Feng Xiao | 2016-09-23 | 1 | -0/+5 |
| | | | |||||
| * | | Add php files for make dist.v3.1.0-alpha-1v3.1.0 | Bo Yang | 2016-09-23 | 4 | -4/+55 |
| | | | |||||
| * | | Update change log for 3.1.0 (#2173) | Paul Yang | 2016-09-23 | 1 | -0/+80 |
| | | | |||||
| * | | Merge pull request #2175 from xfxyjwf/fix_json | Feng Xiao | 2016-09-23 | 3 | -7/+25 |
| |\ \ | | | | | | | | | Fix VS test failures. | ||||
| | * | | Force a rebuild of Jenkins docker image. | Feng Xiao | 2016-09-23 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Needed to pick up a Java dependency change and re-populate the offline repo. [skip ci] | ||||
| | * | | Fix VS test failures. | Feng Xiao | 2016-09-23 | 2 | -6/+24 |
| | | | |