Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | 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 | 7 | -61/+1432 | |
|/ / / / | ||||||
* | | | | Avoid upcasting uninitialized pointers | Brian Silverman | 2016-01-20 | 1 | -2/+2 | |
* | | | | Merge pull request #789 from motahan/solaris64_fix | Feng Xiao | 2016-01-20 | 3 | -2/+7 | |
|\ \ \ \ | ||||||
| * | | | | Fixing compile errors on Solaris in 64-bit mode | Mohamed El-Tahan | 2015-09-02 | 3 | -2/+7 | |
* | | | | | Fix compiler warning from repeated_field.h | John Burke | 2016-01-19 | 1 | -1/+1 | |
* | | | | | Merge pull request #896 from jhump/jh/fix-ioexception-vs-invalidprotobuf-exce... | Feng Xiao | 2016-01-16 | 2 | -10/+9 | |
|\ \ \ \ \ | ||||||
| * | | | | | fully qualify invocations of static methods on GeneratedMessage | Joshua Humphries | 2016-01-15 | 1 | -6/+6 | |
| * | | | | | throw IOException instead of InvalidProtocolBufferException when appropriate | Joshua Humphries | 2016-01-15 | 2 | -10/+9 | |
* | | | | | | Make sure that | Jon Skeet | 2016-01-15 | 1 | -0/+2 | |
|/ / / / / | ||||||
* | | | | | Prohibit null values in map fields | Jon Skeet | 2016-01-11 | 1 | -2/+1 | |
* | | | | | Fix appveyor build. | Feng Xiao | 2016-01-09 | 1 | -1/+1 | |
* | | | | | Patch internal change 111557819. | Feng Xiao | 2016-01-06 | 6 | -4/+179 | |
* | | | | | Fix for Visual Studio 2008. | Feng Xiao | 2015-12-30 | 4 | -35/+27 | |
* | | | | | Fix a misplaced macro. | Feng Xiao | 2015-12-28 | 1 | -5/+5 | |
* | | | | | Fix a compiler warning. | Feng Xiao | 2015-12-28 | 1 | -0/+2 | |
* | | | | | Add missing files to EXTRA_DIST. | Feng Xiao | 2015-12-28 | 4 | -270/+6 | |
* | | | | | Merge branch master into v3.0.0-beta-2 | Feng Xiao | 2015-12-21 | 2 | -4/+29 | |
|\ \ \ \ \ | ||||||
| * \ \ \ \ | Merge pull request #1062 from rinatz/master | Feng Xiao | 2015-12-18 | 1 | -3/+28 | |
| |\ \ \ \ \ | ||||||
| | * | | | | | Initialize singleton instance by GoogleOnceInit() | Kenichiro IDA | 2015-12-19 | 1 | -2/+24 | |
| | * | | | | | Alter FileDescriptorTables::kEmpty to GetEmptyInstance() | Kenichiro IDA | 2015-12-17 | 1 | -3/+6 | |
| * | | | | | | Make ToString() valid without a type registry | Jon Skeet | 2015-12-15 | 1 | -1/+1 | |
| |/ / / / / | ||||||
* | | | | | | Make conformance tests build for C++ and Java. | Feng Xiao | 2015-12-16 | 1 | -2/+2 | |
* | | | | | | Remove the usage of C++11 override. | Feng Xiao | 2015-12-14 | 1 | -2/+2 | |
* | | | | | | Down-integrate from internal code base. | Feng Xiao | 2015-12-11 | 101 | -2209/+6756 | |
|/ / / / / | ||||||
* | | | | | Merge pull request #1025 from Yangqing/master | Feng Xiao | 2015-12-09 | 1 | -47/+38 | |
|\ \ \ \ \ | ||||||
| * | | | | | Minor changes to match the internal version | Yangqing Jia | 2015-12-09 | 1 | -6/+7 | |
| * | | | | | Arena type traits standardization. | Yangqing Jia | 2015-12-05 | 1 | -47/+37 | |
* | | | | | | Merge pull request #1033 from c0nk/wip-implicit-cast-fix | Feng Xiao | 2015-12-09 | 1 | -1/+1 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Fix narrowing implicit cast in generated message [NFC] | Kal Conley | 2015-12-08 | 1 | -1/+1 | |
| |/ / / / / | ||||||
* / / / / / | Use angle bracket for well known type proto header. | Bo Yang | 2015-12-08 | 19 | -79/+91 | |
|/ / / / / | ||||||
* | | | | | Tweak the error message as the generate is in the core binary these days. | Thomas Van Lenten | 2015-12-02 | 1 | -1/+1 |