Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Merge pull request #1898 from sergiocampama/watchos | Thomas Van Lenten | 2016-08-04 |
|\ | | | | | Adds watch os deployment target for protobuf | ||
* \ | Merge pull request #1865 from podsvirov/topic-cmake-project | Feng Xiao | 2016-08-03 |
|\ \ | | | | | | | CMake: Improvements and Bugfixes | ||
* \ \ | Merge pull request #1914 from adamatan/typo-fix | Feng Xiao | 2016-08-03 |
|\ \ \ | | | | | | | | | Typo: beffer -> buffer | ||
| * | | | Typo: beffer -> buffer | Adam Matan | 2016-08-03 |
|/ / / | |||
| * | | CMake: Auto find ZLIB from package config if nedded | Konstantin Podsvirov | 2016-08-02 |
| | | | |||
* | | | Merge pull request #1878 from haberman/rubywkt | Joshua Haberman | 2016-08-01 |
|\ \ \ | | | | | | | | | Ruby: added API support for well-known types. | ||
* \ \ \ | Merge pull request #1903 from xfxyjwf/compatibility_tests | Feng Xiao | 2016-08-01 |
|\ \ \ \ | | | | | | | | | | | Use 64-bit protoc binaries in compatibility tests. | ||
| | * | | | Ruby: added custom Struct exception type and fixed Makefile.am. | Josh Haberman | 2016-08-01 |
| | | | | | |||
| * | | | | Use 64-bit protoc binaries in compatibility tests. | Feng Xiao | 2016-08-01 |
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | 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 |
|\ \ \ \ | | | | | | | | | | | CMake: remove repeated_field_reflection.h from extract list | ||
| * | | | | CMake: remove repeated_field_reflection.h from extract list | Konstantin Podsvirov | 2016-08-01 |
|/ / / / | |||
* | | | | Amend the conformance tests to only use Int64/Uint64 non-wrapped values ↵ | Jon Skeet | 2016-07-31 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.) | ||
| | | * | Adds watch os deployment target for protobuf | Sergio Campama | 2016-07-29 |
| |_|/ |/| | | |||
* | | | Merge pull request #1887 from sheffatguidance/fix-js-api-documentation | Joshua Haberman | 2016-07-29 |
|\ \ \ | | | | | | | | | Fix Issue #1869: faulty js API documentation | ||
* \ \ \ | Merge pull request #1884 from hochhaus/valueWriterFn | Joshua Haberman | 2016-07-29 |
|\ \ \ \ | | | | | | | | | | | Fix valueWriterFn_ variable name | ||
* \ \ \ \ | Merge pull request #1895 from google/3.0.0-GA | Jisi Liu | 2016-07-29 |
|\ \ \ \ \ | | | | | | | | | | | | | Merge GA branch for makedist fix. | ||
| * \ \ \ \ | Merge pull request #1894 from pherl/fixdist | Jisi Liu | 2016-07-29 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | Add python/setup.cfg into dist files | ||
| | * | | | | | Add python/setup.cfg into dist files | Jisi Liu | 2016-07-29 |
| |/ / / / / | |||
* | | | | | | Merge pull request #1893 from google/3.0.0-GA | Jisi Liu | 2016-07-29 |
|\| | | | | | | | | | | | | | | | | | Merge 3.0.0-GA into master | ||
| * | | | | | Merge pull request #1892 from xfxyjwf/compatibility_tests | Jisi Liu | 2016-07-29 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | Run Java compatibility tests on Travis. | ||
| | * | | | | | Run Java compatibility tests on Travis. | Feng Xiao | 2016-07-29 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 |
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | add setup.cfg for building wheels | ||
| | * | | | | | add setup.cfg for building wheels | Jisi Liu | 2016-07-29 |
| | | | | | | | |||
* | | | | | | | Merge pull request #1882 from legrosbuffle/fix-check | Feng Xiao | 2016-07-29 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Be consistent with the use of CHECK()/ GOOGLE_CHECK(). | ||
| | * \ \ \ \ \ | Merge pull request #1888 from pherl/fixbuildzip | Jisi Liu | 2016-07-29 |
| | |\ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | | 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 |
| | |/ / / / / | |||
| | | | * / / | Fix Issue #1869: faulty js API documentation | sheffatguidance | 2016-07-29 |
| |_|_|/ / / |/| | | | | | |||
| | | * | | | Fix valueWriterFn variable name | Andy Hochhaus | 2016-07-29 |
| |_|/ / / |/| | | | | |||
| * | | | | Be consistent with the use of CHECK()/ GOOGLE_CHECK(). | Clement Courbet | 2016-07-29 |
|/ / / / | |||
| | * | | Fix for JRuby (assert_true is not present). | Josh Haberman | 2016-07-28 |
| | | | | |||
| | * | | Ruby: added API support for well-known types. | Josh Haberman | 2016-07-28 |
| | | | | |||
| * | | | Merge pull request #1874 from pherl/buildzip | Jisi Liu | 2016-07-28 |
| |\ \ \ | | | | | | | | | | | Change the build.zip.sh to support lite | ||
| | * | | | Change the build.zip.sh to support lite | Jisi Liu | 2016-07-28 |
| | | | | | |||
| * | | | | Merge pull request #1871 from pherl/fixwin | Jisi Liu | 2016-07-28 |
| |\ \ \ \ | | |/ / / | |/| | | | Fix build protoc script for windows | ||
| | * | | | Fix build protoc script for windows | Jisi Liu | 2016-07-28 |
| |/ / / | |||
| | | * | CMake: Bugfix for protobuf_MODULE_COMPATIBLE | Konstantin Podsvirov | 2016-07-28 |
| | | | | | | | | | | | | | | | | Removed excess endif() | ||
| | | * | CMake: Link to ZLIB only if protobuf_WITH_ZLIB enabled | Konstantin Podsvirov | 2016-07-28 |
| |_|/ |/| | | |||
| * | | Merge pull request #1864 from pherl/galogs | Jisi Liu | 2016-07-27 |
| |\ \ | | | | | | | | | Change log for 3.0 GA release. | ||
* | | | | Fixed Makefile.am for Ruby file rename. | Josh Haberman | 2016-07-27 |
| | | | | |||
| | * | | Change log for 3.0 GA release. | Jisi Liu | 2016-07-27 |
| |/ / | |||
* | | | Merge pull request #1861 from jskeet/fix_to_camel_case | Jisi Liu | 2016-07-27 |
|\ \ \ | | | | | | | | | Bring C#'s ToPascalCase method in line with C++. | ||
* \ \ \ | Merge pull request #1859 from jskeet/remove-flag | Jisi Liu | 2016-07-27 |
|\ \ \ \ | |_|_|/ |/| | | | Remove legacy_enum_values flag for GA. | ||
| | * | | Bring C#'s ToPascalCase method in line with C++. | Jon Skeet | 2016-07-27 |
| |/ / |/| | | | | | | | | | | | (This still doesn't fix the conformance tests, but at least we're now consistent with the C++ code.) | ||
| * | | Remove legacy_enum_values flag for GA. | Jon Skeet | 2016-07-27 |
|/ / | |||
| * | Merge pull request #1853 from pherl/3.0.0-GA | Jisi Liu | 2016-07-26 |
| |\ | | | | | | | Make protoc-artifacts able to build plugins. | ||
| | * | fix comments. | Jisi Liu | 2016-07-26 |
| | | | |||
| | * | Merge remote-tracking branch 'origin/3.0.0-GA' into 3.0.0-GA | Jisi Liu | 2016-07-26 |
| | |\ | | |/ | |/| | |||
| | * | Fix the script comments. | Jisi Liu | 2016-07-26 |
| | | | |||
| | * | Make protoc-artifacts able to build plugin. | Jisi Liu | 2016-07-26 |
| | | | |||
| | * | Merge branch 'master' of github.com:google/protobuf into 3.0.0-GA | Jisi Liu | 2016-07-26 |
| | |\ | |_|/ |/| | |