Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | add java/util support based on java/util/pom.xml | Steven Parkes | 2016-03-11 | 2 | -0/+33 | |
* | | | Merge pull request #1291 from sergiocampama/devel | Thomas Van Lenten | 2016-03-14 | 1 | -1/+2 | |
|\ \ \ | ||||||
| * | | | Adds more information to Objective C error when the expected objc_class_prefi... | Sergio Campama | 2016-03-03 | 1 | -1/+2 | |
| | |/ | |/| | ||||||
* | | | Merge pull request #1312 from petewarden/master | Jisi Liu | 2016-03-12 | 1 | -2/+43 | |
|\ \ \ | |_|/ |/| | | ||||||
| * | | Merge remote-tracking branch 'upstream/master' | Pete Warden | 2016-03-09 | 76 | -2393/+3886 | |
| |\ \ | ||||||
| * | | | Added iOS settings to Bazel build | Pete Warden | 2016-03-09 | 1 | -3/+19 | |
| * | | | Updated library generation with iOS options | Pete Warden | 2016-02-23 | 1 | -2/+27 | |
* | | | | Merge pull request #1278 from smparkes/master | Jisi Liu | 2016-03-11 | 2 | -9/+27 | |
|\ \ \ \ | ||||||
| * | | | | pass correct args to protoc for java wellknown protos when used as an externa... | Steven Parkes | 2016-03-10 | 2 | -9/+27 | |
| | |/ / | |/| | | ||||||
* | | | | Merge pull request #1317 from benvanik/patch-1 | Feng Xiao | 2016-03-11 | 1 | -1/+3 | |
|\ \ \ \ | |/ / / |/| | | | ||||||
| * | | | Fixing compilation error when building with emscripten. | Ben Vanik | 2016-03-11 | 1 | -1/+3 | |
|/ / / | ||||||
* | | | Merge pull request #1299 from tatraian/master | Feng Xiao | 2016-03-08 | 1 | -1/+5 | |
|\ \ \ | ||||||
| * | | | Comment has been added to fix (issue #1266) | Antal Tátrai | 2016-03-08 | 1 | -0/+4 | |
| * | | | Fix compiling clang/libc++ builds. (Issue: #1266) | Antal Tátrai | 2016-03-05 | 1 | -1/+1 | |
* | | | | Merge pull request #1309 from thomasvl/leading_special_prop_names | Thomas Van Lenten | 2016-03-08 | 4 | -6/+40 | |
|\ \ \ \ | ||||||
| * | | | | Fix up handing of fields with leading names that should be all caps. | Thomas Van Lenten | 2016-03-08 | 4 | -6/+40 | |
|/ / / / | ||||||
* | | | | Merge pull request #1306 from silviulica/master | Joshua Haberman | 2016-03-07 | 1 | -1/+1 | |
|\ \ \ \ | ||||||
| * | | | | Update version to 3.0.0b2.post2 | Silviu Calinoiu | 2016-03-07 | 1 | -1/+1 | |
* | | | | | Merge pull request #1304 from thomasvl/headerdocs | Thomas Van Lenten | 2016-03-07 | 35 | -1363/+1985 | |
|\ \ \ \ \ | ||||||
| * | | | | | HeaderDoc support in the library and generated sources | Thomas Van Lenten | 2016-03-07 | 35 | -1363/+1985 | |
|/ / / / / | ||||||
* | | | | | Merge pull request #1301 from avgweb/master | Jon Skeet | 2016-03-07 | 5 | -131/+157 | |
|\ \ \ \ \ | ||||||
| * | | | | | Replace StringBuilder with TextWriter in JsonFormatter | avgweb | 2016-03-06 | 5 | -131/+157 | |
|/ / / / / | ||||||
* | | | | | Merge pull request #1298 from craigcitro/fix_setup | Joshua Haberman | 2016-03-05 | 1 | -0/+1 | |
|\ \ \ \ \ | |_|/ / / |/| | | | | ||||||
| * | | | | Add back the namespace_packages arg in setup.py. | Craig Citro | 2016-03-05 | 1 | -0/+1 | |
|/ / / / | ||||||
* | | | | Merge pull request #1139 from haberman/rubyjsoncamel | Joshua Haberman | 2016-03-04 | 8 | -676/+1172 | |
|\ \ \ \ | ||||||
| * | | | | Updated upb from latest changes. | Josh Haberman | 2016-02-18 | 2 | -244/+133 | |
| * | | | | Changed Ruby to properly camelCase its JSON by default. | Josh Haberman | 2016-02-18 | 8 | -561/+1168 | |
* | | | | | Merge pull request #1292 from haberman/ruby-allow-descriptor | Joshua Haberman | 2016-03-04 | 4 | -87/+117 | |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | ||||||
| * | | | | Removed the generated Ruby file from Makefile.am. | Josh Haberman | 2016-03-03 | 1 | -1/+0 | |
| * | | | | Generate well-known types in Ruby extension and prune unneeded proto2 depende... | Josh Haberman | 2016-03-03 | 3 | -86/+117 | |
|/ / / / | ||||||
* | | | | Merge pull request #1260 from legrosbuffle/master | Paul Yang | 2016-03-02 | 1 | -2/+4 | |
|\ \ \ \ | ||||||
| * | | | | Make cpp generated enum constants constexpr when Options::proto_h is | Clement Courbet | 2016-02-19 | 1 | -2/+4 | |
* | | | | | Merge pull request #1287 from jskeet/fix-typo | Jon Skeet | 2016-03-01 | 1 | -1/+1 | |
|\ \ \ \ \ | ||||||
| * | | | | | Fix copy/paste typo in CodedInputStreamTest | Jon Skeet | 2016-03-01 | 1 | -1/+1 | |
|/ / / / / | ||||||
* | | | | | Merge pull request #1274 from murgatroid99/node_relative_requires | Joshua Haberman | 2016-02-29 | 8 | -11/+160 | |
|\ \ \ \ \ | ||||||
| * | | | | | Moved CommonJS-specific files into commonjs directory | murgatroid99 | 2016-02-24 | 4 | -12/+15 | |
| * | | | | | Fix CommonJS relative require generation, and test it | murgatroid99 | 2016-02-24 | 8 | -11/+157 | |
| | |_|_|/ | |/| | | | ||||||
* | | | | | Merge pull request #1286 from jskeet/idisposable | Jan Tattermusch | 2016-02-29 | 5 | -12/+152 | |
|\ \ \ \ \ | ||||||
| * | | | | | Implement IDisposable for CodedInputStream and CodedOutputStream | Jon Skeet | 2016-02-29 | 5 | -12/+152 | |
|/ / / / / | ||||||
* | | | | | Merge pull request #1233 from davidzchen/python-path | Jisi Liu | 2016-02-25 | 4 | -96/+51 | |
|\ \ \ \ \ | ||||||
| * | | | | | Remove hack for building Python support with Bazel. | David Z. Chen | 2016-02-25 | 4 | -96/+51 | |
|/ / / / / | ||||||
* | | | | | 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 | |
|\ \ \ \ \ | |/ / / / |/| | | | |