Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | Merge pull request #5103 from haberman/cmake | Joshua Haberman | 2018-09-02 | 1 | -0/+1 | |
|\ \ \ | ||||||
| * | | | Added conformance test impl file to CMake. | Joshua Haberman | 2018-09-02 | 1 | -0/+1 | |
* | | | | Merge pull request #5099 from oqton/feature/issue-5806 | Feng Xiao | 2018-09-02 | 3 | -1/+41 | |
|\ \ \ \ | |/ / / |/| | | | ||||||
| * | | | Also make sure known fields come across as expected | Brandon Cole | 2018-08-30 | 1 | -1/+6 | |
| * | | | Code fixes for the original unit test. | Brandon Cole | 2018-08-30 | 2 | -1/+18 | |
| * | | | Add unit test for loading unknown fields in Any messages | Brandon Cole | 2018-08-30 | 1 | -0/+18 | |
| |/ / | ||||||
* | | | Merge pull request #5078 from haberman/conformance-cmake | Joshua Haberman | 2018-09-02 | 3 | -0/+53 | |
|\ \ \ | ||||||
| * | | | Added missing file to Makefile.am. | Josh Haberman | 2018-08-24 | 1 | -0/+1 | |
| * | | | Added cmake build files for the conformance test runner. | Josh Haberman | 2018-08-24 | 2 | -0/+52 | |
* | | | | Merge pull request #5092 from xfxyjwf/contrib | Feng Xiao | 2018-09-01 | 1 | -0/+85 | |
|\ \ \ \ | ||||||
| * | | | | Add constributing guidelines. | Feng Xiao | 2018-08-29 | 1 | -0/+85 | |
| | |/ / | |/| | | ||||||
* | | | | Fix well known type class not inheriting Message (#5095) | Paul Yang | 2018-08-31 | 2 | -2/+4 | |
* | | | | Add missing reference to conformanc_test_impl.cc in Makefile (#5100) | Paul Yang | 2018-08-31 | 3 | -2/+7 | |
* | | | | Merge pull request #5082 from elharo/guava | Feng Xiao | 2018-08-29 | 1 | -2/+2 | |
|\ \ \ \ | ||||||
| * | | | | update version | Elliotte Harold | 2018-08-27 | 1 | -2/+2 | |
| |/ / / | ||||||
* | | | | Merge pull request #5079 from GobySoft/request-new-extension | Feng Xiao | 2018-08-29 | 1 | -2/+8 | |
|\ \ \ \ | ||||||
| * | | | | Update options.md | Toby Schneider | 2018-08-24 | 1 | -2/+8 | |
| |/ / / | ||||||
* | | | | Merge pull request #5077 from EmersonGaziz/patch-1 | Feng Xiao | 2018-08-29 | 1 | -1/+1 | |
|\ \ \ \ | |/ / / |/| | | | ||||||
| * | | | Update options.md | fix website url for C# port | Gohar Aziz | 2018-08-24 | 1 | -1/+1 | |
|/ / / | ||||||
* | | | Merge pull request #5074 from xfxyjwf/links | Feng Xiao | 2018-08-23 | 3 | -4/+4 | |
|\ \ \ | ||||||
| * | | | Fix go tests. | Feng Xiao | 2018-08-23 | 1 | -1/+1 | |
| * | | | Revert changed links in Dockerfiles. | Feng Xiao | 2018-08-23 | 2 | -3/+3 | |
|/ / / | ||||||
* | | | Merge pull request #5068 from xfxyjwf/links | Feng Xiao | 2018-08-22 | 52 | -84/+84 | |
|\ \ \ | ||||||
| * | | | Replace repo links. | Feng Xiao | 2018-08-22 | 52 | -84/+84 | |
|/ / / | ||||||
* | | | 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 | |
| |/ / / / / / |