aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Update generated descriptors.integrationFeng Xiao2018-08-0815-65/+243
* Merge master branch.Feng Xiao2018-08-0885-379/+525
|\
| * Merge pull request #4981 from BSBandme/fix_js_skipgroupYilun Chong2018-08-083-9/+21
| |\
| | * fixYilun Chong2018-08-011-1/+6
| | * fixYilun Chong2018-08-011-1/+6
| | * fixYilun Chong2018-08-011-2/+4
| | * fixYilun Chong2018-07-312-1/+1
| | * Fix js reader.js's skipGroupYilun Chong2018-07-313-8/+8
| * | Merge pull request #5013 from prSquirrel/fix-typo-field-mask-treeFeng Xiao2018-08-071-1/+1
| |\ \
| | * | Fix typo in FieldMaskTree.java warningAleksej Kazmin2018-08-071-1/+1
| * | | Merge pull request #5010 from batradhruv/4593Adam Cozzette2018-08-0723-148/+148
| |\ \ \ | | |/ / | |/| |
| | * | 4593 Replace all occurrences of "NULL" to nullptr in src/google/protobug/stubsDhruv2018-08-0723-148/+148
| * | | Add header need for module maps.dmaclach2018-08-061-0/+1
| * | | Merge pull request #5005 from finaldie/python.gitignoreFeng Xiao2018-08-061-1/+1
| |\ \ \ | | |/ / | |/| |
| | * | Ignore python .egg file to make git status clean #5004Yuzhang Hu2018-08-051-1/+1
| |/ /
| * | adding of hyperlink of the PHP (#4985)johnlow952018-08-021-1/+1
| * | Merge pull request #4990 from acozzette/aarch64-buildAdam Cozzette2018-08-012-8/+13
| |\ \
| | * | Added support for building the aarch64 and ppcle64 protoc binaries with KokoroAdam Cozzette2018-08-012-8/+13
| |/ /
| * | Merge pull request #4991 from acozzette/merge-3-6-xAdam Cozzette2018-08-0138-80/+126
| |\ \
| | * | Merge branch '3.6.x' into merge-3-6-xAdam Cozzette2018-08-0138-80/+126
| |/| |
| | * | Updated change log for 3.6.1 releasev3.6.1Adam Cozzette2018-07-271-0/+12
| | * | Updated version numbers to 3.6.1Adam Cozzette2018-07-2726-45/+45
| | * | Check the message to be encoded is the wrong type. (#4885) (#4949)Paul Yang2018-07-232-0/+17
| | * | Make assertEquals pass for message (#4947)Paul Yang2018-07-202-7/+14
| | * | Merge pull request #4924 from xfxyjwf/3.6.xFeng Xiao2018-07-1733-506/+663
| | |\ \
| | | * | Add continuous test for ruby 2.3, 2.4 and 2.5 (#4829)Paul Yang2018-07-175-36/+135
| | | * | Fix cpp_distcheckBSBandme2018-07-171-2/+0
| | | * | Fix php conformance test.Feng Xiao2018-07-171-2/+2
| | | * | protoc-artifacts: Update centos base from 6.6 to 6.9Eric Anderson2018-07-171-1/+1
| | | * | Updated Docker setup to use GCC 4.8Adam Cozzette2018-07-173-10/+9
| | | * | Remove js_embed binary. (#4709)Feng Xiao2018-07-166-159/+230
| | | * | Fix cpp benchmark dependency on macBSBandme2018-07-161-0/+1
| | | * | Comment out unused command from release script.Feng Xiao2018-07-151-1/+1
| | | * | Run autogen.sh in release script.Feng Xiao2018-07-151-0/+6
| | | * | Add protoc release script for Linux build.Feng Xiao2018-07-153-2/+39
| | | * | Add cpp tests under release docker image.Feng Xiao2018-07-154-99/+36
| | | * | Update protoc build scripts.Feng Xiao2018-07-153-173/+167
| | | * | Fix 32bit php testsBo Yang2018-07-154-20/+24
| | | * | Fix php testsBo Yang2018-07-153-0/+4
| | | * | fix golang kokoro linux buildYilun Chong2018-07-151-1/+1
| | | * | fix python cpp kokoro buildYilun Chong2018-07-152-1/+4
| | | * | fix linux kokoro build in dockerYilun Chong2018-07-151-1/+5
| | |/ /
| | * | fix for API change in PHP 7.3 (#4898)Paul Yang2018-07-127-20/+36
| | * | Make ruby release configs consistent with protoc.Feng Xiao2018-07-1110-19/+19
| | * | Merge pull request #4900 from xfxyjwf/3.6.xFeng Xiao2018-07-114-2/+32
| | |\ \
| | | * | Fix bazel build of examples.Feng Xiao2018-07-111-2/+10
| | | * | Add kokoro bazel configs for 3.6.x branch.Feng Xiao2018-07-113-0/+22
| | |/ /
| | * | Merge pull request #4880 from nashimus/3.6.xFeng Xiao2018-07-092-11/+29
| | |\ \
| | | * | Additional support for building and deploying ppcle_64 artifactsnashimus2018-07-062-11/+29
| * | | | Merge pull request #4979 from ripopov/fix-tests-mingw-w64Adam Cozzette2018-07-311-0/+7
| |\ \ \ \