Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #3641 from drivehappy/3.4.x_clang_cleanup_3 | Jisi Liu | 2017-10-18 | 1 | -1/+1 |
|\ | | | | | Clang warning cleanup for unused parameter. | ||||
| * | Clang warning cleanup for unused parameter. | drivehappy | 2017-09-14 | 1 | -1/+1 |
| | | |||||
* | | 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 | ||||
| * | | 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 |
|\ \ \ | |/ / |/| | | Fix C++11 string accessors | ||||
| * | | 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 | ||||
| * | | 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 |
|\ \ \ | |/ / |/| | | Add prefix to php reserved keywords. | ||||
| * | | 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 | ||||
| * | | 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 |
|\ \ | | | | | | | Cherry pick bug fix for ruby | ||||
| * | | 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 |
|/ / | | | | | | | This makes the frame stack per-parser, and per-thread. Fixes #3250 | ||||
* | | Revert "Fix js conformance tests. (#3604)" (#3633) | Paul Yang | 2017-09-13 | 6 | -44/+93 |
| | | | | | | This reverts commit 2bd55a9fbcd2815b3332bf309bc20f59eef0b36b. | ||||
* | | Fix js conformance tests. (#3604) | Paul Yang | 2017-09-12 | 6 | -93/+44 |
|/ | | | | | | * Fix js conformance tests. * Remove old incorrect compatibility tests | ||||
* | Merge pull request #3596 from jtattermusch/csharp_target_net45 | Jan Tattermusch | 2017-09-07 | 1 | -1/+1 |
|\ | | | | | Google.Protobuf should target net45 (and not net451) | ||||
| * | 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 |
| | | | internal descriptor.proto | ||||
* | Merge pull request #3565 from pherl/fixdist | Jisi Liu | 2017-08-24 | 2 | -1/+2 |
|\ | | | | | Add mising cmake files in dist | ||||
| * | 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 | ||||
| * | 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. | ||||
| * | Make distcheck aware of test proto files. | Jisi Liu | 2017-08-23 | 2 | -3/+9 |
|/ | |||||
* | Merge pull request #3546 from pherl/deathtest | Jisi Liu | 2017-08-22 | 2 | -39/+2 |
|\ | | | | | Disable death tests on windows | ||||
| * | Disable death tests on windows | Jisi Liu | 2017-08-22 | 2 | -39/+2 |
|/ | | | | Also remove cord related code | ||||
* | Merge pull request #3537 from TeBoring/php-bug | Jisi Liu | 2017-08-22 | 5 | -1/+25 |
|\ | | | | | Use message name as defined in php runtime. | ||||
| * | Use message name as defined in php runtime. | Bo Yang | 2017-08-21 | 5 | -1/+25 |
| | | |||||
* | | Merge pull request #3539 from drivehappy/3.4.x_clang_cleanup_1 | Jisi Liu | 2017-08-22 | 2 | -29/+33 |
|\ \ | | | | | | | Merge pull request #3535 from drivehappy/clang_warn_cleanup | ||||
| * | | Merge pull request #3535 from drivehappy/clang_warn_cleanup | Jisi Liu | 2017-08-21 | 2 | -29/+33 |
| | | | | | | | | | Fixing unused parameter warnings under Clang. | ||||
* | | | Merge pull request #3540 from drivehappy/3.4.x_clang_cleanup_2 | Jisi Liu | 2017-08-22 | 1 | -2/+5 |
|\ \ \ | |/ / |/| | | Merge pull request #3494 from drivehappy/clang_warning_macro | ||||
| * | | Merge pull request #3494 from drivehappy/clang_warning_macro | Jisi Liu | 2017-08-21 | 1 | -2/+5 |
|/ / | | | | | Fixing -Wexpansion-to-defined Clang warning | ||||
* | | Merge pull request #3536 from pherl/io32_11 | Jisi Liu | 2017-08-21 | 1 | -15/+15 |
|\ \ | |/ |/| | Remove C++11 features in io_win32.cc | ||||
| * | Fix compile errors | Jisi Liu | 2017-08-21 | 1 | -3/+3 |
| | | |||||
| * | Remove C++11 features in io_win32.cc | Jisi Liu | 2017-08-21 | 1 | -15/+15 |
|/ | | | | | - Use scoped_array instead of unique_ptr. - Do not use string::front() and string::back() | ||||
* | Merge pull request #3528 from pherl/rubyfix | Jisi Liu | 2017-08-18 | 1 | -1/+1 |
|\ | | | | | Bump gemspec again | ||||
| * | Bump gemspec again | Jisi Liu | 2017-08-18 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #3504 from pherl/3.4.x | Jisi Liu | 2017-08-18 | 1 | -0/+3 |
|\ \ | |/ |/| | Prefer system distributed binaries/libraries. | ||||
| * | Prefer system distributed binaries/libraries. | Jisi Liu | 2017-08-16 | 1 | -0/+3 |
| | | | | | | | | | | | | It seems like the image has a /usr/local/bin/autoconf installed, which doesn't recognize/work with the yum installed libtools. Putting distributed binaries/libraries first solves the problem | ||||
* | | Merge pull request #3514 from pherl/rubyfix | Jisi Liu | 2017-08-17 | 1 | -1/+1 |
|\ \ | | | | | | | Bump gem version for the next upload | ||||
| * | | Bump gem version for the next upload | Jisi Liu | 2017-08-17 | 1 | -1/+1 |
| | | | |||||
* | | | Merge pull request #3502 from pherl/pypi | Jisi Liu | 2017-08-17 | 1 | -6/+6 |
|\ \ \ | | | | | | | | | Update testpypi URLs | ||||
| * | | | clean up | Jisi Liu | 2017-08-16 | 1 | -3/+0 |
| | | | |