Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #1275 from keveman/grpc_support | Jisi Liu | 2016-02-25 | 1 | -6/+11 |
|\ | |||||
| * | Fixed grpc C++ plugin support. | Manjunath Kudlur | 2016-02-25 | 1 | -6/+11 |
|/ | |||||
* | Merge pull request #1259 from silviulica/master | Joshua Haberman | 2016-02-24 | 4 | -2/+14 |
|\ | |||||
| * | Add a modified patch from craigcitro@ to handle namespace sharing. | Silviu Calinoiu | 2016-02-18 | 4 | -2/+14 |
* | | Merge pull request #1268 from keveman/grpc_support | Jisi Liu | 2016-02-23 | 1 | -0/+17 |
|\ \ | |||||
| * | | Added grpc plugin support to cc_proto_library. | Manjunath Kudlur | 2016-02-22 | 1 | -0/+17 |
|/ / | |||||
* | | Merge pull request #1267 from jskeet/vs2015 | Jan Tattermusch | 2016-02-22 | 1 | -3/+3 |
|\ \ | |||||
| * | | Require VS2015 in the solution file | Jon Skeet | 2016-02-22 | 1 | -3/+3 |
* | | | Merge pull request #804 from bsilver8192/master | Feng Xiao | 2016-02-22 | 3 | -0/+160 |
|\ \ \ | |/ / |/| | | |||||
| * | | Add atomics support for 32-bit PPC. | Brian Silverman | 2015-09-09 | 3 | -0/+160 |
* | | | Merge pull request #1215 from haberman/commonjs | Joshua Haberman | 2016-02-19 | 14 | -79/+667 |
|\ \ \ | |||||
| * | | | Added a bit more to README.md, and allowed custom PROTOC var in tests. | Josh Haberman | 2016-02-19 | 2 | -2/+28 |
| * | | | Properly camelCase when translating to CommonJS. | Josh Haberman | 2016-02-18 | 1 | -1/+17 |
| * | | | Removed unused directives from tests that aren't run under CommonJS. | Josh Haberman | 2016-02-18 | 2 | -4/+0 |
| * | | | Addressed more code review comments. | Josh Haberman | 2016-02-18 | 2 | -22/+28 |
| * | | | Integrate review comments. | Josh Haberman | 2016-02-18 | 5 | -6/+18 |
| * | | | Greatly expanded README.md. | Josh Haberman | 2016-02-18 | 1 | -10/+130 |
| * | | | Use "node" as binary instead of "nodejs". | Josh Haberman | 2016-02-18 | 1 | -1/+1 |
| * | | | Fixed definition of extensions, and added CommonJS tests to Travis. | Josh Haberman | 2016-02-18 | 3 | -2/+13 |
| * | | | Fixed nested message scopes for CommonJS. | Josh Haberman | 2016-02-18 | 7 | -28/+46 |
| * | | | Added some documentation in comments. | Josh Haberman | 2016-02-18 | 3 | -2/+31 |
| * | | | Moved CommonJS-specific files to commonjs/. | Josh Haberman | 2016-02-18 | 5 | -4/+4 |
| * | | | CommonJS tests are now passing. | Josh Haberman | 2016-02-18 | 13 | -20/+152 |
| * | | | WIP. | Josh Haberman | 2016-02-18 | 6 | -64/+286 |
* | | | | Merge pull request #1257 from thomasvl/objc_generics | Thomas Van Lenten | 2016-02-19 | 35 | -490/+588 |
|\ \ \ \ | |_|_|/ |/| | | | |||||
| * | | | Support ObjC Generic Collections | Thomas Van Lenten | 2016-02-18 | 35 | -490/+588 |
* | | | | Merge pull request #1240 from jskeet/validate_group | Jan Tattermusch | 2016-02-18 | 3 | -12/+77 |
|\ \ \ \ | |||||
| * | | | | Validate that end-group tags match their corresponding start-group tags | Jon Skeet | 2016-02-15 | 3 | -12/+77 |
* | | | | | Merge pull request #1258 from haberman/releasenotes | Joshua Haberman | 2016-02-18 | 1 | -1/+5 |
|\ \ \ \ \ | |_|/ / / |/| | | | | |||||
| * | | | | Some fixes for the most recent release notes. | Josh Haberman | 2016-02-18 | 1 | -1/+5 |
|/ / / / | |||||
* | | | | Merge pull request #1255 from thomasvl/mark_os_x_python_cpp_failing | Thomas Van Lenten | 2016-02-18 | 1 | -0/+4 |
|\ \ \ \ | |||||
| * | | | | List python_cpp as failing on OS X | Thomas Van Lenten | 2016-02-18 | 1 | -0/+4 |
|/ / / / | |||||
* | | | | Merge pull request #1254 from thomasvl/disable_xctool_updates | Thomas Van Lenten | 2016-02-18 | 2 | -8/+8 |
|\ \ \ \ | |||||
| * | | | | Disable the xctool updates | Thomas Van Lenten | 2016-02-18 | 2 | -8/+8 |
|/ / / / | |||||
* | | | | Merge pull request #1239 from jskeet/call_generate_protos | Jon Skeet | 2016-02-18 | 2 | -1/+6 |
|\ \ \ \ | |_|/ / |/| | | | |||||
| * | | | Generate C# code whenever descriptor.proto changes | Jon Skeet | 2016-02-15 | 2 | -1/+6 |
| |/ / | |||||
* | | | Merge pull request #1229 from keveman/unlimited_binary_proto | Joshua Haberman | 2016-02-17 | 2 | -4/+23 |
|\ \ \ | |||||
| * | | | Added PROTOBUF_PYTHON_ALLOW_OVERSIZE_PROTOS macro and setting it when | Manjunath Kudlur | 2016-02-16 | 2 | -4/+23 |
* | | | | Merge pull request #1241 from jskeet/more-merge-wrapper-tests | Jan Tattermusch | 2016-02-17 | 1 | -2/+41 |
|\ \ \ \ | |||||
| * | | | | Add more tests around merging wrappers | Jon Skeet | 2016-02-15 | 1 | -2/+41 |
| | |/ / | |/| | | |||||
* | | | | Merge pull request #260 from ejsd1989/issue-#242 | Joshua Haberman | 2016-02-16 | 2 | -4/+2 |
|\ \ \ \ | |||||
| * | | | | Removal of null check | eissajamil@gmail.com | 2015-03-29 | 1 | -3/+1 |
| * | | | | Removal of null check | eissajamil@gmail.com | 2015-03-29 | 1 | -1/+1 |
* | | | | | Merge pull request #1224 from google/rubysentinel | Joshua Haberman | 2016-02-16 | 1 | -9/+9 |
|\ \ \ \ \ | |||||
| * | | | | | Removed 'optional' from proto3 syntax file. | Josh Haberman | 2016-02-10 | 1 | -9/+9 |
* | | | | | | Merge pull request #1247 from thomasvl/xctool_plain_output | Thomas Van Lenten | 2016-02-16 | 1 | -5/+4 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Move the xctool use of -reporter into a common spot and always use "plain" to... | Thomas Van Lenten | 2016-02-16 | 1 | -5/+4 |
|/ / / / / / | |||||
* | | | | | | Merge pull request #1245 from thomasvl/tweak_xctool_ios_run | Thomas Van Lenten | 2016-02-16 | 1 | -1/+7 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Tweak the xctool run for iOS tests to try and sort out flake | Thomas Van Lenten | 2016-02-16 | 1 | -1/+7 |
|/ / / / / / | |||||
* | | | | | | Merge pull request #1244 from thomasvl/bump_xcode_version | Thomas Van Lenten | 2016-02-16 | 3 | -5/+16 |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | |