aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* 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
|\
| * 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
| | | |_|/ / | | |/| | |
| * | | | | Merge pull request #2368 from jbrianceau/fix-json-style-in-project-jsonFeng Xiao2016-11-141-1/+1
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Fix csharp/src/Google.Protobuf.Test/project.jsonJulien Brianceau2016-11-141-1/+1
| |/ / / /
| * | | | Merge pull request #2364 from haberman/jslicenseJoshua Haberman2016-11-141-1/+1
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | Fixed JavaScript license declaration.Josh Haberman2016-11-141-1/+1
| |/ / /
| * | | Merge pull request #2358 from ckennelly/masterFeng Xiao2016-11-111-15/+1
| |\ \ \
| | * | | Resolve old TODO for StringTypeHandler.Chris Kennelly2016-11-111-15/+1
| |/ / /
| * | | Merge pull request #2353 from guptasu/masterFeng Xiao2016-11-113-10/+27
| |\ \ \
| | * | | Made helper code also consider package name 'proto2' when dealing with Messag...guptasu2016-11-103-10/+27
| * | | | Merge pull request #2357 from D3Hunter/masterFeng Xiao2016-11-111-1/+1
| |\ \ \ \
| | * | | | #2356 : fix ExceptionInInitializerError on IBM J9Time2016-11-111-1/+1
| |/ / / /
| * | | | Fix php c extension on 32-bit machines. (#2348)Paul Yang2016-11-107-17/+187