aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Enable CLANG_WARN_NULLABLE_TO_NONNULL_CONVERSION for the projects.Thomas Van Lenten2015-12-078-53/+156
* Merge pull request #1024 from martinmaly/wktJisi Liu2015-12-051-0/+3
|\
| * Making _genproto rules public.Martin Maly2015-12-041-0/+3
* | Merge pull request #1022 from haberman/python-conformance2Joshua Haberman2015-12-048-5/+186
|\ \ | |/ |/|
| * Remove all bare strings as exceptions.Josh Haberman2015-12-041-3/+6
| * Added Python failure lists, and fixes to make sure failure propagates.Josh Haberman2015-12-034-1/+33
| * Added JSON support to Python conformance tests.Josh Haberman2015-12-021-3/+8
| * Conformance test implementation for Python.Josh Haberman2015-12-025-5/+146
* | Merge pull request #1023 from girving/py3Joshua Haberman2015-12-042-0/+3
|\ \
| * | Add srcs_version = "PY2AND3" in BUILD filesGeoffrey Irving2015-12-032-0/+3
|/ /
* | Merge pull request #1014 from damienmg/masterJisi Liu2015-12-031-0/+5
|\ \
| * | Fix headers for gmock.BUILDDamien Martin-Guillerez2015-12-011-0/+5
* | | Merge pull request #1021 from thomasvl/fix_err_msgThomas Van Lenten2015-12-0212-12/+12
|\ \ \
| * | | Tweak the error message as the generate is in the core binary these days.Thomas Van Lenten2015-12-0212-12/+12
|/ / /
* | | Merge pull request #1020 from thomasvl/block_nilThomas Van Lenten2015-12-021-5/+136
|\ \ \ | |_|/ |/| |
| * | Check and throw errors for nil values/keys (like NSDictionary).Thomas Van Lenten2015-12-021-5/+136
* | | Merge pull request #1019 from thomasvl/correct_conformance_compileThomas Van Lenten2015-12-022-2/+8
|\ \ \ | |/ / |/| |
| * | Ensure the conformance build of objc code is using the Mac OS X SDK andThomas Van Lenten2015-12-022-2/+8
|/ /
* | Merge pull request #1000 from jskeet/any-formatJon Skeet2015-12-026-525/+894
|\ \
| * | Handle JSON parsing for Any.Jon Skeet2015-12-025-509/+761
| * | JSON formatting for Any.Jon Skeet2015-12-022-18/+135
|/ /
* | Merge pull request #1016 from tswast/tutorial-regionsFeng Xiao2015-12-011-3/+17
|\ \ | |/ |/|
| * Add region tags for protocol buffers tutorials.Tim Swast2015-12-011-3/+17
|/
* Merge pull request #998 from tswast/goexampleFeng Xiao2015-11-308-0/+410
|\
| * Add a Go language example.Tim Swast2015-11-258-0/+410
* | Merge pull request #1011 from c0nk/wip-implicit-cast-fixFeng Xiao2015-11-302-6/+8
|\ \
| * | Fix some narrowing implicit casts [NFC]Kal Conley2015-11-282-6/+8
|/ /
* | Merge pull request #1007 from dlh3/patch-1Feng Xiao2015-11-251-2/+2
|\ \
| * | Fix typo in LazyField javadocDave Hughes2015-11-241-2/+2
|/ /
* | Merge pull request #1005 from oon3m0oo/emscriptenFeng Xiao2015-11-242-1/+5
|\ \
| * | Adds support for buliding protobuf with emscripten; we just needed the proper...Craig Donner2015-11-242-1/+5
|/ /
* | Merge pull request #1003 from sainaetr/patch-1Thomas Van Lenten2015-11-231-0/+1
|\|
| * Update GPBProtocolBuffers.hOsman Cihangir2015-11-241-0/+1
|/
* Merge pull request #1001 from thomasvl/fix_last_objc_conformance_testsThomas Van Lenten2015-11-232-7/+2
|\
| * Set the stream limit to the length of the data.Thomas Van Lenten2015-11-232-7/+2
|/
* Merge pull request #980 from thomasvl/obj_conformanceThomas Van Lenten2015-11-237-7/+245
|\
| * Add support for the conformance test for objc when run on OS XThomas Van Lenten2015-11-187-7/+245
* | Merge pull request #990 from jskeet/namingJon Skeet2015-11-2229-245/+208
|\ \
| * | Generated code changes for previous commit (basically InternalBuildGeneratedF...Jon Skeet2015-11-2221-22/+22
| * | Tidy up reflection in advance of attempting to implement DynamicMessage.Jon Skeet2015-11-2210-225/+188
|/ /
* | Merge pull request #994 from jskeet/type-registryJon Skeet2015-11-224-0/+279
|\ \
| * | Added the type registry in advance of implementing Any support.Jon Skeet2015-11-214-0/+279
|/ /
* | Merge pull request #988 from gabikliot/CSharp-SampleUsage-Big-FixJan Tattermusch2015-11-191-2/+5
|\ \
| * | Removed redundant comment.Gabriel Kliot2015-11-191-1/+0
| * | Fixed a bug in CSharp SampleUsage.Gabriel Kliot2015-11-181-1/+5
| |/
* | Merge pull request #989 from jskeet/rename-umbrellaJan Tattermusch2015-11-1910-42/+37
|\ \
| * | Rename "umbrella" to "reflection" consistently.Jon Skeet2015-11-1910-42/+37
* | | Merge pull request #977 from lberki/masterJisi Liu2015-11-191-0/+2
|\ \ \ | |/ / |/| |
| * | add headersLukacs T. Berki2015-11-161-0/+2
* | | Merge pull request #974 from jskeet/parserJon Skeet2015-11-1925-122/+244
|\ \ \