aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Collapse)AuthorAge
* Merge pull request #1898 from sergiocampama/watchosGravatar Thomas Van Lenten2016-08-04
|\ | | | | Adds watch os deployment target for protobuf
* \ Merge pull request #1865 from podsvirov/topic-cmake-projectGravatar Feng Xiao2016-08-03
|\ \ | | | | | | CMake: Improvements and Bugfixes
* \ \ Merge pull request #1914 from adamatan/typo-fixGravatar Feng Xiao2016-08-03
|\ \ \ | | | | | | | | Typo: beffer -> buffer
| * | | Typo: beffer -> bufferGravatar Adam Matan2016-08-03
|/ / /
| * | CMake: Auto find ZLIB from package config if neddedGravatar Konstantin Podsvirov2016-08-02
| | |
* | | Merge pull request #1878 from haberman/rubywktGravatar Joshua Haberman2016-08-01
|\ \ \ | | | | | | | | Ruby: added API support for well-known types.
* \ \ \ Merge pull request #1903 from xfxyjwf/compatibility_testsGravatar Feng Xiao2016-08-01
|\ \ \ \ | | | | | | | | | | Use 64-bit protoc binaries in compatibility tests.
| | * | | Ruby: added custom Struct exception type and fixed Makefile.am.Gravatar Josh Haberman2016-08-01
| | | | |
| * | | | Use 64-bit protoc binaries in compatibility tests.Gravatar Feng Xiao2016-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-includesGravatar Feng Xiao2016-08-01
|\ \ \ \ | | | | | | | | | | CMake: remove repeated_field_reflection.h from extract list
| * | | | CMake: remove repeated_field_reflection.h from extract listGravatar Konstantin Podsvirov2016-08-01
|/ / / /
* | | | Amend the conformance tests to only use Int64/Uint64 non-wrapped values ↵Gravatar Jon Skeet2016-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 protobufGravatar Sergio Campama2016-07-29
| |_|/ |/| |
* | | Merge pull request #1887 from sheffatguidance/fix-js-api-documentationGravatar Joshua Haberman2016-07-29
|\ \ \ | | | | | | | | Fix Issue #1869: faulty js API documentation
* \ \ \ Merge pull request #1884 from hochhaus/valueWriterFnGravatar Joshua Haberman2016-07-29
|\ \ \ \ | | | | | | | | | | Fix valueWriterFn_ variable name
* \ \ \ \ Merge pull request #1895 from google/3.0.0-GAGravatar Jisi Liu2016-07-29
|\ \ \ \ \ | | | | | | | | | | | | Merge GA branch for makedist fix.
| * \ \ \ \ Merge pull request #1894 from pherl/fixdistGravatar Jisi Liu2016-07-29
| |\ \ \ \ \ | | | | | | | | | | | | | | Add python/setup.cfg into dist files
| | * | | | | Add python/setup.cfg into dist filesGravatar Jisi Liu2016-07-29
| |/ / / / /
* | | | | | Merge pull request #1893 from google/3.0.0-GAGravatar Jisi Liu2016-07-29
|\| | | | | | | | | | | | | | | | | Merge 3.0.0-GA into master
| * | | | | Merge pull request #1892 from xfxyjwf/compatibility_testsGravatar Jisi Liu2016-07-29
| |\ \ \ \ \ | | | | | | | | | | | | | | Run Java compatibility tests on Travis.
| | * | | | | Run Java compatibility tests on Travis.Gravatar Feng Xiao2016-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/pythonGravatar Jisi Liu2016-07-29
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | add setup.cfg for building wheels
| | * | | | | add setup.cfg for building wheelsGravatar Jisi Liu2016-07-29
| | | | | | |
* | | | | | | Merge pull request #1882 from legrosbuffle/fix-checkGravatar Feng Xiao2016-07-29
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Be consistent with the use of CHECK()/ GOOGLE_CHECK().
| | * \ \ \ \ \ Merge pull request #1888 from pherl/fixbuildzipGravatar Jisi Liu2016-07-29
| | |\ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | Fix the build-zip.sh to add .exe for win packages.
| | | * | | | | Fix the build-zip.sh to add .exe for win packages.Gravatar Jisi Liu2016-07-29
| | |/ / / / /
| | | | * / / Fix Issue #1869: faulty js API documentationGravatar sheffatguidance2016-07-29
| |_|_|/ / / |/| | | | |
| | | * | | Fix valueWriterFn variable nameGravatar Andy Hochhaus2016-07-29
| |_|/ / / |/| | | |
| * | | | Be consistent with the use of CHECK()/ GOOGLE_CHECK().Gravatar Clement Courbet2016-07-29
|/ / / /
| | * | Fix for JRuby (assert_true is not present).Gravatar Josh Haberman2016-07-28
| | | |
| | * | Ruby: added API support for well-known types.Gravatar Josh Haberman2016-07-28
| | | |
| * | | Merge pull request #1874 from pherl/buildzipGravatar Jisi Liu2016-07-28
| |\ \ \ | | | | | | | | | | Change the build.zip.sh to support lite
| | * | | Change the build.zip.sh to support liteGravatar Jisi Liu2016-07-28
| | | | |
| * | | | Merge pull request #1871 from pherl/fixwinGravatar Jisi Liu2016-07-28
| |\ \ \ \ | | |/ / / | |/| | | Fix build protoc script for windows
| | * | | Fix build protoc script for windowsGravatar Jisi Liu2016-07-28
| |/ / /
| | | * CMake: Bugfix for protobuf_MODULE_COMPATIBLEGravatar Konstantin Podsvirov2016-07-28
| | | | | | | | | | | | | | | | Removed excess endif()
| | | * CMake: Link to ZLIB only if protobuf_WITH_ZLIB enabledGravatar Konstantin Podsvirov2016-07-28
| |_|/ |/| |
| * | Merge pull request #1864 from pherl/galogsGravatar Jisi Liu2016-07-27
| |\ \ | | | | | | | | Change log for 3.0 GA release.
* | | | Fixed Makefile.am for Ruby file rename.Gravatar Josh Haberman2016-07-27
| | | |
| | * | Change log for 3.0 GA release.Gravatar Jisi Liu2016-07-27
| |/ /
* | | Merge pull request #1861 from jskeet/fix_to_camel_caseGravatar Jisi Liu2016-07-27
|\ \ \ | | | | | | | | Bring C#'s ToPascalCase method in line with C++.
* \ \ \ Merge pull request #1859 from jskeet/remove-flagGravatar Jisi Liu2016-07-27
|\ \ \ \ | |_|_|/ |/| | | Remove legacy_enum_values flag for GA.
| | * | Bring C#'s ToPascalCase method in line with C++.Gravatar Jon Skeet2016-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.Gravatar Jon Skeet2016-07-27
|/ /
| * Merge pull request #1853 from pherl/3.0.0-GAGravatar Jisi Liu2016-07-26
| |\ | | | | | | Make protoc-artifacts able to build plugins.
| | * fix comments.Gravatar Jisi Liu2016-07-26
| | |
| | * Merge remote-tracking branch 'origin/3.0.0-GA' into 3.0.0-GAGravatar Jisi Liu2016-07-26
| | |\ | | |/ | |/|
| | * Fix the script comments.Gravatar Jisi Liu2016-07-26
| | |
| | * Make protoc-artifacts able to build plugin.Gravatar Jisi Liu2016-07-26
| | |
| | * Merge branch 'master' of github.com:google/protobuf into 3.0.0-GAGravatar Jisi Liu2016-07-26
| | |\ | |_|/ |/| |