aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Down-integrate from google3.Feng Xiao2018-08-08443-19369/+30331
* php: Added nanosecond support for Timestamp (#3972)Leonard Hecker2018-07-206-38/+83
* Merge pull request #4943 from Stevie-O/fix-unit-tests-on-win32Adam Cozzette2018-07-207-10/+15
|\
| * When running unit tests, read reference files in text modeStephen Oberholtzer2018-07-197-10/+15
|/
* Delete unused files. (#4942)Feng Xiao2018-07-1910-2089/+0
* Merge pull request #4934 from BSBandme/sync_internal_benchmarkYilun Chong2018-07-183-133/+153
|\
| * Sync internal benchmark changesYilun Chong2018-07-183-133/+153
* | Fix C# nuget build on Kokoro (#4912)Jan Tattermusch2018-07-183-3/+3
|/
* Merge pull request #4850 from BSBandme/php_benchmarkYilun Chong2018-07-164-3/+263
|\
| * add php benchmarkYilun Chong2018-07-164-3/+263
* | Comment out unused command from release script.Feng Xiao2018-07-151-1/+1
* | Merge pull request #4922 from xfxyjwf/release2Feng Xiao2018-07-151-0/+6
|\ \
| * | Run autogen.sh in release script.Feng Xiao2018-07-151-0/+6
* | | Merge pull request #4920 from xfxyjwf/releaseFeng Xiao2018-07-153-2/+39
|\| |
| * | Add protoc release script for Linux build.Feng Xiao2018-07-153-2/+39
|/ /
* | Merge pull request #4916 from xfxyjwf/dockerFeng Xiao2018-07-155-107/+29
|\ \
| * | Add cpp tests under release docker image.Feng Xiao2018-07-155-107/+29
|/ /
* | 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
|\ \ \ \