aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
* | | Generate phpdoc in php generated files. (#2406)Paul Yang2016-12-014-119/+1229
* | | Merge pull request #2429 from thomasvl/issue1833_swift_prefixThomas Van Lenten2016-11-304-198/+424
|\ \ \
| * | | Add a swift_prefix file option.Thomas Van Lenten2016-11-304-198/+424
|/ / /
* | | Merge pull request #2403 from google/down-integrate-with-msvc-fixAdam Cozzette2016-11-23297-13691/+15542
|\ \ \
| * | | Fixed Ruby tests for JRuby 1.7Adam Cozzette2016-11-231-2/+4
| * | | Updated descriptor_pool.py to be compatible with Python 3Adam Cozzette2016-11-221-1/+1
| * | | Add a "u" suffix to tag numbers in generated codeAdam Cozzette2016-11-2221-276/+334
| * | | Fixed descriptor_pool_test.py for Python 2.6Adam Cozzette2016-11-221-1/+1
| * | | Updated failure_list_java.txt for Java conformance testAdam Cozzette2016-11-221-1/+0
| * | | Merge pull request #2400 from acozzette/jspb-test-fixesAdam Cozzette2016-11-227-10/+16
| |\ \ \
| | * | | Added back in binary serialization round-trip in message_test.jsAdam Cozzette2016-11-211-0/+7
| | * | | Fixed remaining JSPB test failuresAdam Cozzette2016-11-215-5/+10
| | * | | Updated message_test.js so that it does not depend on fromObjectAdam Cozzette2016-11-211-7/+1
| | * | | Updated enum names in test.proto to avoid conflicting with testbinary.protoAdam Cozzette2016-11-211-3/+3
| * | | | Merge pull request #2392 from xfxyjwf/fixdownFeng Xiao2016-11-214-18/+60
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Restore jenkins files.Feng Xiao2016-11-184-18/+60
| |/ / /
| * | | Update EXTRA_DIST lists.Feng Xiao2016-11-182-1/+4
| * | | Update conformance failure lists.Feng Xiao2016-11-182-12/+0
| * | | Add back missing LIBPROTOBUF_EXPORT.Feng Xiao2016-11-171-1/+1
| * | | Updated libprotoc.cmakeAdam Cozzette2016-11-171-0/+1
| * | | Merge branch 'master' into down-integrate-with-msvc-fixAdam Cozzette2016-11-1782-759/+1668
| |\ \ \ | | | |/ | | |/|
| * | | Integrated internal changes from GoogleAdam Cozzette2016-11-17286-13531/+15271
* | | | Merge pull request #2404 from wiktortomczak/masterFeng Xiao2016-11-221-0/+12
|\ \ \ \
| * | | | Support grpc plugin in py_proto_libraryWiktor Tomczak2016-11-221-0/+12
|/ / / /
* | | | Merge pull request #2398 from jbrianceau/no-static-init-define-fixFeng Xiao2016-11-211-1/+1
|\ \ \ \ | |_|/ / |/| | |
| * | | C++: Fix use with GOOGLE_PROTOBUF_NO_STATIC_INITIALIZERJulien Brianceau2016-11-211-1/+1
|/ / /
* | | Merge pull request #2383 from snapsam/patch-1Adam Cozzette2016-11-171-1/+1
|\ \ \
| * | | Update README.mdSamuel Rossoff (of The Ebon Blade)2016-11-171-1/+1
* | | | Merge pull request #2382 from zhsyourai/masterAdam Cozzette2016-11-171-4/+4
|\ \ \ \ | |/ / / |/| | |
| * | | Add LL to large constantzhsyourai2016-11-181-4/+4
|/ / /
* | | Rename Empty to GPBEmpty in php generated file.Paul Yang2016-11-168-8/+84
* | | Merge pull request #2362 from wujingchao/patch-1Adam Cozzette2016-11-161-2/+2
|\ \ \
| * | | Class is final but declares protected fieldwujingchao2016-11-141-2/+2
* | | | Merge pull request #2378 from ianfhunter/patch-1Adam Cozzette2016-11-161-1/+1
|\ \ \ \
| * | | | typoIan Hunter2016-11-161-1/+1
* | | | | Merge pull request #2367 from jbrianceau/add-missing-include-in-message-lite-ccAdam Cozzette2016-11-161-0/+1
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Add missing include in message_lite.ccJulien Brianceau2016-11-141-0/+1
* | | | | Fix jenkins tests.Feng Xiao2016-11-152-1/+5
* | | | | Merge pull request #2323 from marcinwyszynski/masterJoshua Haberman2016-11-152-0/+54
|\ \ \ \ \
| * | | | | Move variable declarations before actual codeMarcin Wyszynski2016-11-141-2/+2
| * | | | | Fix copy pasta in testMarcin Wyszynski2016-11-031-1/+1
| * | | | | More Ruby-eqsue interfaceMarcin Wyszynski2016-11-032-0/+54
* | | | | | Merge pull request #1907 from evokly/js-utf8-fixJoshua Haberman2016-11-153-18/+71
|\ \ \ \ \ \
| * | | | | | JS: Well, this is the right place for surrogates.Wojciech Mandrysz2016-11-151-9/+11
| * | | | | | JS: Re-added comment, moved surrogates code to the right placeWojciech Mandrysz2016-11-152-9/+10
| * | | | | | JS: Replaced fromCodePoint/codePointAt with fromCharCode/charCodeAt because o...Wojciech Mandrysz2016-10-103-18/+24
| * | | | | | JS: Added string encoding/decoding tests for UTF-8Wojciech Mandrysz2016-10-031-0/+23
| * | | | | | JS: Fixed UTF-8 string encoder/decoder for high codepoints.Wojciech Mandrysz2016-10-032-15/+36
* | | | | | | Merge pull request #2366 from jbrianceau/reland-fix-include-js-generatorFeng Xiao2016-11-141-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Fix #include in js_generator.ccJulien Brianceau2016-11-141-1/+1
| | |_|/ / / / | |/| | | | |