Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #1887 from sheffatguidance/fix-js-api-documentation | Joshua Haberman | 2016-07-29 | 1 | -2/+1 |
|\ | | | | | Fix Issue #1869: faulty js API documentation | ||||
| * | Fix Issue #1869: faulty js API documentation | sheffatguidance | 2016-07-29 | 1 | -2/+1 |
| | | |||||
* | | Merge pull request #1884 from hochhaus/valueWriterFn | Joshua Haberman | 2016-07-29 | 1 | -1/+1 |
|\ \ | | | | | | | Fix valueWriterFn_ variable name | ||||
| * | | Fix valueWriterFn variable name | Andy Hochhaus | 2016-07-29 | 1 | -1/+1 |
| |/ | |||||
* | | Merge pull request #1895 from google/3.0.0-GA | Jisi Liu | 2016-07-29 | 1 | -0/+1 |
|\ \ | | | | | | | Merge GA branch for makedist fix. | ||||
| * \ | Merge pull request #1894 from pherl/fixdist | Jisi Liu | 2016-07-29 | 1 | -0/+1 |
| |\ \ | | | | | | | | | Add python/setup.cfg into dist files | ||||
| | * | | Add python/setup.cfg into dist files | Jisi Liu | 2016-07-29 | 1 | -0/+1 |
| |/ / | |||||
* | | | Merge pull request #1893 from google/3.0.0-GA | Jisi Liu | 2016-07-29 | 23 | -53/+158 |
|\| | | | | | | | | Merge 3.0.0-GA into master | ||||
| * | | Merge pull request #1892 from xfxyjwf/compatibility_tests | Jisi Liu | 2016-07-29 | 2 | -0/+13 |
| |\ \ | | | | | | | | | Run Java compatibility tests on Travis. | ||||
| | * | | Run Java compatibility tests on Travis. | Feng Xiao | 2016-07-29 | 2 | -0/+13 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | The test is testing the binary/source compatibility between 3.0.0-beta-4 and the current version (right now it's 3.0.0). Change-Id: Ic410b535758b38cee7baa99a15a0433734df44e6 | ||||
| * | | | Merge pull request #1891 from pherl/python | Jisi Liu | 2016-07-29 | 1 | -0/+2 |
| |\ \ \ | | |/ / | |/| | | add setup.cfg for building wheels | ||||
| | * | | add setup.cfg for building wheels | Jisi Liu | 2016-07-29 | 1 | -0/+2 |
| | | | | |||||
| * | | | Merge pull request #1888 from pherl/fixbuildzip | Jisi Liu | 2016-07-29 | 1 | -2/+8 |
| |\ \ \ | | |/ / | |/| | | Fix the build-zip.sh to add .exe for win packages. | ||||
| | * | | Fix the build-zip.sh to add .exe for win packages. | Jisi Liu | 2016-07-29 | 1 | -2/+8 |
| |/ / | |||||
| * | | Merge pull request #1874 from pherl/buildzip | Jisi Liu | 2016-07-28 | 2 | -19/+31 |
| |\ \ | | | | | | | | | Change the build.zip.sh to support lite | ||||
| | * | | Change the build.zip.sh to support lite | Jisi Liu | 2016-07-28 | 2 | -19/+31 |
| | | | | |||||
| * | | | Merge pull request #1871 from pherl/fixwin | Jisi Liu | 2016-07-28 | 1 | -5/+3 |
| |\ \ \ | | |/ / | |/| | | Fix build protoc script for windows | ||||
| | * | | Fix build protoc script for windows | Jisi Liu | 2016-07-28 | 1 | -5/+3 |
| |/ / | |||||
| * | | Merge pull request #1864 from pherl/galogsv3.0.0 | Jisi Liu | 2016-07-27 | 1 | -0/+51 |
| |\ \ | | | | | | | | | Change log for 3.0 GA release. | ||||
| | * | | Change log for 3.0 GA release. | Jisi Liu | 2016-07-27 | 1 | -0/+51 |
| |/ / | |||||
| * | | Merge pull request #1853 from pherl/3.0.0-GA | Jisi Liu | 2016-07-26 | 2 | -8/+22 |
| |\ \ | | | | | | | | | Make protoc-artifacts able to build plugins. | ||||
| | * | | fix comments. | Jisi Liu | 2016-07-26 | 1 | -1/+1 |
| | | | | |||||
| | * | | Merge remote-tracking branch 'origin/3.0.0-GA' into 3.0.0-GA | Jisi Liu | 2016-07-26 | 4 | -14/+23 |
| | |\ \ | | |/ / | |/| | | |||||
| * | | | Merge pull request #1851 from xfxyjwf/cint | Feng Xiao | 2016-07-26 | 2 | -5/+5 |
| |\ \ \ | | | | | | | | | | | Fixes traivs cpp build. | ||||
| | * | | | Fixes traivs cpp build. | Feng Xiao | 2016-07-26 | 2 | -5/+5 |
| |/ / / | | | | | | | | | | | | | Remove the use of INT64_C/UINT64_C and add static_cast when neccessary. | ||||
| * | | | Merge pull request #1847 from haberman/GAfixes | Joshua Haberman | 2016-07-26 | 12 | -18/+182 |
| |\ \ \ | | | | | | | | | | | GA fixes | ||||
| | * | | | Fixed Makefile.am for Ruby file rename. | Josh Haberman | 2016-07-26 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | Merge branch 'master' into 3.0.0-GA | Josh Haberman | 2016-07-25 | 11 | -17/+181 |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | We need to pick up some of the last-minute Ruby fixes. | ||||
| * | \ \ \ | Merge pull request #1841 from pherl/3.0.0-GA | Jisi Liu | 2016-07-26 | 13 | -13/+13 |
| |\ \ \ \ \ | | |/ / / / | |/| | | | | Bump version number for GA | ||||
| * | | | | | Define intX as standard exact-width integer types. | Feng Xiao | 2016-07-25 | 2 | -12/+21 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes https://github.com/google/protobuf/issues/823 Change-Id: I7f4c2bfcac2f81d8b34c030dd3d12ea02aaa2264 | ||||
| | | | * | | Fix the script comments. | Jisi Liu | 2016-07-26 | 1 | -2/+2 |
| | | | | | | |||||
| | | | * | | Make protoc-artifacts able to build plugin. | Jisi Liu | 2016-07-26 | 2 | -8/+22 |
| | | | | | | |||||
| | | | * | | Merge branch 'master' of github.com:google/protobuf into 3.0.0-GA | Jisi Liu | 2016-07-26 | 11 | -17/+181 |
| | | |/| | | | |/|/ / | |||||
| | * | | | remove extra zeros. | Jisi Liu | 2016-07-25 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | Make jruby still depend on beta-4 | Jisi Liu | 2016-07-25 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | Bump version number for GA | Jisi Liu | 2016-07-25 | 13 | -13/+13 |
| |/ / / | |||||
* | | | | Merge pull request #1882 from legrosbuffle/fix-check | Feng Xiao | 2016-07-29 | 1 | -3/+4 |
|\ \ \ \ | |_|_|/ |/| | | | Be consistent with the use of CHECK()/ GOOGLE_CHECK(). | ||||
| * | | | Be consistent with the use of CHECK()/ GOOGLE_CHECK(). | Clement Courbet | 2016-07-29 | 1 | -3/+4 |
|/ / / | |||||
* | | | Fixed Makefile.am for Ruby file rename. | Josh Haberman | 2016-07-27 | 1 | -1/+1 |
| | | | |||||
* | | | Merge pull request #1861 from jskeet/fix_to_camel_case | Jisi Liu | 2016-07-27 | 2 | -2/+16 |
|\ \ \ | | | | | | | | | Bring C#'s ToPascalCase method in line with C++. | ||||
| * | | | Bring C#'s ToPascalCase method in line with C++. | Jon Skeet | 2016-07-27 | 2 | -2/+16 |
| | |/ | |/| | | | | | | | | | | (This still doesn't fix the conformance tests, but at least we're now consistent with the C++ code.) | ||||
* | | | Merge pull request #1859 from jskeet/remove-flag | Jisi Liu | 2016-07-27 | 3 | -14/+2 |
|\ \ \ | |/ / |/| | | Remove legacy_enum_values flag for GA. | ||||
| * | | Remove legacy_enum_values flag for GA. | Jon Skeet | 2016-07-27 | 3 | -14/+2 |
|/ / | |||||
* | | Merge pull request #1788 from google/rubypackagecap | Joshua Haberman | 2016-07-25 | 6 | -7/+58 |
|\ \ | | | | | | | Ruby: translate package names from snake_case -> PascalCase. | ||||
| * | | Added new file to ruby_EXTRA_DIST. | Josh Haberman | 2016-07-25 | 1 | -0/+1 |
| | | | |||||
| * | | Added unit test for PascalCasing package names in Ruby. | Josh Haberman | 2016-07-25 | 4 | -1/+13 |
| | | | |||||
| * | | Ruby: translate package names from snake_case -> PascalCase. | Josh Haberman | 2016-07-25 | 1 | -6/+44 |
| | | | |||||
* | | | Merge pull request #1846 from xfxyjwf/zip | Feng Xiao | 2016-07-25 | 2 | -0/+113 |
|\ \ \ | |/ / |/| | | Add a script to build protoc zip packages. | ||||
| * | | Add a script to build protoc zip packages. | Feng Xiao | 2016-07-25 | 2 | -0/+113 |
| |/ | | | | | | | | | | | [ci skip] Change-Id: Ia0e0bf3bb6bd24633dc8f294318bb20ac837f8b9 | ||||
* | | Merge pull request #1837 from haberman/rubygencodename | Joshua Haberman | 2016-07-25 | 6 | -10/+10 |
|\ \ | |/ |/| | Ruby: generated foo.proto -> foo_pb.rb instead of foo.rb. |