Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | Merge pull request #3627 from zanker/zanker/add-submsg-hash-init | Joshua Haberman | 2017-09-21 | 5 | -26/+116 | |
|\ \ \ | |/ / |/| | | ||||||
| * | | Update message.c | Zachary Anker | 2017-09-21 | 1 | -2/+1 | |
| * | | Allow initializing a chain of protos using only a hash | Zachary Anker | 2017-09-20 | 5 | -26/+117 | |
* | | | Add $ before url_prefix_len to make it a variable. (#3668) | Paul Yang | 2017-09-20 | 1 | -4/+2 | |
* | | | Merge pull request #3639 from zanker/zanker/fix-embedded-to_h | Joshua Haberman | 2017-09-20 | 3 | -3/+22 | |
|\ \ \ | ||||||
| * | | | Update message.c | Zachary Anker | 2017-09-20 | 1 | -1/+1 | |
| * | | | Fixed to_h with repeated messages to return hashes in Ruby | Zachary Anker | 2017-09-20 | 3 | -3/+22 | |
* | | | | Merge pull request #2377 from mcos/chore/conformance-null-tests | Feng Xiao | 2017-09-19 | 1 | -0/+8 | |
|\ \ \ \ | ||||||
| * | | | | Add tests to demonstrate json parsing for null Timestamp and Duration types | Mark Costello | 2016-11-16 | 1 | -0/+8 | |
* | | | | | Merge pull request #3624 from acozzette/down-integrate | Adam Cozzette | 2017-09-18 | 173 | -13998/+14541 | |
|\ \ \ \ \ | |_|/ / / |/| | | | | ||||||
| * | | | | Integrated internal changes from Google | Adam Cozzette | 2017-09-14 | 173 | -13998/+14541 | |
|/ / / / | ||||||
* | | | | Merge pull request #3626 from xfxyjwf/fixgo | Feng Xiao | 2017-09-13 | 2 | -4/+4 | |
|\ \ \ \ | ||||||
| * | | | | Fix go example test. | Feng Xiao | 2017-09-13 | 2 | -4/+4 | |
* | | | | | Merge pull request #3635 from drivehappy/clang_cleanup | Feng Xiao | 2017-09-13 | 1 | -1/+1 | |
|\ \ \ \ \ | ||||||
| * | | | | | Clang warning cleanup for unused parameter. | drivehappy | 2017-09-13 | 1 | -1/+1 | |
|/ / / / / | ||||||
* | | | | | Merge pull request #3158 from yeswalrus/fix-policy-warning | Feng Xiao | 2017-09-13 | 1 | -2/+2 | |
|\ \ \ \ \ | |_|_|/ / |/| | | | | ||||||
| * | | | | Fix policy warning CMP0054 | Walter Gray | 2017-05-30 | 1 | -2/+2 | |
* | | | | | Merge pull request #3621 from jtattermusch/upport_3596 | Jan Tattermusch | 2017-09-12 | 1 | -1/+1 | |
|\ \ \ \ \ | |_|/ / / |/| | | | | ||||||
| * | | | | Google.Protobuf should target net45 | Jan Tattermusch | 2017-09-12 | 1 | -1/+1 | |
* | | | | | Merge pull request #3618 from hesmar/fix_protobuf_generate | Feng Xiao | 2017-09-12 | 1 | -7/+12 | |
|\ \ \ \ \ | |/ / / / |/| | | | | ||||||
| * | | | | fix protobuf_generate function | Markus Heß | 2017-09-12 | 1 | -7/+12 | |
* | | | | | 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 | |
| |\ \ \ \ \ \ |