aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Fix up handing of fields with leading names that should be all caps.Thomas Van Lenten2016-03-084-6/+40
* Merge pull request #1306 from silviulica/masterJoshua Haberman2016-03-071-1/+1
|\
| * Update version to 3.0.0b2.post2Silviu Calinoiu2016-03-071-1/+1
* | Merge pull request #1304 from thomasvl/headerdocsThomas Van Lenten2016-03-0735-1363/+1985
|\ \
| * | HeaderDoc support in the library and generated sourcesThomas Van Lenten2016-03-0735-1363/+1985
|/ /
* | Merge pull request #1301 from avgweb/masterJon Skeet2016-03-075-131/+157
|\ \
| * | Replace StringBuilder with TextWriter in JsonFormatteravgweb2016-03-065-131/+157
|/ /
* | Merge pull request #1298 from craigcitro/fix_setupJoshua Haberman2016-03-051-0/+1
|\ \
| * | Add back the namespace_packages arg in setup.py.Craig Citro2016-03-051-0/+1
|/ /
* | Merge pull request #1139 from haberman/rubyjsoncamelJoshua Haberman2016-03-048-676/+1172
|\ \
| * | Updated upb from latest changes.Josh Haberman2016-02-182-244/+133
| * | Changed Ruby to properly camelCase its JSON by default.Josh Haberman2016-02-188-561/+1168
* | | Merge pull request #1292 from haberman/ruby-allow-descriptorJoshua Haberman2016-03-044-87/+117
|\ \ \
| * | | Removed the generated Ruby file from Makefile.am.Josh Haberman2016-03-031-1/+0
| * | | Generate well-known types in Ruby extension and prune unneeded proto2 depende...Josh Haberman2016-03-033-86/+117
|/ / /
* | | Merge pull request #1260 from legrosbuffle/masterPaul Yang2016-03-021-2/+4
|\ \ \
| * | | Make cpp generated enum constants constexpr when Options::proto_h isClement Courbet2016-02-191-2/+4
* | | | Merge pull request #1287 from jskeet/fix-typoJon Skeet2016-03-011-1/+1
|\ \ \ \
| * | | | Fix copy/paste typo in CodedInputStreamTestJon Skeet2016-03-011-1/+1
|/ / / /
* | | | Merge pull request #1274 from murgatroid99/node_relative_requiresJoshua Haberman2016-02-298-11/+160
|\ \ \ \
| * | | | Moved CommonJS-specific files into commonjs directorymurgatroid992016-02-244-12/+15
| * | | | Fix CommonJS relative require generation, and test itmurgatroid992016-02-248-11/+157
* | | | | Merge pull request #1286 from jskeet/idisposableJan Tattermusch2016-02-295-12/+152
|\ \ \ \ \
| * | | | | 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
| | |_|_|/ | |/| | |