aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #3258 from TeBoring/3.3.xv3.3.23.3.xPaul Yang2017-06-2128-30/+46
|\
| * Update C++ generated code.Bo Yang2017-06-2113-13/+13
| * Update version number to 3.3.2Bo Yang2017-06-2115-17/+33
|/
* Merge pull request #3255 from TeBoring/3.3.x-3Paul Yang2017-06-2010-7/+28
|\
| * Remove inclusion of ext/json/php_json.h. (#3241)Jeff Ching2017-06-201-1/+0
| * Oneof field should be serialized even it's equal to default. (#3153)Paul Yang2017-06-203-1/+17
| * Add ARRAY for reserved name (#3150)Paul Yang2017-06-206-5/+11
|/
* Merge pull request #3085 from scpeters/issue_3059Feng Xiao2017-05-1914-0/+59
|\
| * regenerate plugin and profile message codeSteven Peters2017-05-112-0/+4
| * Use bool deterministic to suppress warningSteven Peters2017-05-1113-0/+55
* | Update jenkins Java deps.v3.3.1Feng Xiao2017-05-121-1/+1
* | Revert guava depedency to version 19.Feng Xiao2017-05-123-27/+14
|/
* Add LICENSE in package.xml (#3083)Paul Yang2017-05-111-0/+1
* Merge pull request #3074 from xfxyjwf/3.3.xFeng Xiao2017-05-1128-30/+46
|\
| * Update C++ generated code.Feng Xiao2017-05-0813-13/+13
| * Update version number to 3.3.1Feng Xiao2017-05-0815-17/+33
* | Fix upb load descriptor when no messages defined in prorto. (#3080)Paul Yang2017-05-111-0/+3
* | Fix c extension for php7.1. (#3077)Paul Yang2017-05-104-25/+98
|/
* Merge pull request #3073 from xfxyjwf/3.3.xFeng Xiao2017-05-081-1/+2
|\
| * Workaround gcc < 4.5.0 bugMario J. Rugiero2017-05-081-1/+2
* | Merge pull request #3064 from randomguy3/offset-typeFeng Xiao2017-05-081-1/+1
|\ \ | |/ |/|
| * Fix compilationrandomguy32017-05-061-1/+1
| * Fix offset type to match the tables it is used inAlex Merry2017-05-051-1/+1
|/
* Merge pull request #3057 from xfxyjwf/3.3.xFeng Xiao2017-05-057-5/+18
|\
| * Add missing LIBRPOTOC_EXPORT.Feng Xiao2017-05-041-2/+2
| * Skip C# test in C++ only distribution.Feng Xiao2017-05-041-0/+8
| * Add missing files to build files.Feng Xiao2017-05-045-3/+8
* | Merge pull request #3056 from acozzette/cherry-pick-pr-2873Adam Cozzette2017-05-053-14/+14
|\ \ | |/ |/|
| * Fix #1562 by using goog.crypt.byteArrayToString instead of String.fromCharCod...Paul Jolly2017-05-043-14/+14
|/
* Merge pull request #3055 from chrisn-arm/3.3.xFeng Xiao2017-05-041-0/+7
|\
| * Fix issue 3046: compilation on alpine 3.5Chris Nix2017-05-041-0/+7
|/
* Add prefix to enum value with reserved name. (#3020)v3.3.0Paul Yang2017-04-262-4/+5
* Add a test case for nested enum, which was missed previously. (#3010)Paul Yang2017-04-251-0/+1
* Add nested enum descriptor in php rumtime. (#3009)v3.3.0rc1Paul Yang2017-04-243-1/+11
* Update php version number to 3.3.0 (#3001)Paul Yang2017-04-242-6/+22
* Throw exception when parsing invalid data. (#3000)Paul Yang2017-04-216-49/+297
* Merge pull request #2996 from xfxyjwf/3.3.xFeng Xiao2017-04-201-1/+1
|\
| * Fix python3 issue.Feng Xiao2017-04-201-1/+1
* | Allow proto files to import descriptor.proto (#2995)Paul Yang2017-04-208-5/+51
|/
* Prepend "PB" to generated classes whose name are reserved words. (#2990)Paul Yang2017-04-208-61/+163
* Add test for nested enum for php (#2989)Paul Yang2017-04-194-0/+22
* Enum defined without package have incorrect class name. (#2988)Paul Yang2017-04-195-53/+54
* Make PHP c extension work with PHP7 (#2951)Paul Yang2017-04-1923-1187/+1891
* Merge pull request #2967 from xfxyjwf/3.3.xFeng Xiao2017-04-118-4/+528
|\
| * Cherry-pick cl/152450543Feng Xiao2017-04-118-2/+472
| * Cherry-pick cl/151775298Feng Xiao2017-04-112-2/+56
|/
* Merge pull request #2955 from xfxyjwf/3.3.xFeng Xiao2017-04-111-0/+1
|\
| * Add include for INT_MAXFeng Xiao2017-04-081-0/+1
* | cherrypick descriptor_pool.FindFileContainingSymbol by extensions (#2962)Jie Luo2017-04-104-8/+45
|/
* Merge pull request #2949 from xfxyjwf/3.3.xFeng Xiao2017-04-072-0/+10
|\
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-28 18:59:57 +0000