Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | Merge branch 'master' of github.com:google/protobuf | Jisi Liu | 2016-03-30 | 20 | -319/+485 | |
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | ||||||
| * | | | | | Integrate google internal changes. | Jisi Liu | 2016-03-30 | 145 | -1440/+5155 | |
* | | | | | | Fix to csharp_options - initialize internal_access to false. | Jon Skeet | 2016-04-08 | 1 | -1/+2 | |
* | | | | | | Merge pull request #1393 from gvaish/master | Jon Skeet | 2016-04-07 | 3 | -1/+6 | |
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | ||||||
| * | | | | | Added support for internal_access for C# | Gaurav Vaish | 2016-04-07 | 3 | -1/+6 | |
* | | | | | | Merge pull request #1392 from anandolee/master | Jie Luo | 2016-04-07 | 8 | -19/+41 | |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | ||||||
| * | | | | | sync the Manually integrate changes in google3/third_party | Jie Luo | 2016-04-06 | 8 | -19/+41 | |
* | | | | | | Add more documentation for csharp_options.h | Jon Skeet | 2016-04-06 | 2 | -6/+18 | |
* | | | | | | Line-wrapping changes only for C# generator code | Jon Skeet | 2016-04-06 | 20 | -44/+94 | |
* | | | | | | Merge pull request #1349 from gvaish/master | Jon Skeet | 2016-04-05 | 31 | -84/+176 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Added access_level for types | Gaurav Vaish | 2016-04-05 | 31 | -84/+176 | |
| | |_|_|/ / | |/| | | | | ||||||
* / | | | | | Added deprecated option handling for objective-c generator | Oleg Vereshko | 2016-04-04 | 5 | -11/+41 | |
|/ / / / / | ||||||
* | | / / | Replace #include <iostream> with #include <ostream> | Adam Michalik | 2016-03-30 | 1 | -1/+1 | |
| |_|/ / |/| | | | ||||||
* | | | | Use the T() instead of NULL for the default value. | Jisi Liu | 2016-03-29 | 1 | -1/+1 | |
* | | | | Update coded_stream.h | topillar | 2016-03-22 | 1 | -1/+1 | |
* | | | | Shrink ObjC overhead (generated size and some runtime sizes) | Thomas Van Lenten | 2016-03-17 | 16 | -276/+357 | |
* | | | | 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 | |
| | |/ / | |/| | | ||||||
* | | | | 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 | |
* | | | | | Fix up handing of fields with leading names that should be all caps. | Thomas Van Lenten | 2016-03-08 | 1 | -6/+9 | |
* | | | | | HeaderDoc support in the library and generated sources | Thomas Van Lenten | 2016-03-07 | 7 | -20/+33 | |
|/ / / / | ||||||
* / / / | Generate well-known types in Ruby extension and prune unneeded proto2 depende... | Josh Haberman | 2016-03-03 | 1 | -11/+73 | |
|/ / / | ||||||
* | | | 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 | |
* | | | | Fix CommonJS relative require generation, and test it | murgatroid99 | 2016-02-24 | 1 | -1/+15 | |
* | | | | 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 | 2 | -57/+236 | |
|\ \ \ \ \ | ||||||
| * | | | | | Fixed definition of extensions, and added CommonJS tests to Travis. | Josh Haberman | 2016-02-18 | 1 | -1/+8 | |
| * | | | | | Fixed nested message scopes for CommonJS. | Josh Haberman | 2016-02-18 | 1 | -7/+5 | |
| * | | | | | CommonJS tests are now passing. | Josh Haberman | 2016-02-18 | 1 | -1/+5 | |
| * | | | | | WIP. | Josh Haberman | 2016-02-18 | 2 | -57/+227 | |
| | |/ / / | |/| | | | ||||||
* / | | | | Support ObjC Generic Collections | Thomas Van Lenten | 2016-02-18 | 18 | -132/+237 | |
|/ / / / | ||||||
* | | | | 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 #1144 from dongjoon-hyun/remove_redundant_the | Joshua Haberman | 2016-02-11 | 4 | -5/+5 | |
|\ \ \ \ \ | ||||||
| * | | | | | Remove redundant `the` in comments. | Dongjoon Hyun | 2016-02-03 | 4 | -5/+5 | |
* | | | | | | Merge pull request #1194 from Photonios/master | Joshua Haberman | 2016-02-11 | 6 | -37/+37 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Fixed unused parameters and extra ';' | Swen Kooij | 2016-01-28 | 6 | -37/+37 | |
* | | | | | | | Merge pull request #1217 from jhump/jh/make-warning-useful | Joshua Haberman | 2016-02-11 | 1 | -3/+3 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | make 'no syntax' warning useful by showing which file | Joshua Humphries | 2016-02-06 | 1 | -3/+3 | |
* | | | | | | | | Merge pull request #1185 from kkm000/icl-fix | Joshua Haberman | 2016-02-10 | 2 | -4/+4 | |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | ||||||
| * | | | | | | | Fix Intel compiler warnings in include files on Windows | kkm | 2016-01-27 | 2 | -4/+4 | |
| |/ / / / / / | ||||||
* | | | | | | | Rename Preconditions to ProtoPreconditions | Jon Skeet | 2016-02-04 | 1 | -2/+2 | |
* | | | | | | | Rename GeneratedCodeInfo to GeneratedClrTypeInfo | Jon Skeet | 2016-02-04 | 1 | -4/+4 | |
| |/ / / / / |/| | | | | | ||||||
* | | | | | | Integrate from google internal. | Jisi Liu | 2016-01-29 | 8 | -61/+1435 | |
|/ / / / / |