aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #4913 from xfxyjwf/protocFeng Xiao2018-07-133-166/+167
|\
| * Update protoc build scripts.Feng Xiao2018-07-133-166/+167
|/
* Merge pull request #4908 from TeBoring/php-bugFeng Xiao2018-07-136-24/+29
|\
| * Fix 32bit php testsBo Yang2018-07-134-20/+24
| * Fix php testsBo Yang2018-07-134-5/+6
* | Merge pull request #4905 from BSBandme/fix_kokoro_build_in_dockerFeng Xiao2018-07-134-3/+10
|\ \ | |/ |/|
| * fix golang kokoro linux buildYilun Chong2018-07-121-1/+1
| * fix python cpp kokoro buildYilun Chong2018-07-122-1/+4
| * fix linux kokoro build in dockerYilun Chong2018-07-121-1/+5
* | Merge pull request #4903 from BSBandme/fix_js_buildYilun Chong2018-07-121-1/+1
|\ \
| * | fix commonjs js provide GOOGLE_CHECKYilun Chong2018-07-121-1/+1
| |/
* / Added a link for another Clojure protobuf project (#4906)Duncan McGreggor2018-07-121-0/+1
|/
* Check the message to be encoded is the wrong type. (#4885)Paul Yang2018-07-122-0/+17
* Add Python 3.7 compatibility (#4862)Ben Webb2018-07-125-6/+6
* Merge pull request #4869 from jtattermusch/csharp_artifact_buildJan Tattermusch2018-07-122-0/+16
|\
| * add scripts for automated building of C# nuget on KokoroJan Tattermusch2018-07-122-0/+16
|/
* Merge pull request #4899 from xfxyjwf/kokoroFeng Xiao2018-07-1110-19/+19
|\
| * Make ruby release configs consistent with protoc.Feng Xiao2018-07-1110-19/+19
|/
* objectivec: Quash -Wself-assign and -Wvla (#4897)Benjamin Barenblat2018-07-112-1/+4
* Merge pull request #4888 from chronoxor/masterFeng Xiao2018-07-101-1/+1
|\
| * OnShutdownDelete shadowing issueIvan Shynkarenka2018-07-101-1/+1
* | Merge pull request #4889 from hesmar/hesmar/cmakeFixProtobufConfigFeng Xiao2018-07-101-1/+1
|\ \ | |/ |/|
| * protobuf_generate(): add relative path to output dirMarkus Heß2018-07-101-1/+1
|/
* add JSON_UNESCAPED_UNICODE option (#4191)吕海涛2018-07-092-2/+2
* Enable ignoring unknown in json parsing in php (#4839)Paul Yang2018-07-0916-218/+386
* implement IComparable and comparison operators on Timestamp (#4318)Warren Falk2018-07-092-1/+205
* Merge pull request #4876 from BSBandme/fix_cpp_benchmarkYilun Chong2018-07-092-2/+1
|\
| * Fix cpp_distcheckBSBandme2018-07-091-2/+0
| * Fix cpp benchmark dependency on macBSBandme2018-07-061-0/+1
* | Merge pull request #4882 from google/3.6.xAdam Cozzette2018-07-0911-319/+132
|\ \
| * \ Merge pull request #4878 from acozzette/fix-msvc-initializationAdam Cozzette2018-07-0911-319/+132
| |\ \
| | * | Fix initialization with Visual StudioAdam Cozzette2018-07-0611-319/+132
| |/ /
* | | Merge pull request #4879 from ejona86/protoc-artifacts-tls12Adam Cozzette2018-07-091-1/+1
|\ \ \
| * | | protoc-artifacts: Update centos base from 6.6 to 6.9Eric Anderson2018-07-061-1/+1
|/ / /
* | | Merge pull request #4877 from acozzette/update-docker-setupAdam Cozzette2018-07-063-10/+9
|\ \ \
| * | | Updated Docker setup to use GCC 4.8Adam Cozzette2018-07-063-10/+9
| | |/ | |/|
* | | Merge pull request #4872 from demon386/masterAdam Cozzette2018-07-061-2/+2
|\ \ \ | |/ / |/| |
| * | Fix SFINAE in 'RepeatedPtrFieldBase::Add'M. Tong2018-07-061-2/+2
|/ /
* | Update message_module.cc (#4835)Thomas Colthurst2018-07-031-0/+9
* | Merge pull request #4863 from xfxyjwf/examplesFeng Xiao2018-07-032-2/+13
|\ \
| * | Fix bazel build of examples.Feng Xiao2018-07-032-2/+13
* | | Merge pull request #4856 from xfxyjwf/optionsFeng Xiao2018-07-031-0/+186
|\| |
| * | Add global extension registry to the repo.Feng Xiao2018-07-021-0/+186
|/ /
* | Add continuous test for ruby 2.3, 2.4 and 2.5 (#4829)Paul Yang2018-07-026-36/+150
* | Merge pull request #3981 from fahhem/patch-3Adam Cozzette2018-07-022-32/+107
|\ \
| * | Fix generated_protos_proto depsFahrzin Hemmati2018-05-071-2/+4
| * | Fix moving generated files onto themselvesFahrzin Hemmati2018-05-071-3/+5
| * | Add unittest build rulesFahrzin Hemmati2018-05-071-0/+27
| * | Only use realpath when in gendir, and use the original ctx.action if not in g...Fahrzin Hemmati2018-05-071-20/+24
| * | Track outputs correctlyFahrzin Hemmati2018-05-071-2/+5