aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* 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
| * | | Update C# generated file for addressbook.protoFeng Xiao2017-09-111-11/+47
| * | | Update examples file list.Feng Xiao2017-09-111-6/+7
| * | | Add bazel support for examples.Feng Xiao2017-09-0810-66/+298
* | | | Add well-known timestamps to JSON for PHP (#3564)Jack Wakefield2017-09-106-61/+146
|/ / /
* | | Merge pull request #2576 from cristicbz/py-strutilFeng Xiao2017-09-081-1/+11
|\ \ \
| * | | python: do not include internal 'strutil.h' headerCristi Cobzarenco2017-01-281-1/+11
* | | | Merge pull request #3590 from NanXiao/patch-1Adam Cozzette2017-09-061-0/+2
|\ \ \ \
| * | | | Update autogen.shNan Xiao2017-09-041-0/+2
* | | | | Add native php support for Duration. (#3583)Paul Yang2017-09-057-0/+261
* | | | | Merge pull request #3594 from buchgr/well-known-protosFeng Xiao2017-09-052-15/+47
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | bazel: Add proto_library rules for well known types. Fixes #2763Jakob Buchgraber2017-09-052-15/+47
|/ / / /
* | | | Merge pull request #3560 from tenderlove/thread-safe-mapJoshua Haberman2017-08-315-23/+37
|\ \ \ \
| * | | | Storing the frame on the map means we don't need the arrayAaron Patterson2017-08-303-14/+9
| * | | | Move parse frame array to the Map objectAaron Patterson2017-08-305-23/+42
* | | | | Add php support for Timestamp. (#3575)Paul Yang2017-08-318-102/+443
* | | | | Add any support in php runtime. (#3486)Paul Yang2017-08-2510-58/+904
* | | | | Merge pull request #3503 from gburgessiv/masterJisi Liu2017-08-241-1/+4
|\ \ \ \ \
| * | | | | Work around a bug in clang's static analyzerGeorge Burgess IV2017-08-221-1/+4
* | | | | | Merge pull request #3544 from anandolee/masterJisi Liu2017-08-243-5/+13
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Drop python2.6Jie Luo2017-08-222-5/+4
| * | | | | Add Python 3.5 3.6Jie Luo2017-08-223-3/+12
* | | | | | Merge pull request #3547 from matt-kwong/kokoro_mac_buildJisi Liu2017-08-231-1/+3
|\ \ \ \ \ \
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-14 21:19:30 +0000