aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| | * | | | | Bumping minor version for ruby gemsJisi Liu2017-09-151-1/+1
| * | | | | | Merge pull request #3612 from TeBoring/php-bugPaul Yang2017-09-1514-30/+1087
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | Rename ClassNamePrefix to ConstantNamePrefixBo Yang2017-09-131-4/+3
| | * | | | | Exclude valid constant name from reserved name.Bo Yang2017-09-129-238/+652
| | * | | | | Change array to map for reserved names in c extensionBo Yang2017-09-113-24/+69
| | * | | | | Change array to associate array.Bo Yang2017-09-111-20/+21
| | * | | | | Add prefix to php reserved keywords.Bo Yang2017-09-0810-17/+615
| * | | | | | Merge pull request #3642 from pherl/3.4.xv3.4.1Jisi Liu2017-09-1413-16/+32
| |\ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| | * | | | | Bump version for minor releaseJisi Liu2017-09-1413-16/+32
| |/ / / / /
| * | | | | Merge pull request #3634 from TeBoring/ruby-bugPaul Yang2017-09-135-23/+37
| |\ \ \ \ \
| | * | | | | Storing the frame on the map means we don't need the arrayAaron Patterson2017-09-133-14/+9
| | * | | | | Move parse frame array to the Map objectAaron Patterson2017-09-135-23/+42
| |/ / / / /
| * | | | | Revert "Fix js conformance tests. (#3604)" (#3633)Paul Yang2017-09-136-44/+93
| * | | | | Fix js conformance tests. (#3604)Paul Yang2017-09-126-93/+44
| |/ / / /
| * | | | Merge pull request #3596 from jtattermusch/csharp_target_net45Jan Tattermusch2017-09-071-1/+1
| |\ \ \ \
| | * | | | Google.Protobuf should target net45Jan Tattermusch2017-09-051-1/+1
| |/ / / /
| * | | | 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