aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Adds fluent setters for PHP (#3130)Brent Shaffer2017-05-292-0/+15
* Merge pull request #3113 from phst/masterAdam Cozzette2017-05-261-1/+3
|\
| * Improve fix for https://github.com/google/protobuf/issues/295Philipp Stephani2017-05-231-1/+3
* | update csharp README and fix .NET 3.5 build errorJohn Brock2017-05-252-44/+23
* | Add IncludeSource in csproj as per review commentsJon Skeet2017-05-241-0/+1
* | Convert C# projects to MSBuild (csproj) formatJon Skeet2017-05-2433-388/+269
* | Removing undefined behavior and compiler warnings (#1315)brian-peloton2017-05-237-32/+38
* | Merge pull request #3126 from mbrukman/fix-readme-formattingFeng Xiao2017-05-231-38/+45
|\ \
| * | Fix Markdown formatting in README.Misha Brukman2017-05-231-38/+45
| |/
* | Merge pull request #3117 from KarrokDC/masterFeng Xiao2017-05-231-0/+6
|\ \
| * | show help if protoc is called without any arguments, pre-empts -h and --help ...Dennis Cappendijk2017-05-221-0/+6
| |/
* | Merge pull request #3103 from sergiocampama/perfThomas Van Lenten2017-05-231-0/+106
|\ \ | |/ |/|
| * Adds serial and parallel parsing tests to check if parallel parsing is faster...Sergio Campama2017-05-231-0/+106
|/
* Merge pull request #3104 from thomasvl/ext_registry_copyThomas Van Lenten2017-05-177-23/+187
|\
| * Fix ExtensionRegistry copying and add tests.Thomas Van Lenten2017-05-177-23/+187
|/
* Merge pull request #2815 from devwout/ruby_json_emit_defaultsJoshua Haberman2017-05-152-33/+149
|\
| * Ruby tests compare parsed JSON instead of raw JSONEwout2017-03-171-12/+89
| * Ruby version optionally emits default values in JSON encoding.Ewout2017-03-092-29/+68
* | Merge pull request #3062 from Oppen/masterFeng Xiao2017-05-081-1/+2
|\ \
| * | Workaround gcc < 4.5.0 bugMario J. Rugiero2017-05-051-1/+2
* | | Add compatibility test for php. (#3041)Paul Yang2017-05-056-4/+129
|/ /
* | Merge pull request #3043 from acozzette/javascriptAdam Cozzette2017-05-041-4/+0
|\ \
| * | Removed mention of Buffer in byteSourceToUint8ArrayAdam Cozzette2017-05-021-4/+0
|/ /
* | Merge pull request #2873 from myitcv/fix_1562Adam Cozzette2017-05-023-14/+14
|\ \
| * | Fix #1562 by using goog.crypt.byteArrayToString instead of String.fromCharCod...Paul Jolly2017-05-023-14/+14
|/ /
* | Merge pull request #3024 from acozzette/merge-3.3-to-masterAdam Cozzette2017-05-01313-6623/+15491
|\ \
| * \ Merge remote-tracking branch 'remotes/google/3.3.x' into merge-3.3-to-masterAdam Cozzette2017-04-27313-6623/+15491
| |\ \
| | * | 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
| | |\ \
| | | * | Cleanup reflection objects for map entry.Feng Xiao2017-04-062-0/+10
| | * | | Merge pull request #2942 from xfxyjwf/3.3.xFeng Xiao2017-04-0624-42/+150
| | |\| |
| | | * | Update generated code.Feng Xiao2017-04-0513-26/+26
| | | * | Update version number and changelog for 3.3.0Feng Xiao2017-04-0511-16/+124
| | |/ /
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-29 22:24:34 +0000