aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Implement IDisposable for CodedInputStream and CodedOutputStreamJon Skeet2016-02-295-12/+152
* Merge pull request #1233 from davidzchen/python-pathJisi Liu2016-02-254-96/+51
|\
| * Remove hack for building Python support with Bazel.David Z. Chen2016-02-254-96/+51
|/
* Merge pull request #1275 from keveman/grpc_supportJisi Liu2016-02-251-6/+11
|\
| * Fixed grpc C++ plugin support.Manjunath Kudlur2016-02-251-6/+11
|/
* Merge pull request #1259 from silviulica/masterJoshua Haberman2016-02-244-2/+14
|\
| * Add a modified patch from craigcitro@ to handle namespace sharing.Silviu Calinoiu2016-02-184-2/+14
* | Merge pull request #1268 from keveman/grpc_supportJisi Liu2016-02-231-0/+17
|\ \
| * | Added grpc plugin support to cc_proto_library.Manjunath Kudlur2016-02-221-0/+17
|/ /
* | Merge pull request #1267 from jskeet/vs2015Jan Tattermusch2016-02-221-3/+3
|\ \
| * | Require VS2015 in the solution fileJon Skeet2016-02-221-3/+3
* | | Merge pull request #804 from bsilver8192/masterFeng Xiao2016-02-223-0/+160
|\ \ \ | |/ / |/| |
| * | Add atomics support for 32-bit PPC.Brian Silverman2015-09-093-0/+160
* | | Merge pull request #1215 from haberman/commonjsJoshua Haberman2016-02-1914-79/+667
|\ \ \
| * | | Added a bit more to README.md, and allowed custom PROTOC var in tests.Josh Haberman2016-02-192-2/+28
| * | | Properly camelCase when translating to CommonJS.Josh Haberman2016-02-181-1/+17
| * | | Removed unused directives from tests that aren't run under CommonJS.Josh Haberman2016-02-182-4/+0
| * | | Addressed more code review comments.Josh Haberman2016-02-182-22/+28
| * | | Integrate review comments.Josh Haberman2016-02-185-6/+18
| * | | Greatly expanded README.md.Josh Haberman2016-02-181-10/+130
| * | | Use "node" as binary instead of "nodejs".Josh Haberman2016-02-181-1/+1
| * | | Fixed definition of extensions, and added CommonJS tests to Travis.Josh Haberman2016-02-183-2/+13
| * | | Fixed nested message scopes for CommonJS.Josh Haberman2016-02-187-28/+46
| * | | Added some documentation in comments.Josh Haberman2016-02-183-2/+31
| * | | Moved CommonJS-specific files to commonjs/.Josh Haberman2016-02-185-4/+4
| * | | CommonJS tests are now passing.Josh Haberman2016-02-1813-20/+152
| * | | WIP.Josh Haberman2016-02-186-64/+286
* | | | Merge pull request #1257 from thomasvl/objc_genericsThomas Van Lenten2016-02-1935-490/+588
|\ \ \ \ | |_|_|/ |/| | |
| * | | Support ObjC Generic CollectionsThomas Van Lenten2016-02-1835-490/+588
* | | | Merge pull request #1240 from jskeet/validate_groupJan Tattermusch2016-02-183-12/+77
|\ \ \ \
| * | | | Validate that end-group tags match their corresponding start-group tagsJon Skeet2016-02-153-12/+77
* | | | | Merge pull request #1258 from haberman/releasenotesJoshua Haberman2016-02-181-1/+5
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Some fixes for the most recent release notes.Josh Haberman2016-02-181-1/+5
|/ / / /
* | | | Merge pull request #1255 from thomasvl/mark_os_x_python_cpp_failingThomas Van Lenten2016-02-181-0/+4
|\ \ \ \
| * | | | List python_cpp as failing on OS XThomas Van Lenten2016-02-181-0/+4
|/ / / /
* | | | Merge pull request #1254 from thomasvl/disable_xctool_updatesThomas Van Lenten2016-02-182-8/+8
|\ \ \ \
| * | | | Disable the xctool updatesThomas Van Lenten2016-02-182-8/+8
|/ / / /
* | | | Merge pull request #1239 from jskeet/call_generate_protosJon Skeet2016-02-182-1/+6
|\ \ \ \ | |_|/ / |/| | |
| * | | Generate C# code whenever descriptor.proto changesJon Skeet2016-02-152-1/+6
| |/ /
* | | Merge pull request #1229 from keveman/unlimited_binary_protoJoshua Haberman2016-02-172-4/+23
|\ \ \
| * | | Added PROTOBUF_PYTHON_ALLOW_OVERSIZE_PROTOS macro and setting it whenManjunath Kudlur2016-02-162-4/+23
* | | | Merge pull request #1241 from jskeet/more-merge-wrapper-testsJan Tattermusch2016-02-171-2/+41
|\ \ \ \
| * | | | Add more tests around merging wrappersJon Skeet2016-02-151-2/+41
| | |/ / | |/| |
* | | | Merge pull request #260 from ejsd1989/issue-#242Joshua Haberman2016-02-162-4/+2
|\ \ \ \
| * | | | Removal of null checkeissajamil@gmail.com2015-03-291-3/+1
| * | | | Removal of null checkeissajamil@gmail.com2015-03-291-1/+1
* | | | | Merge pull request #1224 from google/rubysentinelJoshua Haberman2016-02-161-9/+9
|\ \ \ \ \
| * | | | | Removed 'optional' from proto3 syntax file.Josh Haberman2016-02-101-9/+9
* | | | | | Merge pull request #1247 from thomasvl/xctool_plain_outputThomas Van Lenten2016-02-161-5/+4
|\ \ \ \ \ \
| * | | | | | Move the xctool use of -reporter into a common spot and always use "plain" to...Thomas Van Lenten2016-02-161-5/+4
|/ / / / / /