aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* 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
| | |
| * | 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
| | |/| | |/|/
| | * 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.
| | | * Add a script to build protoc zip packages.Feng Xiao2016-07-252-0/+113
| |_|/ |/| | | | | | | | | | | | | | [ci skip] Change-Id: Ia0e0bf3bb6bd24633dc8f294318bb20ac837f8b9
| | * Merge pull request #1837 from haberman/rubygencodenameJoshua Haberman2016-07-256-10/+10
| |/| |/| | | | | Ruby: generated foo.proto -> foo_pb.rb instead of foo.rb.
| | * Ruby: generated foo.proto -> foo_pb.rb instead of foo.rb.Josh Haberman2016-07-256-10/+10
| | | | | | | | | | | | | | | This brings us more into line with other langauges, and makes it more obvious when we are requiring protobuf generated code.
| * | remove extra zeros.Jisi Liu2016-07-251-1/+1
| | |