aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | Merge pull request #5041 from xfxyjwf/bazelFeng Xiao2018-08-132-2/+2
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Add status badge for bazel build.Feng Xiao2018-08-132-2/+2
|/ / / / /
* | | | | Merge pull request #5040 from xfxyjwf/bazelFeng Xiao2018-08-134-2/+11
|\ \ \ \ \
| * | | | | Update build files.Feng Xiao2018-08-134-2/+11
|/ / / / /
* | | | | Merge pull request #5038 from xfxyjwf/proto2Feng Xiao2018-08-1338-124/+125
|\ \ \ \ \
| * | | | | Down-integrate proto2 namespace fix.Feng Xiao2018-08-1338-124/+125
* | | | | | Merge pull request #5032 from TeBoring/json-wrapperJoshua Haberman2018-08-133-221/+589
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Fix json parsing of wrapper valuesBo Yang2018-08-103-221/+589
* | | | | | Merge pull request #4951 from BSBandme/add_js_benchmarkYilun Chong2018-08-106-2/+266
|\ \ \ \ \ \
| * | | | | | fix filename and newlineYilun Chong2018-08-085-12/+15
| * | | | | | Add JS and Protobuf.js benchmarkYilun Chong2018-07-206-2/+263
* | | | | | | Fix failing tests.Feng Xiao2018-08-0922-34/+728
* | | | | | | Merge remote-tracking branch 'google/master' into integration_baseintegration_baseFeng Xiao2018-08-094-64/+7
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge pull request #5027 from xfxyjwf/jenkinsFeng Xiao2018-08-093-63/+6
| |\ \ \ \ \ \ \
| | * | | | | | | Cleanup kokoro scripts.Feng Xiao2018-08-093-63/+6
| |/ / / / / / /
| * | | | | | | Merge pull request #5020 from brian-peloton/masterFeng Xiao2018-08-081-1/+1
| |\ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | |
| | * | | | | | Fix broken test of const repeated field iteratorsBrian Silverman2018-08-081-1/+1
| |/ / / / / /
* | | | | | | 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