Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | 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 | |
| * | | | | Merge pull request #3565 from pherl/fixdist | Jisi Liu | 2017-08-24 | 2 | -1/+2 | |
| |\ \ \ \ | | | |_|/ | | |/| | | ||||||
| | * | | | Add mising cmake files in dist | Jisi Liu | 2017-08-24 | 2 | -1/+2 | |
| |/ / / | ||||||
| * | | | Merge pull request #3556 from matt-kwong/kokoro_mac_v3 | Jisi Liu | 2017-08-23 | 1 | -1/+3 | |
| |\ \ \ | ||||||
| | * | | | Remove pre-installed softwares | Matt Kwong | 2017-08-23 | 1 | -1/+3 | |
| |/ / / | ||||||
| * | | | Merge pull request #3555 from pherl/fixdist | Jisi Liu | 2017-08-23 | 2 | -3/+9 | |
| |\ \ \ | ||||||
| | * | | | Make distcheck aware of test proto files. | Jisi Liu | 2017-08-23 | 2 | -3/+9 | |
| |/ / / | ||||||
* | | | | Merge pull request #3735 from sgreenstein/patch-1 | Feng Xiao | 2017-10-10 | 1 | -1/+3 | |
|\ \ \ \ | ||||||
| * | | | | Don't pass -lpthread and -lm on Windows | Seth Greenstein | 2017-10-10 | 1 | -1/+3 | |
|/ / / / | ||||||
* | | / | Reserve unknown fields in php (#3659) | Paul Yang | 2017-10-09 | 12 | -841/+2101 | |
| |_|/ |/| | | ||||||
* | | | Add well known types to php runtime. (#3697) | Paul Yang | 2017-10-05 | 43 | -144/+5450 | |
* | | | Fix ruby segment fault (#3708) | Paul Yang | 2017-10-03 | 8 | -9/+88 | |
* | | | Merge pull request #3714 from thomasvl/objc_increase_test_coverage | Thomas Van Lenten | 2017-10-03 | 11 | -42/+524 | |
|\ \ \ | ||||||
| * | | | Build out more complete code coverage in the tests. | Thomas Van Lenten | 2017-10-03 | 5 | -36/+494 | |
| * | | | Let Xcode 9 update project/scheme settings. | Thomas Van Lenten | 2017-10-03 | 6 | -6/+30 | |
|/ / / | ||||||
* | | | Merge pull request #3710 from thomasvl/xcode9 | Thomas Van Lenten | 2017-10-02 | 1 | -0/+6 | |
|\ \ \ | ||||||
| * | | | Add Xcode 9 support to the helper script. | Thomas Van Lenten | 2017-10-02 | 1 | -0/+6 | |
* | | | | Merge pull request #3709 from thomasvl/unknown_field_merge_issue | Thomas Van Lenten | 2017-10-02 | 2 | -11/+21 | |
|\ \ \ \ | |/ / / |/| | | | ||||||
| * | | | ObjC: Fix merging of length delimited unknown fields. | Thomas Van Lenten | 2017-10-02 | 2 | -11/+21 | |
|/ / / | ||||||
* | / | Use constexpr more with VC++ 2017 (#3707) | Bruce Dawson | 2017-10-02 | 1 | -1/+2 | |
| |/ |/| | ||||||
* | | Merge pull request #3676 from hesmar/hesmar/fixProtobufGeneratePython | Feng Xiao | 2017-09-25 | 1 | -2/+2 | |
|\ \ | ||||||
| * | | generate python code when calling PROTOBUF_GENERATE_PYTHON | Markus Heß | 2017-09-25 | 1 | -2/+2 | |
|/ / | ||||||
* | | Enforce all error report for php tests. (#3670) | Paul Yang | 2017-09-22 | 5 | -5/+25 |