Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #3613 from xfxyjwf/bazel_examples | Feng Xiao | 2017-09-11 | 14 | -89/+352 |
|\ | |||||
| * | Exclude addressbook.proto from C# boostrap test. | Feng Xiao | 2017-09-11 | 2 | -6/+0 |
| * | Update C# generated file for addressbook.proto | Feng Xiao | 2017-09-11 | 1 | -11/+47 |
| * | Update examples file list. | Feng Xiao | 2017-09-11 | 1 | -6/+7 |
| * | Add bazel support for examples. | Feng Xiao | 2017-09-08 | 10 | -66/+298 |
* | | Add well-known timestamps to JSON for PHP (#3564) | Jack Wakefield | 2017-09-10 | 6 | -61/+146 |
|/ | |||||
* | Merge pull request #2576 from cristicbz/py-strutil | Feng Xiao | 2017-09-08 | 1 | -1/+11 |
|\ | |||||
| * | python: do not include internal 'strutil.h' header | Cristi Cobzarenco | 2017-01-28 | 1 | -1/+11 |
* | | Merge pull request #3590 from NanXiao/patch-1 | Adam Cozzette | 2017-09-06 | 1 | -0/+2 |
|\ \ | |||||
| * | | Update autogen.sh | Nan Xiao | 2017-09-04 | 1 | -0/+2 |
* | | | Add native php support for Duration. (#3583) | Paul Yang | 2017-09-05 | 7 | -0/+261 |
* | | | Merge pull request #3594 from buchgr/well-known-protos | Feng Xiao | 2017-09-05 | 2 | -15/+47 |
|\ \ \ | |/ / |/| | | |||||
| * | | bazel: Add proto_library rules for well known types. Fixes #2763 | Jakob Buchgraber | 2017-09-05 | 2 | -15/+47 |
|/ / | |||||
* | | Merge pull request #3560 from tenderlove/thread-safe-map | Joshua Haberman | 2017-08-31 | 5 | -23/+37 |
|\ \ | |||||
| * | | Storing the frame on the map means we don't need the array | Aaron Patterson | 2017-08-30 | 3 | -14/+9 |
| * | | Move parse frame array to the Map object | Aaron Patterson | 2017-08-30 | 5 | -23/+42 |
* | | | Add php support for Timestamp. (#3575) | Paul Yang | 2017-08-31 | 8 | -102/+443 |
* | | | Add any support in php runtime. (#3486) | Paul Yang | 2017-08-25 | 10 | -58/+904 |
* | | | Merge pull request #3503 from gburgessiv/master | Jisi Liu | 2017-08-24 | 1 | -1/+4 |
|\ \ \ | |||||
| * | | | Work around a bug in clang's static analyzer | George Burgess IV | 2017-08-22 | 1 | -1/+4 |
* | | | | Merge pull request #3544 from anandolee/master | Jisi Liu | 2017-08-24 | 3 | -5/+13 |
|\ \ \ \ | |_|/ / |/| | | | |||||
| * | | | Drop python2.6 | Jie Luo | 2017-08-22 | 2 | -5/+4 |
| * | | | Add Python 3.5 3.6 | Jie Luo | 2017-08-22 | 3 | -3/+12 |
* | | | | Merge pull request #3547 from matt-kwong/kokoro_mac_build | Jisi Liu | 2017-08-23 | 1 | -1/+3 |
|\ \ \ \ | |||||
| * | | | | Remove pre-installed softwares | Matt Kwong | 2017-08-23 | 1 | -1/+3 |
* | | | | | Merge pull request #3548 from google/3.4.x | Jisi Liu | 2017-08-22 | 8 | -55/+42 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | Merge pull request #3546 from pherl/deathtest | Jisi Liu | 2017-08-22 | 2 | -39/+2 |
| |\ \ \ \ | |||||
| | * | | | | Disable death tests on windows | Jisi Liu | 2017-08-22 | 2 | -39/+2 |
| |/ / / / | |||||
| * | | | | Merge pull request #3537 from TeBoring/php-bug | Jisi Liu | 2017-08-22 | 5 | -1/+25 |
| |\ \ \ \ | |||||
| | * | | | | 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 | Jisi Liu | 2017-08-21 | 2 | -29/+33 |
| * | | | | | | 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 | Jisi Liu | 2017-08-21 | 1 | -2/+5 |
| |/ / / / / | |||||
| * | | | | | Merge pull request #3536 from pherl/io32_11 | Jisi Liu | 2017-08-21 | 1 | -15/+15 |
| |\ \ \ \ \ | | |/ / / / | |/| | | | | |||||
| | * | | | | 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 |
| |/ / / / | |||||
* | | | | | Merge pull request #3543 from tony612/patch-1 | Jisi Liu | 2017-08-22 | 1 | -0/+2 |
|\ \ \ \ \ | |_|/ / / |/| | | | | |||||
| * | | | | Add Elixir protobuf and gRPC to 3rd party doc | Bing Han | 2017-08-23 | 1 | -0/+2 |
|/ / / / | |||||
* | | | | Merge pull request #3535 from drivehappy/clang_warn_cleanup | Jisi Liu | 2017-08-21 | 2 | -29/+33 |
|\ \ \ \ | |||||
| * | | | | Fixing unused parameter warnings under Clang. | drivehappy | 2017-08-21 | 2 | -29/+33 |
* | | | | | Merge pull request #3529 from pherl/merge3.4.x | Jisi Liu | 2017-08-21 | 310 | -8291/+21043 |
|\ \ \ \ \ | |||||
| * \ \ \ \ | Merge remote-tracking branch 'origin/3.4.x' into mergemaster | Jisi Liu | 2017-08-18 | 310 | -8291/+21043 |
| |\ \ \ \ \ | | |/ / / / | |/| / / / | | |/ / / | |||||
| | * | | | Merge pull request #3528 from pherl/rubyfix | Jisi Liu | 2017-08-18 | 1 | -1/+1 |
| | |\ \ \ | |||||
| | | * | | | 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. | Jisi Liu | 2017-08-16 | 1 | -0/+3 |
| | * | | | | Merge pull request #3514 from pherl/rubyfix | Jisi Liu | 2017-08-17 | 1 | -1/+1 |
| | |\ \ \ \ | |||||
| | | * | | | | 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 |
| | |\ \ \ \ \ |