Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #3770 from pherl/3.5-integrate | Jisi Liu | 2017-10-19 | 114 | -3115/+3684 |
|\ | |||||
| * | Fix Java 1.6 compile | Jisi Liu | 2017-10-18 | 1 | -2/+2 |
| * | Fix JS conformance tests | Jisi Liu | 2017-10-18 | 1 | -6/+0 |
| * | Fix bazel build | Jisi Liu | 2017-10-18 | 2 | -4/+3 |
| * | Update descriptor protos | Jisi Liu | 2017-10-18 | 4 | -4/+20 |
| * | Merge branch 'master' of github.com:google/protobuf | Jisi Liu | 2017-10-18 | 1 | -13/+21 |
| |\ | |||||
| * | | Merge from google internal | Jisi Liu | 2017-10-18 | 107 | -3101/+3661 |
* | | | Merge pull request #3751 from uykusuz/master | Jisi Liu | 2017-10-18 | 1 | -0/+4 |
|\ \ \ | |||||
| * | | | fixes issue #3750 | Boris Broenner | 2017-10-14 | 1 | -0/+4 |
* | | | | Merge pull request #3764 from zearen/patch-1 | Jisi Liu | 2017-10-18 | 1 | -0/+1 |
|\ \ \ \ | |||||
| * | | | | Update third_party.md | Zearen Wover | 2017-10-09 | 1 | -0/+1 |
* | | | | | Merge pull request #3698 from hesmar/hesmar/fixProtocIncludeDirs | Jisi Liu | 2017-10-18 | 1 | -15/+15 |
|\ \ \ \ \ | |||||
| * | | | | | protobuf_generate: create include path only for proto files | Markus Heß | 2017-09-29 | 1 | -15/+15 |
* | | | | | | Merge pull request #3706 from johanbrandhorst/patch-1 | Jisi Liu | 2017-10-18 | 1 | -0/+2 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Add GopherJS protobuf and gRPC links | Johan Brandhorst | 2017-10-02 | 1 | -0/+2 |
| |/ / / / / | |||||
* | | | | | | Merge pull request #3736 from jleni/fix_rbpi | Jisi Liu | 2017-10-18 | 2 | -2/+2 |
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | |||||
| * | | | | | Converting to immutable hashable types | Juan Leni | 2017-10-11 | 2 | -2/+2 |
* | | | | | | Merge pull request #3769 from pherl/io_win32 | Jisi Liu | 2017-10-18 | 1 | -13/+21 |
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | |||||
| * | | | | | Fix unsiged underflow | Jisi Liu | 2017-10-18 | 1 | -1/+1 |
| * | | | | | Remove C++11 only usages in io_win32 tests. | Jisi Liu | 2017-10-18 | 1 | -13/+21 |
|/ / / / / | |||||
* | | | | | Merge pull request #3760 from jmillikin-stripe/descriptor-memset-ub | Feng Xiao | 2017-10-16 | 4 | -10/+16 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | |||||
| * | | | | Fix undefined memory management found by Clang's sanitizers. | John Millikin | 2017-10-16 | 4 | -10/+16 |
|/ / / / | |||||
* | | | | Merge pull request #3744 from fmarier/json-escaping-namespace | Jisi Liu | 2017-10-13 | 1 | -1/+1 |
|\ \ \ \ | |||||
| * | | | | Move namespace closing brace inside the header guard block | Francois Marier | 2017-10-12 | 1 | -1/+1 |
|/ / / / | |||||
* | | | | Merge pull request #3739 from pherl/merge3.4 | Jisi Liu | 2017-10-12 | 30 | -52/+1309 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | Fix distcheck | Jisi Liu | 2017-10-11 | 1 | -0/+1 |
| * | | | Merge remote-tracking branch 'origin/3.4.x' into master | Jisi Liu | 2017-10-11 | 30 | -52/+1308 |
|/| | | | |||||
| * | | | Merge pull request #3690 from pherl/3.4.x | Jisi Liu | 2017-10-02 | 1 | -2/+2 |
| |\ \ \ | |||||
| | * | | | Remove ranged based for in io_win32.cc | Jisi Liu | 2017-09-27 | 1 | -2/+2 |
| * | | | | Merge pull request #3691 from pherl/stringback | Jisi Liu | 2017-09-29 | 1 | -1/+1 |
| |\ \ \ \ | | |/ / / | |/| | | | |||||
| | * | | | Add spaces | Jisi Liu | 2017-09-27 | 1 | -1/+1 |
| | * | | | Fix C++11 string accessors | Jisi Liu | 2017-09-27 | 1 | -1/+1 |
| |/ / / | |||||
| * | | | Merge pull request #3651 from pherl/3.4.x | Jisi Liu | 2017-09-15 | 1 | -1/+1 |
| |\ \ \ | |||||
| | * | | | Bumping minor version for ruby gems | Jisi Liu | 2017-09-15 | 1 | -1/+1 |
| * | | | | Merge pull request #3612 from TeBoring/php-bug | Paul Yang | 2017-09-15 | 14 | -30/+1087 |
| |\ \ \ \ | | |/ / / | |/| | | | |||||
| | * | | | Rename ClassNamePrefix to ConstantNamePrefix | Bo Yang | 2017-09-13 | 1 | -4/+3 |
| | * | | | Exclude valid constant name from reserved name. | Bo Yang | 2017-09-12 | 9 | -238/+652 |
| | * | | | Change array to map for reserved names in c extension | Bo Yang | 2017-09-11 | 3 | -24/+69 |
| | * | | | Change array to associate array. | Bo Yang | 2017-09-11 | 1 | -20/+21 |
| | * | | | Add prefix to php reserved keywords. | Bo Yang | 2017-09-08 | 10 | -17/+615 |
| * | | | | Merge pull request #3642 from pherl/3.4.xv3.4.1 | Jisi Liu | 2017-09-14 | 13 | -16/+32 |
| |\ \ \ \ | |||||
| | * | | | | Bump version for minor release | Jisi Liu | 2017-09-14 | 13 | -16/+32 |
| |/ / / / | |||||
| * | | | | Merge pull request #3634 from TeBoring/ruby-bug | Paul Yang | 2017-09-13 | 5 | -23/+37 |
| |\ \ \ \ | |||||
| | * | | | | Storing the frame on the map means we don't need the array | Aaron Patterson | 2017-09-13 | 3 | -14/+9 |
| | * | | | | Move parse frame array to the Map object | Aaron Patterson | 2017-09-13 | 5 | -23/+42 |
| |/ / / / | |||||
| * | | | | Revert "Fix js conformance tests. (#3604)" (#3633) | Paul Yang | 2017-09-13 | 6 | -44/+93 |
| * | | | | Fix js conformance tests. (#3604) | Paul Yang | 2017-09-12 | 6 | -93/+44 |
| |/ / / | |||||
| * | | | Merge pull request #3596 from jtattermusch/csharp_target_net45 | Jan Tattermusch | 2017-09-07 | 1 | -1/+1 |
| |\ \ \ | |||||
| | * | | | Google.Protobuf should target net45 | Jan Tattermusch | 2017-09-05 | 1 | -1/+1 |
| |/ / / | |||||
| * | | | change the field number of php_generic_service to fix the conflict with (#3576) | Paul Yang | 2017-08-30 | 8 | -151/+216 |