aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | change the field number of php_generic_service to fix the conflict with (#3576)Paul Yang2017-08-308-151/+216
| * | | | Merge pull request #3565 from pherl/fixdistJisi Liu2017-08-242-1/+2
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | Add mising cmake files in distJisi Liu2017-08-242-1/+2
| |/ / /
| * | | Merge pull request #3556 from matt-kwong/kokoro_mac_v3Jisi Liu2017-08-231-1/+3
| |\ \ \
| | * | | Remove pre-installed softwaresMatt Kwong2017-08-231-1/+3
| |/ / /
| * | | Merge pull request #3555 from pherl/fixdistJisi Liu2017-08-232-3/+9
| |\ \ \
| | * | | Make distcheck aware of test proto files.Jisi Liu2017-08-232-3/+9
| |/ / /
* | | | Merge pull request #3735 from sgreenstein/patch-1Feng Xiao2017-10-101-1/+3
|\ \ \ \
| * | | | Don't pass -lpthread and -lm on WindowsSeth Greenstein2017-10-101-1/+3
|/ / / /
* | | / Reserve unknown fields in php (#3659)Paul Yang2017-10-0912-841/+2101
| |_|/ |/| |
* | | Add well known types to php runtime. (#3697)Paul Yang2017-10-0543-144/+5450
* | | Fix ruby segment fault (#3708)Paul Yang2017-10-038-9/+88
* | | Merge pull request #3714 from thomasvl/objc_increase_test_coverageThomas Van Lenten2017-10-0311-42/+524
|\ \ \
| * | | Build out more complete code coverage in the tests.Thomas Van Lenten2017-10-035-36/+494
| * | | Let Xcode 9 update project/scheme settings.Thomas Van Lenten2017-10-036-6/+30
|/ / /
* | | Merge pull request #3710 from thomasvl/xcode9Thomas Van Lenten2017-10-021-0/+6
|\ \ \
| * | | Add Xcode 9 support to the helper script.Thomas Van Lenten2017-10-021-0/+6
* | | | Merge pull request #3709 from thomasvl/unknown_field_merge_issueThomas Van Lenten2017-10-022-11/+21
|\ \ \ \ | |/ / / |/| | |
| * | | ObjC: Fix merging of length delimited unknown fields.Thomas Van Lenten2017-10-022-11/+21
|/ / /
* | / Use constexpr more with VC++ 2017 (#3707)Bruce Dawson2017-10-021-1/+2
| |/ |/|
* | Merge pull request #3676 from hesmar/hesmar/fixProtobufGeneratePythonFeng Xiao2017-09-251-2/+2
|\ \
| * | generate python code when calling PROTOBUF_GENERATE_PYTHONMarkus Heß2017-09-251-2/+2
|/ /
* | Enforce all error report for php tests. (#3670)Paul Yang2017-09-225-5/+25
* | Merge pull request #3675 from hesmar/hesmar/cmakeAddDllExportFeng Xiao2017-09-222-4/+11
|\ \
| * | protobuf_generate: add EXPORT_MACRO optionMarkus Heß2017-09-222-4/+11
|/ /
* | Merge pull request #3674 from pherl/shutdownJisi Liu2017-09-211-0/+2
|\ \
| * | Test Shutdown can be called multiple times.Jisi Liu2017-09-211-0/+2
* | | Merge pull request #3627 from zanker/zanker/add-submsg-hash-initJoshua Haberman2017-09-215-26/+116
|\ \ \ | |/ / |/| |
| * | Update message.cZachary Anker2017-09-211-2/+1
| * | Allow initializing a chain of protos using only a hashZachary Anker2017-09-205-26/+117
* | | Add $ before url_prefix_len to make it a variable. (#3668)Paul Yang2017-09-201-4/+2
* | | Merge pull request #3639 from zanker/zanker/fix-embedded-to_hJoshua Haberman2017-09-203-3/+22
|\ \ \
| * | | Update message.cZachary Anker2017-09-201-1/+1
| * | | Fixed to_h with repeated messages to return hashes in RubyZachary Anker2017-09-203-3/+22
* | | | Merge pull request #2377 from mcos/chore/conformance-null-testsFeng Xiao2017-09-191-0/+8
|\ \ \ \
| * | | | Add tests to demonstrate json parsing for null Timestamp and Duration typesMark Costello2016-11-161-0/+8
* | | | | Merge pull request #3624 from acozzette/down-integrateAdam Cozzette2017-09-18173-13998/+14541
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Integrated internal changes from GoogleAdam Cozzette2017-09-14173-13998/+14541
|/ / / /
* | | | Merge pull request #3626 from xfxyjwf/fixgoFeng Xiao2017-09-132-4/+4
|\ \ \ \
| * | | | Fix go example test.Feng Xiao2017-09-132-4/+4
* | | | | Merge pull request #3635 from drivehappy/clang_cleanupFeng Xiao2017-09-131-1/+1
|\ \ \ \ \
| * | | | | Clang warning cleanup for unused parameter.drivehappy2017-09-131-1/+1
|/ / / / /
* | | | | Merge pull request #3158 from yeswalrus/fix-policy-warningFeng Xiao2017-09-131-2/+2
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Fix policy warning CMP0054Walter Gray2017-05-301-2/+2
* | | | | Merge pull request #3621 from jtattermusch/upport_3596Jan Tattermusch2017-09-121-1/+1
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Google.Protobuf should target net45Jan Tattermusch2017-09-121-1/+1
* | | | | Merge pull request #3618 from hesmar/fix_protobuf_generateFeng Xiao2017-09-121-7/+12
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | fix protobuf_generate functionMarkus Heß2017-09-121-7/+12
* | | | | Merge pull request #3613 from xfxyjwf/bazel_examplesFeng Xiao2017-09-1114-89/+352
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Exclude addressbook.proto from C# boostrap test.Feng Xiao2017-09-112-6/+0