aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #2077 from pherl/3.0.xv3.0.2Jisi Liu2016-09-061-1/+1
|\ | | | | Update release date in the change log
| * Update release date in the change logJisi Liu2016-09-061-1/+1
|/
* Merge pull request #2062 from pherl/3.0.2Jisi Liu2016-09-0611-11/+11
|\ | | | | Bump version number to 3.0.2
| * Bump version number to 3.0.2Jisi Liu2016-09-0211-11/+11
| |
* | Merge pull request #2061 from pherl/changelogJisi Liu2016-09-061-0/+20
|\ \ | |/ |/| Changelog update for 3.0.2
| * ruby, js and c# changesJisi Liu2016-09-021-2/+6
| |
| * objc change logJisi Liu2016-09-021-0/+16
| |
* | Merge pull request #1862 from pherl/3.0.0-GAJisi Liu2016-09-025-16/+18
|\ \ | |/ |/| Cherry pick c# changes from master
| * 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.)
| * Remove legacy_enum_values flag for GA.Jon Skeet2016-07-273-14/+2
| |
* | Merge pull request #1978 from pherl/cpJisi Liu2016-09-021-1/+1
|\ \ | | | | | | Cherry-pick into 3.0.0-GA branch: Add a jenkins test status badge.
| * | Add a jenkins test status badge.Feng Xiao2016-08-181-1/+1
| | | | | | | | | | | | | | | | | | [ci skip] Change-Id: I5bf4f204e7ef0144d8fc984a985d502f92ce95ce
* | | Merge pull request #2026 from pherl/cpjsJisi Liu2016-09-026-14/+66
|\ \ \ | | | | | | | | Fix missing import of jspb.Map (#1885)
| * | | Use 64-bit protoc binaries in compatibility tests.Feng Xiao2016-08-311-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Turns out travis doesn't have the library dependencies to run a 32-bit binary. Change-Id: I5fadbcade2eb71c1e9ce21d90fa9459797df0e81
| * | | Merge pull request #2012 from haberman/rubymapgcfixJoshua Haberman2016-08-304-9/+59
| | | | | | | | | | | | Ruby: make sure map parsing frames are GC-rooted.
| * | | Fix missing import of jspb.Map (#1885)Guillaume Egles2016-08-291-0/+2
|/ / /
* | | Merge pull request #2014 from pherl/fixgmockJisi Liu2016-08-262-7/+18
|\ \ \ | |/ / |/| | Change autogen.sh to download the zip from github
| * | Update gmock links.Feng Xiao2016-08-261-4/+9
| | | | | | | | | | | | | | | | | | The original link is no longer available. Change-Id: I2976d3f19c8e818689549fb31ff20af8eae92a07
| * | Update links in appveyor.ymlFeng Xiao2016-08-261-3/+9
|/ / | | | | | | Change-Id: I3d44e3c6877e00cfea5a903568fde1e6f597aac1
* | Merge pull request #1977 from thomasvl/bump_cocoapod_specThomas Van Lenten2016-08-181-1/+2
|\ \ | | | | | | Bump the version in prep for the 3.0.2 tag being cut
| * | Bump the version in prep for the 3.0.2 tag being cutThomas Van Lenten2016-08-171-1/+2
|/ / | | | | | | Also pull the watchos support info from master.
* | Merge pull request #1975 from pherl/cpThomas Van Lenten2016-08-1739-1687/+10969
|\ \ | | | | | | Cherry pick objc changes into 3.0.0-GA branch
| * | Record zero for "has" for proto3 if in a oneof.Thomas Van Lenten2016-08-173-29/+296
| | | | | | | | | | | | | | | | | | | | | If a message is proto3, then the zero values still count as being set one the field is in a oneof. Add tests to confirm oneofs work as expected in both syntaxes.
| * | Never use strlen on utf8 runs so null characters work.Thomas Van Lenten2016-08-173-33/+100
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes https://github.com/google/protobuf/issues/1933 Add a new test that forces strings into two different implementations from the NSString class cluster to help confirm we're exercising both paths by which CodedOutputStream will extract data from an NSString. Move the old +load test (that was flawed because the behavior really depends on the type of string from the NSString class cluster); into a unittest that targets the specific case we're adding a behavior confirmation on. As a bonus, improve the TextFormat generation of string characters < 0x20.
| * | Fixes extra whitespace on generated comments. (#1950)Sergio Campamá2016-08-1710-123/+131
| | | | | | | | | | | | Fixes extra whitespace on generated comments.
| * | Adds support for appledoc in generated code. (#1928)Sergio Campamá2016-08-1720-851/+1041
| | | | | | | | | | | | | | | | | | Convert mapping of proto comments to appledoc format so they show up in Xcode and cocoadocs. Fixes https://github.com/google/protobuf/issues/1866
| * | Migrating documentation of the ObjectiveC runtime code to appledoc. (#1867)Sergio Campamá2016-08-1714-774/+9524
|/ / | | | | | | | | | | | | | | Work for #1866 Migrates all the public class docs over to appledoc format. While Xcode is fine with blank lines in `///` comments, appledoc (used by cocoadocs) isn't and was leaving a bunch of info off the doc pages. The generator still needs to be updated to do this also; that will be a follow up CL.
* | Merge pull request #1905 from pherl/fixdocJisi Liu2016-08-0215-8/+98
|\ \ | | | | | | Add and fix C++ runtime docs
| * | Add and fix C++ runtime docsJisi Liu2016-08-0215-8/+98
| | |
* | | 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 #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
| | |