aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* CMake: remove repeated_field_reflection.h from extract listKonstantin Podsvirov2016-08-011-1/+0
|
* Amend the conformance tests to only use Int64/Uint64 non-wrapped values ↵Jon Skeet2016-07-312-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-documentationJoshua Haberman2016-07-291-2/+1
|\ | | | | Fix Issue #1869: faulty js API documentation
| * Fix Issue #1869: faulty js API documentationsheffatguidance2016-07-291-2/+1
| |
* | Merge pull request #1884 from hochhaus/valueWriterFnJoshua Haberman2016-07-291-1/+1
|\ \ | | | | | | Fix valueWriterFn_ variable name
| * | Fix valueWriterFn variable nameAndy Hochhaus2016-07-291-1/+1
| |/
* | Merge pull request #1895 from google/3.0.0-GAJisi Liu2016-07-291-0/+1
|\ \ | | | | | | Merge GA branch for makedist fix.
| * \ Merge pull request #1894 from pherl/fixdistJisi Liu2016-07-291-0/+1
| |\ \ | | | | | | | | Add python/setup.cfg into dist files
| | * | Add python/setup.cfg into dist filesJisi Liu2016-07-291-0/+1
| |/ /
* | | Merge pull request #1893 from google/3.0.0-GAJisi Liu2016-07-2923-53/+158
|\| | | | | | | | Merge 3.0.0-GA into master
| * | Merge pull request #1892 from xfxyjwf/compatibility_testsJisi Liu2016-07-292-0/+13
| |\ \ | | | | | | | | Run Java compatibility tests on Travis.
| | * | Run Java compatibility tests on Travis.Feng Xiao2016-07-292-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/pythonJisi Liu2016-07-291-0/+2
| |\ \ \ | | |/ / | |/| | add setup.cfg for building wheels
| | * | add setup.cfg for building wheelsJisi Liu2016-07-291-0/+2
| | | |
| * | | Merge pull request #1888 from pherl/fixbuildzipJisi Liu2016-07-291-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 Liu2016-07-291-2/+8
| |/ /
| * | Merge pull request #1874 from pherl/buildzipJisi Liu2016-07-282-19/+31
| |\ \ | | | | | | | | Change the build.zip.sh to support lite
| | * | Change the build.zip.sh to support liteJisi Liu2016-07-282-19/+31
| | | |
| * | | Merge pull request #1871 from pherl/fixwinJisi Liu2016-07-281-5/+3
| |\ \ \ | | |/ / | |/| | Fix build protoc script for windows
| | * | Fix build protoc script for windowsJisi Liu2016-07-281-5/+3
| |/ /
| * | Merge pull request #1864 from pherl/galogsv3.0.0Jisi Liu2016-07-271-0/+51
| |\ \ | | | | | | | | Change log for 3.0 GA release.
| | * | Change log for 3.0 GA release.Jisi Liu2016-07-271-0/+51
| |/ /
| * | Merge pull request #1853 from pherl/3.0.0-GAJisi Liu2016-07-262-8/+22
| |\ \ | | | | | | | | Make protoc-artifacts able to build plugins.
| | * | fix comments.Jisi Liu2016-07-261-1/+1
| | | |
| | * | Merge remote-tracking branch 'origin/3.0.0-GA' into 3.0.0-GAJisi Liu2016-07-264-14/+23
| | |\ \ | | |/ / | |/| |
| * | | Merge pull request #1851 from xfxyjwf/cintFeng Xiao2016-07-262-5/+5
| |\ \ \ | | | | | | | | | | Fixes traivs cpp build.
| | * | | Fixes traivs cpp build.Feng Xiao2016-07-262-5/+5
| |/ / / | | | | | | | | | | | | Remove the use of INT64_C/UINT64_C and add static_cast when neccessary.
| * | | Merge pull request #1847 from haberman/GAfixesJoshua Haberman2016-07-2612-18/+182
| |\ \ \ | | | | | | | | | | GA fixes
| | * | | Fixed Makefile.am for Ruby file rename.Josh Haberman2016-07-261-1/+1
| | | | |
| | * | | Merge branch 'master' into 3.0.0-GAJosh Haberman2016-07-2511-17/+181
| | |\ \ \ | | | | | | | | | | | | | | | | | | We need to pick up some of the last-minute Ruby fixes.
| * | \ \ \ Merge pull request #1841 from pherl/3.0.0-GAJisi Liu2016-07-2613-13/+13
| |\ \ \ \ \ | | |/ / / / | |/| | | | Bump version number for GA
| * | | | | Define intX as standard exact-width integer types.Feng Xiao2016-07-252-12/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes https://github.com/google/protobuf/issues/823 Change-Id: I7f4c2bfcac2f81d8b34c030dd3d12ea02aaa2264
| | | | * | Fix the script comments.Jisi Liu2016-07-261-2/+2
| | | | | |
| | | | * | Make protoc-artifacts able to build plugin.Jisi Liu2016-07-262-8/+22
| | | | | |
| | | | * | Merge branch 'master' of github.com:google/protobuf into 3.0.0-GAJisi Liu2016-07-2611-17/+181
| | | |/| | | | |/|/ /
| | * | | remove extra zeros.Jisi Liu2016-07-251-1/+1
| | | | |
| | * | | Make jruby still depend on beta-4Jisi Liu2016-07-251-1/+1
| | | | |
| | * | | Bump version number for GAJisi Liu2016-07-2513-13/+13
| |/ / /
* | | | Merge pull request #1882 from legrosbuffle/fix-checkFeng Xiao2016-07-291-3/+4
|\ \ \ \ | |_|_|/ |/| | | Be consistent with the use of CHECK()/ GOOGLE_CHECK().
| * | | Be consistent with the use of CHECK()/ GOOGLE_CHECK().Clement Courbet2016-07-291-3/+4
|/ / /
* | | Fixed Makefile.am for Ruby file rename.Josh Haberman2016-07-271-1/+1
| | |
* | | Merge pull request #1861 from jskeet/fix_to_camel_caseJisi Liu2016-07-272-2/+16
|\ \ \ | | | | | | | | Bring C#'s ToPascalCase method in line with C++.
| * | | Bring C#'s ToPascalCase method in line with C++.Jon Skeet2016-07-272-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-flagJisi Liu2016-07-273-14/+2
|\ \ \ | |/ / |/| | Remove legacy_enum_values flag for GA.
| * | Remove legacy_enum_values flag for GA.Jon Skeet2016-07-273-14/+2
|/ /
* | Merge pull request #1788 from google/rubypackagecapJoshua Haberman2016-07-256-7/+58
|\ \ | | | | | | Ruby: translate package names from snake_case -> PascalCase.
| * | Added new file to ruby_EXTRA_DIST.Josh Haberman2016-07-251-0/+1
| | |
| * | Added unit test for PascalCasing package names in Ruby.Josh Haberman2016-07-254-1/+13
| | |
| * | Ruby: translate package names from snake_case -> PascalCase.Josh Haberman2016-07-251-6/+44
| | |
* | | Merge pull request #1846 from xfxyjwf/zipFeng Xiao2016-07-252-0/+113
|\ \ \ | |/ / |/| | Add a script to build protoc zip packages.
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-23 20:44:24 +0000