aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Expand)AuthorAge
* Merge pull request #2403 from google/down-integrate-with-msvc-fixGravatar Adam Cozzette2016-11-23
|\
| * Fixed Ruby tests for JRuby 1.7Gravatar Adam Cozzette2016-11-23
| * Updated descriptor_pool.py to be compatible with Python 3Gravatar Adam Cozzette2016-11-22
| * Add a "u" suffix to tag numbers in generated codeGravatar Adam Cozzette2016-11-22
| * Fixed descriptor_pool_test.py for Python 2.6Gravatar Adam Cozzette2016-11-22
* | Merge pull request #2404 from wiktortomczak/masterGravatar Feng Xiao2016-11-22
|\ \
| * | Support grpc plugin in py_proto_libraryGravatar Wiktor Tomczak2016-11-22
|/ /
| * Updated failure_list_java.txt for Java conformance testGravatar Adam Cozzette2016-11-22
| * Merge pull request #2400 from acozzette/jspb-test-fixesGravatar Adam Cozzette2016-11-22
| |\
| | * Added back in binary serialization round-trip in message_test.jsGravatar Adam Cozzette2016-11-21
* | | Merge pull request #2398 from jbrianceau/no-static-init-define-fixGravatar Feng Xiao2016-11-21
|\ \ \
| | * \ Merge pull request #2392 from xfxyjwf/fixdownGravatar Feng Xiao2016-11-21
| | |\ \
| | | | * Fixed remaining JSPB test failuresGravatar Adam Cozzette2016-11-21
| | | | * Updated message_test.js so that it does not depend on fromObjectGravatar Adam Cozzette2016-11-21
| | | | * Updated enum names in test.proto to avoid conflicting with testbinary.protoGravatar Adam Cozzette2016-11-21
| | | |/ | | |/|
| * / | C++: Fix use with GOOGLE_PROTOBUF_NO_STATIC_INITIALIZERGravatar Julien Brianceau2016-11-21
|/ / /
| | * Restore jenkins files.Gravatar Feng Xiao2016-11-18
| |/
| * Update EXTRA_DIST lists.Gravatar Feng Xiao2016-11-18
| * Update conformance failure lists.Gravatar Feng Xiao2016-11-18
| * Add back missing LIBPROTOBUF_EXPORT.Gravatar Feng Xiao2016-11-17
| * Updated libprotoc.cmakeGravatar Adam Cozzette2016-11-17
| * Merge branch 'master' into down-integrate-with-msvc-fixGravatar Adam Cozzette2016-11-17
| |\ | |/ |/|
| * Integrated internal changes from GoogleGravatar Adam Cozzette2016-11-17
* | Merge pull request #2383 from snapsam/patch-1Gravatar Adam Cozzette2016-11-17
|\ \
* \ \ Merge pull request #2382 from zhsyourai/masterGravatar Adam Cozzette2016-11-17
|\ \ \
| | * | Update README.mdGravatar Samuel Rossoff (of The Ebon Blade)2016-11-17
| |/ / |/| |
| * | Add LL to large constantGravatar zhsyourai2016-11-18
|/ /
* | Rename Empty to GPBEmpty in php generated file.Gravatar Paul Yang2016-11-16
* | Merge pull request #2362 from wujingchao/patch-1Gravatar Adam Cozzette2016-11-16
|\ \
* \ \ Merge pull request #2378 from ianfhunter/patch-1Gravatar Adam Cozzette2016-11-16
|\ \ \
* \ \ \ Merge pull request #2367 from jbrianceau/add-missing-include-in-message-lite-ccGravatar Adam Cozzette2016-11-16
|\ \ \ \
| | * | | typoGravatar Ian Hunter2016-11-16
| |/ / / |/| | |
* | | | Fix jenkins tests.Gravatar Feng Xiao2016-11-15
* | | | Merge pull request #2323 from marcinwyszynski/masterGravatar Joshua Haberman2016-11-15
|\ \ \ \
* \ \ \ \ Merge pull request #1907 from evokly/js-utf8-fixGravatar Joshua Haberman2016-11-15
|\ \ \ \ \
| * | | | | JS: Well, this is the right place for surrogates.Gravatar Wojciech Mandrysz2016-11-15
| * | | | | JS: Re-added comment, moved surrogates code to the right placeGravatar Wojciech Mandrysz2016-11-15
* | | | | | Merge pull request #2366 from jbrianceau/reland-fix-include-js-generatorGravatar Feng Xiao2016-11-14
|\ \ \ \ \ \
* \ \ \ \ \ \ Merge pull request #2368 from jbrianceau/fix-json-style-in-project-jsonGravatar Feng Xiao2016-11-14
|\ \ \ \ \ \ \
| * | | | | | | Fix csharp/src/Google.Protobuf.Test/project.jsonGravatar Julien Brianceau2016-11-14
|/ / / / / / /
| | | | * / / Add missing include in message_lite.ccGravatar Julien Brianceau2016-11-14
| |_|_|/ / / |/| | | | |
| * | | | | Fix #include in js_generator.ccGravatar Julien Brianceau2016-11-14
|/ / / / /
| | * | | Move variable declarations before actual codeGravatar Marcin Wyszynski2016-11-14
* | | | | Merge pull request #2364 from haberman/jslicenseGravatar Joshua Haberman2016-11-14
|\ \ \ \ \
| * | | | | Fixed JavaScript license declaration.Gravatar Josh Haberman2016-11-14
|/ / / / /
| | | * / Class is final but declares protected fieldGravatar wujingchao2016-11-14
| |_|/ / |/| | |
* | | | Merge pull request #2358 from ckennelly/masterGravatar Feng Xiao2016-11-11
|\ \ \ \
| * | | | Resolve old TODO for StringTypeHandler.Gravatar Chris Kennelly2016-11-11
|/ / / /
* | | | Merge pull request #2353 from guptasu/masterGravatar Feng Xiao2016-11-11
|\ \ \ \
* \ \ \ \ Merge pull request #2357 from D3Hunter/masterGravatar Feng Xiao2016-11-11
|\ \ \ \ \