Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #1914 from adamatan/typo-fix | Feng Xiao | 2016-08-03 | 1 | -1/+1 |
|\ | | | | | Typo: beffer -> buffer | ||||
| * | Typo: beffer -> buffer | Adam Matan | 2016-08-03 | 1 | -1/+1 |
|/ | |||||
* | Merge pull request #1878 from haberman/rubywkt | Joshua Haberman | 2016-08-01 | 4 | -2/+338 |
|\ | | | | | Ruby: added API support for well-known types. | ||||
| * | Ruby: added custom Struct exception type and fixed Makefile.am. | Josh Haberman | 2016-08-01 | 3 | -11/+42 |
| | | |||||
| * | Fix for JRuby (assert_true is not present). | Josh Haberman | 2016-07-28 | 2 | -3/+3 |
| | | |||||
| * | Ruby: added API support for well-known types. | Josh Haberman | 2016-07-28 | 3 | -0/+305 |
| | | |||||
* | | Merge pull request #1903 from xfxyjwf/compatibility_tests | Feng Xiao | 2016-08-01 | 1 | -5/+5 |
|\ \ | | | | | | | Use 64-bit protoc binaries in compatibility tests. | ||||
| * | | Use 64-bit protoc binaries in compatibility tests. | Feng Xiao | 2016-08-01 | 1 | -5/+5 |
|/ / | | | | | | | | | | | | | Turns out travis doesn't have the library dependencies to run a 32-bit binary. Change-Id: I5fadbcade2eb71c1e9ce21d90fa9459797df0e81 | ||||
* | | Merge pull request #1902 from podsvirov/topic-cmake-extract-includes | Feng Xiao | 2016-08-01 | 1 | -1/+0 |
|\ \ | | | | | | | CMake: remove repeated_field_reflection.h from extract list | ||||
| * | | CMake: remove repeated_field_reflection.h from extract list | Konstantin Podsvirov | 2016-08-01 | 1 | -1/+0 |
|/ / | |||||
* | | Amend the conformance tests to only use Int64/Uint64 non-wrapped values ↵ | Jon Skeet | 2016-07-31 | 2 | -8/+12 |
| | | | | | | | | | | | | | | | | | | | | which (#1164) can reasonably be expected to be interoperable. (The fact that not all Int64/Uint64 values *can* be exactly represented in IEEE-754 and thus interoperably amongst JSON implementations is precisely the reason for wrapping them when we serialize... it shouldn't be a surprise that we can't round-trip in unwrapped form for all values.) | ||||
* | | 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 |
| | | |