aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Create compiler_config_setting.bzlscentini2018-08-281-0/+21
* use flag_values = {"@bazel_tools//tools/cpp:compiler": "x"} for compiler conf...scentini2018-08-281-4/+3
* Merge pull request #5074 from xfxyjwf/linksFeng Xiao2018-08-233-4/+4
|\
| * Fix go tests.Feng Xiao2018-08-231-1/+1
| * Revert changed links in Dockerfiles.Feng Xiao2018-08-232-3/+3
|/
* Merge pull request #5068 from xfxyjwf/linksFeng Xiao2018-08-2252-84/+84
|\
| * Replace repo links.Feng Xiao2018-08-2252-84/+84
|/
* Support creating FileDescriptors dynamically from binary data.Jon Skeet2018-08-206-40/+168
* Merge pull request #5024 from greenhouse-org/fix-windows-pathFeng Xiao2018-08-201-1/+2
|\
| * Always spilt on '\' and '/'Sam Smith2018-08-131-5/+1
| * Fix TryCreateParentDirectory on WindowsSam Smith2018-08-091-0/+5
* | Merge pull request #5050 from lucidsoftware/lucidFeng Xiao2018-08-201-1/+1
|\ \
| * | Change deprecated Bazel single file attr paramJames Judd2018-08-141-1/+1
|/ /
* | Disable surrogate check for ucs2 (#5039)Jie Luo2018-08-142-3/+10
* | Merge pull request #5042 from dsnet/masterFeng Xiao2018-08-131-0/+5
|\ \
| * | Document wrapper non-usesJoe Tsai2018-08-131-0/+5
|/ /
* | Merge pull request #5033 from xfxyjwf/upFeng Xiao2018-08-131-1/+1
|\ \
| * | Fix issues discovered in up-integration.Feng Xiao2018-08-131-1/+1
* | | 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
| |/ / / /