Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Support creating FileDescriptors dynamically from binary data. | Jon Skeet | 2018-08-20 | 6 | -40/+168 |
* | Merge pull request #5024 from greenhouse-org/fix-windows-path | Feng Xiao | 2018-08-20 | 1 | -1/+2 |
|\ | |||||
| * | Always spilt on '\' and '/' | Sam Smith | 2018-08-13 | 1 | -5/+1 |
| * | Fix TryCreateParentDirectory on Windows | Sam Smith | 2018-08-09 | 1 | -0/+5 |
* | | Merge pull request #5050 from lucidsoftware/lucid | Feng Xiao | 2018-08-20 | 1 | -1/+1 |
|\ \ | |||||
| * | | Change deprecated Bazel single file attr param | James Judd | 2018-08-14 | 1 | -1/+1 |
|/ / | |||||
* | | Disable surrogate check for ucs2 (#5039) | Jie Luo | 2018-08-14 | 2 | -3/+10 |
* | | Merge pull request #5042 from dsnet/master | Feng Xiao | 2018-08-13 | 1 | -0/+5 |
|\ \ | |||||
| * | | Document wrapper non-uses | Joe Tsai | 2018-08-13 | 1 | -0/+5 |
|/ / | |||||
* | | Merge pull request #5033 from xfxyjwf/up | Feng Xiao | 2018-08-13 | 1 | -1/+1 |
|\ \ | |||||
| * | | Fix issues discovered in up-integration. | Feng Xiao | 2018-08-13 | 1 | -1/+1 |
* | | | Merge pull request #5041 from xfxyjwf/bazel | Feng Xiao | 2018-08-13 | 2 | -2/+2 |
|\ \ \ | |/ / |/| | | |||||
| * | | Add status badge for bazel build. | Feng Xiao | 2018-08-13 | 2 | -2/+2 |
|/ / | |||||
* | | Merge pull request #5040 from xfxyjwf/bazel | Feng Xiao | 2018-08-13 | 4 | -2/+11 |
|\ \ | |||||
| * | | Update build files. | Feng Xiao | 2018-08-13 | 4 | -2/+11 |
|/ / | |||||
* | | Merge pull request #5038 from xfxyjwf/proto2 | Feng Xiao | 2018-08-13 | 38 | -124/+125 |
|\ \ | |||||
| * | | Down-integrate proto2 namespace fix. | Feng Xiao | 2018-08-13 | 38 | -124/+125 |
* | | | Merge pull request #5032 from TeBoring/json-wrapper | Joshua Haberman | 2018-08-13 | 3 | -221/+589 |
|\ \ \ | |/ / |/| | | |||||
| * | | Fix json parsing of wrapper values | Bo Yang | 2018-08-10 | 3 | -221/+589 |
* | | | Merge pull request #4951 from BSBandme/add_js_benchmark | Yilun Chong | 2018-08-10 | 6 | -2/+266 |
|\ \ \ | |||||
| * | | | fix filename and newline | Yilun Chong | 2018-08-08 | 5 | -12/+15 |
| * | | | Add JS and Protobuf.js benchmark | Yilun Chong | 2018-07-20 | 6 | -2/+263 |
* | | | | Fix failing tests. | Feng Xiao | 2018-08-09 | 22 | -34/+728 |
* | | | | Merge remote-tracking branch 'google/master' into integration_baseintegration_base | Feng Xiao | 2018-08-09 | 4 | -64/+7 |
|\ \ \ \ | |||||
| * \ \ \ | Merge pull request #5027 from xfxyjwf/jenkins | Feng Xiao | 2018-08-09 | 3 | -63/+6 |
| |\ \ \ \ | |||||
| | * | | | | Cleanup kokoro scripts. | Feng Xiao | 2018-08-09 | 3 | -63/+6 |
| |/ / / / | |||||
| * | | | | Merge pull request #5020 from brian-peloton/master | Feng Xiao | 2018-08-08 | 1 | -1/+1 |
| |\ \ \ \ | | |_|_|/ | |/| | | | |||||
| | * | | | Fix broken test of const repeated field iterators | Brian Silverman | 2018-08-08 | 1 | -1/+1 |
| |/ / / | |||||
* | | | | Update generated descriptors.integration | Feng Xiao | 2018-08-08 | 15 | -65/+243 |
* | | | | Merge master branch. | Feng Xiao | 2018-08-08 | 85 | -379/+525 |
|\| | | | |||||
| * | | | Merge pull request #4981 from BSBandme/fix_js_skipgroup | Yilun Chong | 2018-08-08 | 3 | -9/+21 |
| |\ \ \ | |||||
| | * | | | fix | Yilun Chong | 2018-08-01 | 1 | -1/+6 |
| | * | | | fix | Yilun Chong | 2018-08-01 | 1 | -1/+6 |
| | * | | | fix | Yilun Chong | 2018-08-01 | 1 | -2/+4 |
| | * | | | fix | Yilun Chong | 2018-07-31 | 2 | -1/+1 |
| | * | | | Fix js reader.js's skipGroup | Yilun Chong | 2018-07-31 | 3 | -8/+8 |
| * | | | | Merge pull request #5013 from prSquirrel/fix-typo-field-mask-tree | Feng Xiao | 2018-08-07 | 1 | -1/+1 |
| |\ \ \ \ | |||||
| | * | | | | Fix typo in FieldMaskTree.java warning | Aleksej Kazmin | 2018-08-07 | 1 | -1/+1 |
| * | | | | | Merge pull request #5010 from batradhruv/4593 | Adam Cozzette | 2018-08-07 | 23 | -148/+148 |
| |\ \ \ \ \ | | |/ / / / | |/| | | | | |||||
| | * | | | | 4593 Replace all occurrences of "NULL" to nullptr in src/google/protobug/stubs | Dhruv | 2018-08-07 | 23 | -148/+148 |
| * | | | | | Add header need for module maps. | dmaclach | 2018-08-06 | 1 | -0/+1 |
| * | | | | | Merge pull request #5005 from finaldie/python.gitignore | Feng Xiao | 2018-08-06 | 1 | -1/+1 |
| |\ \ \ \ \ | | |/ / / / | |/| | | | | |||||
| | * | | | | Ignore python .egg file to make git status clean #5004 | Yuzhang Hu | 2018-08-05 | 1 | -1/+1 |
| |/ / / / | |||||
| * | | | | adding of hyperlink of the PHP (#4985) | johnlow95 | 2018-08-02 | 1 | -1/+1 |
| * | | | | Merge pull request #4990 from acozzette/aarch64-build | Adam Cozzette | 2018-08-01 | 2 | -8/+13 |
| |\ \ \ \ | |||||
| | * | | | | Added support for building the aarch64 and ppcle64 protoc binaries with Kokoro | Adam Cozzette | 2018-08-01 | 2 | -8/+13 |
| |/ / / / | |||||
| * | | | | Merge pull request #4991 from acozzette/merge-3-6-x | Adam Cozzette | 2018-08-01 | 38 | -80/+126 |
| |\ \ \ \ | |||||
| | * | | | | Merge branch '3.6.x' into merge-3-6-x | Adam Cozzette | 2018-08-01 | 38 | -80/+126 |
| |/| | | | | |||||
| | * | | | | Updated change log for 3.6.1 releasev3.6.1 | Adam Cozzette | 2018-07-27 | 1 | -0/+12 |
| | * | | | | Updated version numbers to 3.6.1 | Adam Cozzette | 2018-07-27 | 26 | -45/+45 |