aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge 3.3.x into masterBo Yang2017-07-1854-88/+259
|\
| * 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
| |/
* | remove pass by reference for php setters (#3344)Brent Shaffer2017-07-1724-64/+63
* | Fix Implicit Return Types (#3363)Richard Fussenegger2017-07-171-2/+2
* | Initial value in generated code cannot be used by c extension. (#3367)Paul Yang2017-07-145-2/+35
* | removes an accidental newline in printing for the php generator (#3333)Brent Shaffer2017-07-131-1/+1
* | Add map iterator for c extension (#3350)Paul Yang2017-07-136-5/+157
* | Add space between arrow and casted type (#3353)Paul Yang2017-07-133-27/+27
* | Merge pull request #3327 from htuch/fix-3322Feng Xiao2017-07-131-7/+0
|\ \
| * | Use consistent hash across NDEBUG/!NDEBUG builds.Harvey Tuch2017-07-071-7/+0
* | | Fix repository URL in C# project fileJon Skeet2017-07-131-1/+1
* | | C#: Implement IReadOnlyDictionary<K,V> in MapField<K,V>Jean-Rémy Bancel2017-07-122-0/+27
* | | Fix missing std::tr1::hash on GCC 4.1 (#2907)Matt Hauck2017-07-101-2/+4
* | | Add std:: namespace prefix to set and map (#3332)tanderson-google2017-07-0939-84/+82
* | | Uncomment php tests (#3301)Paul Yang2017-07-092-416/+416
|/ /
* | Merge pull request #2482 from andreaseger/fix_ruby_timestamp_accuracyAdam Cozzette2017-07-062-3/+11
|\ \
| * | change test for nanosecond accurate timestampsAndreas Eger2017-05-131-2/+5
| * | fix floating point accuracy problem in Timestamp#to_fAndreas Eger2017-05-132-3/+8
* | | add Grpc Protobuf validation (#3311)MaDuo2017-07-051-0/+1
* | | Merge pull request #3315 from thomasvl/mutate_unknownsThomas Van Lenten2017-07-052-2/+3
|\ \ \